gunnar: server/make-helper openpkg-patched.mk,1.4,1.5
cvs at kolab.org
cvs at kolab.org
Mon Jan 11 16:52:47 CET 2010
Author: gunnar
Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv17124
Modified Files:
openpkg-patched.mk
Log Message:
Just reordered to keep the core targets at the bottom.
Index: openpkg-patched.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- openpkg-patched.mk 5 Jan 2010 16:24:55 -0000 1.4
+++ openpkg-patched.mk 11 Jan 2010 15:52:45 -0000 1.5
@@ -19,14 +19,6 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch
touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
-# Target for building the source package
-$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
-
-# Target for building the binary package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)
-
# Prepare the patch for the package.
package.patch: $(PATCHES)
echo > package.patch
@@ -34,3 +26,11 @@
do \
cat $$PATCH >> package.patch; \
done
+
+# Target for building the source package
+$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+ cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
+
+# Target for building the binary package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+ cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)
More information about the commits
mailing list