[Fusionforge-commits] FusionForge branch master updated. 27b1959d7c5b5c485a78a2f096e8915ea3f5ae31

Christian Bayle cbayle at fusionforge.org
Sat Nov 17 16:00:22 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  27b1959d7c5b5c485a78a2f096e8915ea3f5ae31 (commit)
      from  4f3f6bfd72ef11b9a77caddeed918c2597dc5da0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 27b1959d7c5b5c485a78a2f096e8915ea3f5ae31
Author: Christian Bayle <chris at bayle.eu>
Date:   Sat Nov 17 15:59:47 2012 +0100

    Fix build

diff --git a/3rd-party/Makefile.rh b/3rd-party/Makefile.rh
index 85b5fd1..8f23d90 100644
--- a/3rd-party/Makefile.rh
+++ b/3rd-party/Makefile.rh
@@ -2,33 +2,36 @@
 #
 # Build 3rd party rpms like php-htmlpurifier, php-jpgraph.
 #
-# Once built, packages are in $RPM_TMP
+# Once built, packages are in $BUILDPLACE
 
-#RPM_TMP=$(HOME)/rpmbuild
-FORGE_HOME=$(shell cd ..; pwd)
-RPM_TMP=$(FORGE_HOME)/../tmp
-BUILDRESULT=$(FORGE_HOME)/../build/packages
+BUILDERDIR:=$(shell ../tests/scripts/builder_get_config.sh BUILDERDIR)
+REPOPATH:=$(shell ../tests/scripts/builder_get_config.sh REPOPATH)
 
-HTMLPURIFYER_DIR=$(CURDIR)/php-htmlpurifier
+BUILDRESULT=$(REPOPATH)/redhat
+BUILDPLACE=$(BUILDERDIR)/buildrpm
+
+HTMLPURIFYER_DIR:=$(CURDIR)/php-htmlpurifier
 HTMLPURIFIER_VERSION=4.4.0
 HTMLPURIFIER_SPEC=$(HTMLPURIFYER_DIR)/php-htmlpurifier.spec
 HTMLPURIFIER_TBZ=htmlpurifier-$(HTMLPURIFIER_VERSION).tar.gz
 HTMLPURIFIER_RPM=noarch/php-htmlpurifier-$(HTMLPURIFIER_VERSION)-1.noarch.rpm
 
-JPGRAPH_DIR=$(CURDIR)/php-jpgraph
+JPGRAPH_DIR:=$(CURDIR)/php-jpgraph
 JPGRAPH_VERSION=1.5.2
 JPGRAPH_SPEC=$(JPGRAPH_DIR)/php-jpgraph.spec
-JPGRAPH_TBZ=libphp-jpgraph_$(JPGRAPH_VERSION).tar.gz
+JPGRAPH_TBZ=libphp-jpgraph_$(JPGRAPH_VERSION).orig.tar.gz
 JPGRAPH_RPM=noarch/php-jpgraph-$(JPGRAPH_VERSION)-1.noarch.rpm
 JPGRAPH_DIFF=libphp-jpgraph_$(JPGRAPH_VERSION)-12.diff
+JPGRAPH_PATCH1=jpgraph-1.5.2-php5_and_liberation_fonts.patch
+JPGRAPH_PATCH2=jpgraph-rhel-fonts.patch
 
-WEBDAV_SERVER_DIR=$(CURDIR)/php-pear-HTTP_WebDAV_Server
+WEBDAV_SERVER_DIR:=$(CURDIR)/php-pear-HTTP_WebDAV_Server
 WEBDAV_SERVER_VERSION=1.0.0RC5
 WEBDAV_SERVER_SPEC=$(WEBDAV_SERVER_DIR)/php-pear-HTTP_WebDAV_Server.spec
 WEBDAV_SERVER_TBZ=HTTP_WebDAV_Server-$(WEBDAV_SERVER_VERSION).tgz
 WEBDAV_SERVER_RPM=noarch/php-pear-HTTP_WebDAV_Server-$(WEBDAV_SERVER_VERSION)-1.noarch.rpm
 
-SELENIUM_DIR=$(CURDIR)/selenium
+SELENIUM_DIR:=$(CURDIR)/selenium
 
 # rpmbuild --showrc | grep _topdir
 # gives
@@ -40,19 +43,19 @@ SELENIUM_DIR=$(CURDIR)/selenium
 # _srcrpmdir	%{_topdir}/SRPMS
 # _topdir	%{getenv:HOME}/rpmbuild
 
