gunnar: server/perl-kolab Makefile.PL,1.15,1.16
cvs at kolab.org
cvs at kolab.org
Thu Apr 16 10:57:15 CEST 2009
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv25568/perl-kolab
Modified Files:
Makefile.PL
Log Message:
MFB: ttempt at adding an install target for the perl package. This does not work completely yet. It is okay to call it from within the directory after calling make dist but I can't include it in the update target in the global Makefile yet.
diff -u -d -r1.14 -r1.14.2.1
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.PL 16 Mar 2009 17:17:34 -0000 1.15
+++ Makefile.PL 16 Apr 2009 08:57:13 -0000 1.16
@@ -131,6 +131,10 @@
KOLABRPMTMP = \$(HOME)/RPM/TMP
endif
+ifeq \"x\$(PLATTAG)\" \"x\"
+ PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(HOME:/%=%)
+endif
+
PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
@@ -147,7 +151,7 @@
dist_openpkg: perl-kolab.spec \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
cp \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm ../stage/
-\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec
+\$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).\$(PLATTAG).rpm \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec
test -d \$(KOLABRPMSRC)/\$(PACKAGE) || mkdir \$(KOLABRPMSRC)/\$(PACKAGE)
cp \$(PACKAGE).spec \$(PACKAGE).spec.tmp
sed -i -e 's/\@VERSION\@/\$(VERSION)/' \$(PACKAGE).spec.tmp
@@ -158,6 +162,9 @@
cd \$(KOLABRPMSRC)/\$(PACKAGE) && \$(RPM) -ba \$(PACKAGE).spec
cp -p \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm .
+.PHONY: install-kolab
+install-kolab: \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).\$(PLATTAG).rpm
+ \$(RPM) -Uhv --force \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).\$(PLATTAG).rpm
";
return $add;
More information about the commits
mailing list