[Kolab-devel] More Makefile updates (Permission to commit)
Stephan Buys
s.buys at codefusion.co.za
Wed May 28 01:01:57 CEST 2003
Hi,
Can I commit the code below?
What it does is assures that when the "rpm -ba" is called that the makefile
is in the correct folder. I was having problems with CVS, custom folders and
the updated build scripts.
You can of course still override the KOLAB folder by setting: KOLABRPMSRC
(although in the near future it will probably be only /kolab)
Regards,
Stephan
cvs server: Diffing apache
Index: apache/Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- apache/Makefile 27 May 2003 14:38:40 -0000 1.5
+++ apache/Makefile 27 May 2003 20:59:40 -0000
@@ -1,12 +1,14 @@
-
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -ihv $(KOLABPKGURI)/apache-1.3.27-20030516.src.rpm --define 'with_mod_ssl yes' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php yes' --define 'with_mod_php_gettext yes'
- rpm -ba apache.spec
+ cd $(KOLABRPMSRC)/apache && rpm -ba apache.spec
clean:
rm -rf /kolab/RPM/TMP/apache* apache* mod* php* rc*
cvs server: Diffing db
Index: db/Makefile
===================================================================
RCS file: /kolabrepository/server/db/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- db/Makefile 27 May 2003 14:38:41 -0000 1.2
+++ db/Makefile 27 May 2003 20:59:40 -0000
@@ -1,11 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -i $(KOLABPKGURI)/db-4.1.25.1-20030323.src.rpm
- patch < kolab.patch
- rpm -bb db.spec
+ cd $(KOLABRPMSRC)/db && patch < kolab.patch && rpm -bb db.spec
clean:
rm -rf /kolab/RPM/TMP/db* db* patch.*
cvs server: Diffing imapd
Index: imapd/Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- imapd/Makefile 27 May 2003 14:38:41 -0000 1.7
+++ imapd/Makefile 27 May 2003 20:59:40 -0000
@@ -1,11 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -ihv $(KOLABPKGURI)/imapd-2.1.13-20030502.src.rpm
- patch < kolab.patch
- rpm -ba imapd.spec --define 'with_groupfile_hack yes' --define 'with_vhost_hack yes'
+ cd $(KOLABRPMSRC)/imapd && patch < kolab.patch && rpm -ba imapd.spec --define 'with_groupfile_hack yes' --define 'with_vhost_hack yes'
clean:
rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch
cvs server: Diffing openldap
Index: openldap/Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- openldap/Makefile 27 May 2003 14:38:40 -0000 1.6
+++ openldap/Makefile 27 May 2003 20:59:40 -0000
@@ -1,10 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -ihv $(KOLABPKGURI)/openldap-2.1.20-20030520.src.rpm
- rpm -ba openldap.spec --define 'with_sasl no'
+ cd $(KOLABRPMSRC)/openldap && rpm -ba openldap.spec --define 'with_sasl no'
clean:
rm -rf /kolab/RPM/TMP/openldap* openldap* rc.openldap
cvs server: Diffing postfix
Index: postfix/Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- postfix/Makefile 27 May 2003 14:38:41 -0000 1.6
+++ postfix/Makefile 27 May 2003 20:59:40 -0000
@@ -1,10 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -ihv $(KOLABPKGURI)/postfix-2.0.10-20030524.src.rpm
- rpm -ba postfix.spec --define 'with_sasl yes' --define 'with_tls yes' --define 'with_ldap yes'
+ cd $(KOLABRPMSRC)/postfix && rpm -ba postfix.spec --define 'with_sasl yes' --define 'with_tls yes' --define 'with_ldap yes'
clean:
rm -rf /kolab/RPM/TMP/postfix* etc.tar fsl.postfix pfixtls*.tar.gz pflogsum* postfix-*.patch postfix-*.tar.gz postfix.patch postfix.spec rc.postfix
cvs server: Diffing proftpd
Index: proftpd/Makefile
===================================================================
RCS file: /kolabrepository/server/proftpd/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- proftpd/Makefile 27 May 2003 14:38:41 -0000 1.6
+++ proftpd/Makefile 27 May 2003 20:59:40 -0000
@@ -1,11 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC/
+endif
all:
rpm -ihv $(KOLABPKGURI)/proftpd-1.2.8-20030328.src.rpm
- patch < kolab.patch
- rpm -ba proftpd.spec --define 'with_ldap yes'
+ cd $(KOLABRPMSRC)/proftpd && patch < kolab.patch && rpm -ba proftpd.spec --define 'with_ldap yes'
clean:
rm -rf proftpd* rc.proftpd /kolab/RPM/TMP/proftpd* mod_ldap.patch
cvs server: Diffing sasl
Index: sasl/Makefile
===================================================================
RCS file: /kolabrepository/server/sasl/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- sasl/Makefile 27 May 2003 14:38:41 -0000 1.5
+++ sasl/Makefile 27 May 2003 20:59:40 -0000
@@ -1,10 +1,13 @@
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
all:
rpm -ihv $(KOLABPKGURI)/sasl-2.1.13-20030417.src.rpm
- rpm -ba sasl.spec --define 'with_ldap yes'
+ cd $(KOLABRPMSRC)/sasl && rpm -ba sasl.spec --define 'with_ldap yes'
clean:
rm -rf cyrus*.tar.gz fsl.sasl rc.sasl sasl.patch sasl.spec saslauthd.conf /kolab/RPM/TMP/cyrus-sasl*
More information about the devel
mailing list