-RPMBUILD=rpmbuild --quiet --define='_topdir $(RPM_TMP)' --define='_tmppath %{_topdir}' --define='_sysconfdir /etc' --define='_rpmdir $(BUILDRESULT)'
+RPMBUILD=rpmbuild --quiet --define='_topdir $(BUILDPLACE)' --define='_tmppath %{_topdir}' --define='_sysconfdir /etc' --define='_rpmdir $(BUILDRESULT)' --define='_specdir %{_topdir}/SPECS' 
+#--define='_sourcedir %{_topdir}/SOURCES'
 
-#default: $(HTMLPURIFYER_DIR) $(JPGRAPH_DIR) $(WEBDAV_SERVER_DIR) $(SELENIUM_DIR) dist 
-default: $(SELENIUM_DIR) dist 
+default: $(HTMLPURIFYER_DIR) $(JPGRAPH_DIR) $(WEBDAV_SERVER_DIR) $(SELENIUM_DIR) dist 
 
 all: clean default
 
 clean:	
-	-rm -Rf $(HOME)/.rpmmacros $(RPM_TMP) $(BUILDRESULT)
+	-rm -Rf $(HOME)/.rpmmacros $(BUILDPLACE) $(BUILDRESULT)
 
 dist:
 	-mkdir -p $(BUILDRESULT)
-	createrepo $(BUILDRESULT)/noarch 2>&1 | grep -v DeprecationWarning
+	createrepo $(BUILDRESULT) 2>&1 | grep -v DeprecationWarning
 
 #
 # Building RPM for external components
@@ -60,32 +63,45 @@ dist:
 # HTML PURIFIER
 $(HTMLPURIFYER_DIR): $(BUILDRESULT)/$(HTMLPURIFIER_RPM)
 
-$(BUILDRESULT)/$(HTMLPURIFIER_RPM): $(HTMLPURIFIER_SPEC) $(HTMLPURIFYER_DIR)/$(HTMLPURIFIER_TBZ)
-	$(RPMBUILD) --define='_sourcedir $(HTMLPURIFYER_DIR)' --quiet --clean -ba $(HTMLPURIFIER_SPEC)
+$(BUILDRESULT)/$(HTMLPURIFIER_RPM): $(HTMLPURIFIER_SPEC) $(BUILDPLACE)/SOURCES/$(HTMLPURIFIER_TBZ) 
+	$(RPMBUILD) --quiet --clean -ba $(HTMLPURIFIER_SPEC)
 
-$(HTMLPURIFYER_DIR)/$(HTMLPURIFIER_TBZ):
-	@cd $(HTMLPURIFYER_DIR); [ -f $@ ] || wget -q -N http://htmlpurifier.org/releases/$(HTMLPURIFIER_TBZ)
+$(BUILDPLACE)/SOURCES/$(HTMLPURIFIER_TBZ): $(BUILDPLACE)/SOURCES
+	@cd $(BUILDPLACE)/SOURCES; [ -f $@ ] || wget -q -N http://htmlpurifier.org/releases/$(HTMLPURIFIER_TBZ)
 
 # PHP JPGRAPH
 $(JPGRAPH_DIR): $(BUILDRESULT)/$(JPGRAPH_RPM)
 
-$(BUILDRESULT)/$(JPGRAPH_RPM): $(JPGRAPH_SPEC) $(JPGRAPH_DIR)/$(JPGRAPH_DIFF)
-	$(RPMBUILD) --define='_sourcedir $(JPGRAPH_DIR)' --quiet --clean -ba $(JPGRAPH_SPEC)
+$(BUILDRESULT)/$(JPGRAPH_RPM): $(JPGRAPH_SPEC) $(BUILDPLACE)/SOURCES/$(JPGRAPH_DIFF) $(BUILDPLACE)/SOURCES/$(JPGRAPH_TBZ) $(BUILDPLACE)/SOURCES/$(JPGRAPH_PATCH1) $(BUILDPLACE)/SOURCES/$(JPGRAPH_PATCH2)
+	$(RPMBUILD) --quiet --clean -ba $(JPGRAPH_SPEC)
+
+$(BUILDPLACE)/SOURCES/$(JPGRAPH_DIFF): $(BUILDPLACE)/SOURCES
+	zcat $(JPGRAPH_DIR)/$(JPGRAPH_DIFF).gz > $@
 
