[Erp5-report] r43475 rafael - in /erp5/trunk/utils/rpmgen: ./ specs/ specs/erp5-official-in...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Feb 18 14:47:33 CET 2011


Author: rafael
Date: Fri Feb 18 14:47:32 2011
New Revision: 43475

URL: http://svn.erp5.org?rev=43475&view=rev
Log:
Adjust Instance name, packages names and standard folders/numbers everywhere.

Added:
    erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/tmp/
Modified:
    erp5/trunk/utils/rpmgen/Makefile
    erp5/trunk/utils/rpmgen/README.txt
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/changelog
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/control
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/postinst
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/rules
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec
    erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/changelog
    erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/control
    erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/rules
    erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec

Modified: erp5/trunk/utils/rpmgen/Makefile
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile [utf8] Fri Feb 18 14:47:32 2011
@@ -1,6 +1,7 @@
-VERSION=trunk
+VERSION=5.4.7
+INSTANCE_REVISION=001
 DEST=/opt/erp5/${VERSION}
-INST=/var/lib/erp5/smb
+INST=/var/lib/erp5/smb${INSTANCE_REVISION}
 
 debian: 
 	cd specs/erp5-official-software-deb/; sudo dpkg-buildpackage -b

Modified: erp5/trunk/utils/rpmgen/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/README.txt?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/README.txt [utf8] (original)
+++ erp5/trunk/utils/rpmgen/README.txt [utf8] Fri Feb 18 14:47:32 2011
@@ -7,13 +7,13 @@ For example:
 
   Run make inside:
   $ cd ~/rpmgen
-  $ make <distribution name> # mandriva, opensuse, fedora, centos or debian
+  $ make <distribution name> # mandriva, opensuse, fedora, centos or ubuntu
 
 The rpm will be created at:
   ~/rpmbuild/RPMS/<arch>/
 
 The deb (for debian) wil be creted at:
-  ~/rpmgen/
+  ~/rpmgen/spec
 
 IMPORTANT
 ----------

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/changelog
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/changelog?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/changelog [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/changelog [utf8] Fri Feb 18 14:47:32 2011
@@ -1,4 +1,4 @@
-erp5-instance (5.4.7-001) unstable; urgency=low
+erp5-official-instance (5.4.7-001) unstable; urgency=low
 
   * Initial release
 

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/control
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/control?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/control [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/control [utf8] Fri Feb 18 14:47:32 2011
@@ -1,13 +1,13 @@
-Source: erp5-instance
+Source: erp5-official-instance
 Section: zope
 Priority: extra
 Maintainer: Nexedi SA <info at nexedi.com>
 Standards-Version: 3.8.0.1
 Homepage: http://www.erp5.org/
 
-Package: erp5-instance
+Package: erp5-official-instance
 Architecture: amd64
-Depends: erp5-trunk
+Depends: erp5-official-software
 Description: ERP5 is a Zope framework which allows to
  implement ERP software.  It includes a Rapid Application
  Development system and a Universal Business Model which

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/postinst
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/postinst?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/postinst [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/postinst [utf8] Fri Feb 18 14:47:32 2011
@@ -4,8 +4,8 @@ INSTALL_PATH='/var/lib/erp5'
 case "$1" in
     configure)
 	
-	adduser --quiet --system --no-create-home --home /var/lib/erp5 --shell /bin/false erp5
-	chown -R erp5 /var/lib/erp5	
+	adduser --quiet --system --no-create-home --home $INSTALL_PATH --shell /bin/false erp5
+	chown -R erp5 $INSTALL_PATH
 	
         ;;
 

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/rules
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/rules?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/rules [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/debian/rules [utf8] Fri Feb 18 14:47:32 2011
@@ -8,7 +8,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-INSTALL_PATH=/var/lib/erp5
+RELEASE_NUMBER=001
+INSTALL_PATH=/var/lib/erp5/smb$(RELEASE_NUMBER)
 
 configure:
 # We have nothing to do.

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec [utf8] Fri Feb 18 14:47:32 2011
@@ -1,8 +1,8 @@
-%define version trunk
+%define version 5.4.7
 %define name erp5-official-instance
-%define release r41268
+%define release 001
 %define erp5user erp5
-%define installdir /var/lib/erp5
+%define installdir /var/lib/erp5/smb%{release}
 
 Name: %{name}
 Version: %{version}

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/changelog
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/changelog?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/changelog [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/changelog [utf8] Fri Feb 18 14:47:32 2011
@@ -1,4 +1,4 @@
-erp5 (5.4.7-001) unstable; urgency=low
+erp5-official-software (5.4.7-001) unstable; urgency=low
 
   * Initial release
 

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/control
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/control?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/control [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/control [utf8] Fri Feb 18 14:47:32 2011
@@ -1,13 +1,13 @@
-Source: erp5
+Source: erp5-official-software
 Section: zope
 Priority: extra
 Maintainer: Nexedi SA <info at nexedi.com>
 Standards-Version: 3.8.0.1
 Homepage: http://www.erp5.org/
 
-Package: erp5-trunk
+Package: erp5-official-software
 Architecture: amd64
-Provides: erp5
+Provides: erp5 erp5-official-software
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: ERP5 is a Zope framework which allows to
  implement ERP software.  It includes a Rapid Application

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/rules
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/rules?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/rules [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/debian/rules [utf8] Fri Feb 18 14:47:32 2011
@@ -9,7 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-INSTALL_PATH=/opt/erp5/trunk
+VERSION_NUMBER=5.4.7
+INSTALL_PATH=/opt/erp5/$(VERSION_NUMBER)
 
 configure:
 # We have nothing to do.
@@ -24,12 +25,11 @@ clean: 
 install: build
 	dh_testdir
 	dh_testroot
-	find $(INSTALL_PATH) -type d -name .svn -exec rm -rf {} \;
-	find $(INSTALL_PATH) -name '*.pyc' -delete
-	rm -rf $(INSTALL_PATH)/downloads/* 
-	rm -rf $(INSTALL_PATH)/parts/*__unpack__
-	mkdir -p $(CURDIR)/debian/erp5-trunk/$(INSTALL_PATH)
-	cp -aR $(INSTALL_PATH)/* $(CURDIR)/debian/erp5-trunk$(INSTALL_PATH)
+	cp -ar --parents $(INSTALL_PATH) $(CURDIR)/debian/tmp
+	find $(CURDIR)/debian/tmp -type d -name '.svn' | xargs -d '\n' rm -rf
+	find $(CURDIR)/debian/tmp -name '*.pyc' -delete
+	rm -rf $(CURDIR)/debian/tmp$(INSTALL_PATH)/downloads/* 
+	rm -rf $(CURDIR)/debian/tmp$(INSTALL_PATH)/parts/*__unpack__
 
 # Build architecture-independent files here.
 binary-indep: install

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec?rev=43475&r1=43474&r2=43475&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec [utf8] Fri Feb 18 14:47:32 2011
@@ -1,6 +1,6 @@
-%define version trunk
+%define version 5.4.7
 %define name erp5-official-software
-%define release r41268
+%define release 001
 %define installdir /opt/erp5/%{version}
 
 Name: %{name}



More information about the Erp5-report mailing list