- Ajout dans le makefile de la regle rpm-depend qui genere a partir

des packages .deb les packages .rpm qui n'existe pas en rpm
(python-tal, python-imaging)
- Deplacement des fichiers pour redhat dans le repertoire redhat

Makefile

@@ -82,6 +82,7 @@ FIND=find
 GETTEXT=/usr/share/doc/python$(PYTHON_VERSION)/examples/Tools/i18n/pygettext.py
 TAR=tar
 RPM=rpm
+PACKAGEINFO=redhat/packageinfo.pl
 
 SERVER_USER=root
 SERVER_GROUP=root
@@ -92,16 +93,19 @@ TEMPLATES=default april bxlug codelutin.org cuisine easter-eggs entrouvert.com \
 	entrouvert2 glasnost2 lightbulb plane september vecam theridion \
 	entrouvert.be
 
+RPM_PACKAGE_NAME=python$(PYTHON_VERSION)-tal python$(PYTHON_VERSION)-imaging
+
 .PHONY: help archive clean-data data-archive dist dist-clean install-create-dir install-glasnost install-data install-extensions install-locale install-log install-python-libs install-scripts install-servers install-templates install-tests install-web install mo po glasnost.spec rpm rpm-depend run-tests tests uninstall-tests uninstall
 
 help:
 	@echo
 	@echo "        Rules"
-	@echo "archive - create an archive in tar format of the project"
-	@echo "rpm     - create an rpm package"
-	@echo "install - install glasnost on local machine"
-	@echo "uninstall - uninstall glasnost on local machine"
-	@echo "dist    - create package in tar format ready to install"
+	@echo "archive    - create an archive in tar format of the project"
+	@echo "rpm        - create an rpm package"
+	@echo "rpm-depend - create rpm package don't exist in redhat distribution"
+	@echo "install    - install glasnost on local machine"
+	@echo "uninstall  - uninstall glasnost on local machine"
+	@echo "dist       - create package in tar format ready to install"
 	@echo
 	@echo "        Variables"
 	@echo "GLASNOST (default=${GLASNOST})"
@@ -188,8 +192,7 @@ install-glasnost:	config \
 			glasnost-export \
 			glasnost-import \
 			glasnost-make-system \
-			glasnost-start \
-			glasnost-init.d
+			glasnost-start
 	@if test -d $(DESTDIR)/$(GLASNOST_DIR); then \
 		rm -Rf $(DESTDIR)/$(GLASNOST_DIR); \
 	else :; fi
@@ -203,8 +206,6 @@ install-glasnost:	config \
 	else \
 		RPM_DESTDIR=="$(DESTDIR)"; \
 	fi
-	-ln -s $(RPM_DESTDIR)/$(GLASNOST_DIR)/glasnost-init.d \
-		$(DESTDIR)/etc/init.d/$(GLASNOST)
 	-ln -s $(RPM_DESTDIR)/$(GLASNOST_DIR)/glasnost-variables-filename \
 		$(DESTDIR)/$(BIN_DIR)/glasnost-variables-filename
 	-ln -s $(RPM_DESTDIR)/$(GLASNOST_DIR)/$(GLASNOST)-variables \
@@ -366,7 +367,7 @@ po:		glasnost-web/ \
 	msgmerge -o po/glasnost-web/sv.po -D po/glasnost-web sv.pox messages.pot
 
 
-glasnost.spec: glasnost.spec.in Makefile
+glasnost.spec: redhat/glasnost.spec.in Makefile
 	cat $< | sed -e "s/^%define PYTHON_VERSION .*/%define PYTHON_VERSION ${PYTHON_VERSION}/" \
 	-e "s/^%define ver .*/%define ver ${VERSION}/" \
 	-e "s/^%define nam .*/%define nam ${GLASNOST}/" > $@
@@ -375,7 +376,12 @@ rpm: glasnost.spec dist rpm-depend
 	$(RPM) -ta ../$(DIST_FILE)
 
 rpm-depend:
-	@echo TODO
+	apt-get install --download-only $(RPM_PACKAGE_NAME)
+	for f in $(RPM_PACKAGE_NAME); do \
+	PACKAGE_NAME=`grep-available -X -P -s Filename $$f|cut -f2 -d' '`; \
+	PACKAGE_NAME=`basename $$PACKAGE_NAME`; \
+	(cd redhat; alien --keep-version --to-rpm /var/cache/apt/archives/$$PACKAGE_NAME); \
+	done
 
 run-tests:	
 	@echo "Launching tests..."