-$(JPGRAPH_DIR)/$(JPGRAPH_DIFF):
-	zcat $(JPGRAPH_DIR)/$(JPGRAPH_DIFF).gz > $(JPGRAPH_DIR)/$(JPGRAPH_DIFF)
+$(BUILDPLACE)/SOURCES/$(JPGRAPH_TBZ): $(BUILDPLACE)/SOURCES
+	cp $(JPGRAPH_DIR)/$(JPGRAPH_TBZ) $@
+
+$(BUILDPLACE)/SOURCES/$(JPGRAPH_PATCH1):
+	cp $(JPGRAPH_DIR)/$(JPGRAPH_PATCH1) $@
+	
+$(BUILDPLACE)/SOURCES/$(JPGRAPH_PATCH2):
+	cp $(JPGRAPH_DIR)/$(JPGRAPH_PATCH2) $@
 	
 # WEBDAV SERVER
 $(WEBDAV_SERVER_DIR): $(BUILDRESULT)/$(WEBDAV_SERVER_RPM)
 
-$(BUILDRESULT)/$(WEBDAV_SERVER_RPM): $(WEBDAV_SERVER_SPEC) $(WEBDAV_SERVER_DIR)/$(WEBDAV_SERVER_TBZ)
-	$(RPMBUILD) --define='_sourcedir $(WEBDAV_SERVER_DIR)' -v --quiet --clean -ba $(WEBDAV_SERVER_SPEC)
+$(BUILDRESULT)/$(WEBDAV_SERVER_RPM): $(WEBDAV_SERVER_SPEC) $(BUILDPLACE)/SOURCES/$(WEBDAV_SERVER_TBZ)
+	$(RPMBUILD)  -v --quiet --clean -ba $(WEBDAV_SERVER_SPEC)
 
-$(WEBDAV_SERVER_DIR)/$(WEBDAV_SERVER_TBZ):
-	@cd $(WEBDAV_SERVER_DIR); [ -f $@ ] || wget -q -N http://download.pear.php.net/package/$(WEBDAV_SERVER_TBZ)
+$(BUILDPLACE)/SOURCES/$(WEBDAV_SERVER_TBZ):
+	@cd $(BUILDPLACE)/SOURCES; [ -f $@ ] || wget -q -N http://download.pear.php.net/package/$(WEBDAV_SERVER_TBZ)
 
+# SELENIUM
 $(SELENIUM_DIR): $(BUILDRESULT)/seleniumbuild
 
 $(BUILDRESULT)/seleniumbuild:
 	make -C $(SELENIUM_DIR) -f Makefile.rpm
 
+# BUILDPLACE
+$(BUILDPLACE)/SOURCES:
+	[ -d $@ ] || mkdir $@
diff --git a/3rd-party/selenium/Makefile.rpm b/3rd-party/selenium/Makefile.rpm
index 082bbf8..21b7730 100644
--- a/3rd-party/selenium/Makefile.rpm
+++ b/3rd-party/selenium/Makefile.rpm
@@ -16,9 +16,9 @@ TGZ=selenium-$(MAJOR).tgz
 BUILDRESULT=$(REPOPATH)/redhat
 BUILDPLACE=$(BUILDERDIR)/buildrpm
 
-$(BUILDRESULT)/$(RPM): $(BUILDPLACE)/$(TGZ) $(BUILDRESULT)
-	cd $(BUILDRESULT) ; alien --to-rpm $(BUILDPLACE)/$(TGZ) ;
-	createrepo $(BUILDRESULT)
+$(BUILDRESULT)/noarch/$(RPM): $(BUILDPLACE)/$(TGZ) $(BUILDRESULT)
+	[ -d $(BUILDRESULT)/noarch ]  || mkdir $(BUILDRESULT)/noarch
+	cd $(BUILDRESULT)/noarch ; alien --to-rpm $(BUILDPLACE)/$(TGZ) ;
 
 $(BUILDPLACE)/$(TGZ): $(BUILDPLACE)/selenium/usr/share/selenium/selenium-server.jar
 	cd $(BUILDPLACE)/selenium/ ; tar cvzf $@ usr

-----------------------------------------------------------------------

Summary of changes:
 3rd-party/Makefile.rh           |   70 ++++++++++++++++++++++++---------------
 3rd-party/selenium/Makefile.rpm |    6 ++--
 2 files changed, 46 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list