gunnar: server/pear/Horde_Framework Makefile, 1.1, 1.2 Horde_Framework.spec, 1.3, 1.4 ChangeLog, 1.1, 1.2 .cvsignore, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Wed May 20 10:13:31 CEST 2009
Author: gunnar
Update of /kolabrepository/server/pear/Horde_Framework
In directory doto:/tmp/cvs-serv32549
Modified Files:
Makefile Horde_Framework.spec ChangeLog .cvsignore
Log Message:
Update to the newer method of PEAR packaging. Updated to the HORDE_3_3_4 tag.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 11 Sep 2008 16:26:09 -0000 1.1
+++ Makefile 20 May 2009 08:13:29 -0000 1.2
@@ -1,40 +1 @@
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-ifeq "x$(RPM)" "x"
- RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
- KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
- cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-.PHONY: clean
-clean:
- rm -rf /kolab/RPM/TMP/$(PACKAGE)*
- rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
- rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
- test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-
- cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
- cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../Horde.mk
Index: Horde_Framework.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/Horde_Framework.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Horde_Framework.spec 9 Dec 2008 20:32:47 -0000 1.3
+++ Horde_Framework.spec 20 May 2009 08:13:29 -0000 1.4
@@ -1,12 +1,20 @@
# Variables
+%define V_horde_pkgdir Horde
+%define V_horde_package Horde_Framework
%define V_package Horde_Framework
-%define V_version 0.0.2
-%define V_release 20081209
+%define V_package_origin VC-CVS
+%define V_repo_commit HORDE_3_3_4
+%define V_repo_release 20090501
+%define V_version 0.0.2dev20090501
+%define V_release 20090520
+%define V_sourceurl http://pear.horde.org/get
+%define V_php_lib_loc php
+%define V_www_loc client
# Package Information
Name: %{V_package}
Summary: Horde core Framework libraries
-URL: http://pear.horde.org/index.php?package=%{V_package}
+URL: http://pear.horde.org/index.php?package=%{V_horde_package}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
@@ -15,7 +23,10 @@
Distribution: OpenPKG
# List of Sources
-Source: http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source: %{V_sourceurl}/%{V_horde_package}-%{V_version}.tgz
+
+# List of patches
+Patch0: package.patch
# Build Info
Prefix: %{l_prefix}
@@ -35,20 +46,38 @@
Provides: horde-framework-kolab = 3.2_rc3-20081209
Obsoletes: horde-framework-kolab < 3.2_rc3-20081209
+# Package options
+%option with_chroot no
+
%description
These classes provide the core functionality of the Horde Application
Framework.
%prep
- %setup -n %{V_package}-%{V_version}
+ %setup -n %{V_horde_package}-%{V_version}
+
+ if [ -n "`cat %{PATCH0}`" ]; then
+ %patch -p0 -P 0
+ fi
+
+ cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
+ %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/%{V_www_loc}" \
+ -d php_dir="%{l_prefix}/lib/%{V_php_lib_loc}" \
+ install --offline --force --nodeps -P $RPM_BUILD_ROOT \
+ $RPM_SOURCE_DIR/%{V_horde_package}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/%{V_php_lib_loc}/{.filemap,.lock,.channels,.depdb,.depdblock}
+
+ # With chroot
+ %if "%{with_chroot}" == "yes"
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib
+ cp -a $RPM_BUILD_ROOT/%{l_prefix}/lib/%{V_php_lib_loc} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib/
+ %endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 11 Sep 2008 16:26:09 -0000 1.1
+++ ChangeLog 20 May 2009 08:13:29 -0000 1.2
@@ -1,4 +1,8 @@
+2009-05-20 Gunnar Wrobel <p at rdus.de>
+
+ * Horde_Framework.spec: Updated to the HORDE_3_3_4 tag.
+
2008-09-11 Gunnar Wrobel <p at rdus.de>
- * Horde_DOM.spec: Added package to Kolab CVS.
+ * Horde_Framework.spec: Added package to Kolab CVS.
Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Framework/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 11 Sep 2008 16:26:09 -0000 1.1
+++ .cvsignore 20 May 2009 08:13:29 -0000 1.2
@@ -1 +1,3 @@
*.src.rpm
+*.tgz
+package.patch
More information about the commits
mailing list