[Erp5-report] r43473 rafael - in /erp5/trunk/utils/rpmgen: ./ specs/ specs/erp5-official-bu...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 18 13:57:37 CET 2011
Author: rafael
Date: Fri Feb 18 13:57:37 2011
New Revision: 43473
URL: http://svn.erp5.org?rev=43473&view=rev
Log:
Simplify names of spec and use /var/lib/erp5 as instanceroot instead.
Added:
erp5/trunk/utils/rpmgen/specs/erp5-official-instance-deb/
- copied from r43471, erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk-deb/
erp5/trunk/utils/rpmgen/specs/erp5-official-instance.spec
- copied unchanged from r43471, erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec
erp5/trunk/utils/rpmgen/specs/erp5-official-software-deb/
- copied from r43471, erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/
erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec
Removed:
erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/
erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec
erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk-deb/
erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec
Modified:
erp5/trunk/utils/rpmgen/Makefile
Modified: erp5/trunk/utils/rpmgen/Makefile
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile?rev=43473&r1=43472&r2=43473&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile [utf8] Fri Feb 18 13:57:37 2011
@@ -1,19 +1,19 @@
VERSION=trunk
DEST=/opt/erp5/${VERSION}
-INST=/var/lib/erp5/
+INST=/var/lib/erp5/smb
debian:
- cd specs/erp5-official-buildout-trunk-deb/; sudo dpkg-buildpackage -b
+ cd specs/erp5-official-software-deb/; sudo dpkg-buildpackage -b
debian-instance:
- cd specs/erp5-official-instance-trunk-deb/; sudo dpkg-buildpackage -b
+ cd specs/erp5-official-instance-deb/; sudo dpkg-buildpackage -b
clean:
sudo rm -Rf ${DEST}
build:
- sudo mkdir -p ${DEST}
- sudo chmod a+rwx ${DEST}
+ sudo mkdir -p ${DEST} $(INST)
+ sudo chmod a+rwx ${DEST} $(INST)
erp5apptest212 -v -s -u -o -l ./run.log --software_path=$(DEST) --instance_path=$(INST) .
prepare:
@@ -35,10 +35,12 @@ centos-dependencies:
sudo yum install -y rpm-build gcc gcc-c++ make
softwarebuild: prepare build
- sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
+ sudo -E rpmbuild -bb specs/erp5-official-software.spec
instancebuild:
- sudo -E rpmbuild -bb specs/erp5-official-instance-trunk.spec
+ sudo -E rpmbuild -bb specs/erp5-official-instance.spec
+
+ubuntu: clean ubuntu-dependencies prepare build debian
mandriva: clean mandriva-dependencies softwarebuild
Removed: erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec?rev=43472&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec (removed)
@@ -1,138 +0,0 @@
-%define version trunk
-%define name erp5-official-buildout
-%define release r41268
-%define installdir /opt/erp5/%{version}
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Open Source ERP Solution
-URL: http://www.erp5.org
-License: GPL
-Vendor: Nexedi
-Packager: Nexedi SA <info at nexedi.com>
-Group: Databases
-AutoReqProv:0
-Provides: erp5
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-# here, we need to require libraries that are linked in
-# parts/libreoffice-bin, but some non-important libraries are ignored
-# (eg. only required for KDE/Gnome integration, or OpenGL slide
-# transitions module).
-%ifarch x86_64
-Requires: libICE.so.6()(64bit)
-Requires: libORBit-2.so.0()(64bit)
-Requires: libSM.so.6()(64bit)
-Requires: libX11.so.6()(64bit)
-Requires: libXau.so.6()(64bit)
-Requires: libXcomposite.so.1()(64bit)
-Requires: libXcursor.so.1()(64bit)
-Requires: libXdamage.so.1()(64bit)
-Requires: libXdmcp.so.6()(64bit)
-Requires: libXext.so.6()(64bit)
-Requires: libXfixes.so.3()(64bit)
-Requires: libXft.so.2()(64bit)
-Requires: libXi.so.6()(64bit)
-Requires: libXinerama.so.1()(64bit)
-Requires: libXrandr.so.2()(64bit)
-Requires: libXrender.so.1()(64bit)
-Requires: libatk-1.0.so.0()(64bit)
-Requires: libfontconfig.so.1()(64bit)
-Requires: libfreetype.so.6()(64bit)
-Requires: libgconf-2.so.4()(64bit)
-Requires: libgdk-x11-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf-2.0.so.0()(64bit)
-Requires: libgio-2.0.so.0()(64bit)
-Requires: libglib-2.0.so.0()(64bit)
-Requires: libgmodule-2.0.so.0()(64bit)
-Requires: libgobject-2.0.so.0()(64bit)
-Requires: libgstinterfaces-0.10.so.0()(64bit)
-Requires: libgstreamer-0.10.so.0()(64bit)
-Requires: libgthread-2.0.so.0()(64bit)
-Requires: libgtk-x11-2.0.so.0()(64bit)
-Requires: libpango-1.0.so.0()(64bit)
-Requires: libpangocairo-1.0.so.0()(64bit)
-Requires: libpangoft2-1.0.so.0()(64bit)
-Requires: libpangox-1.0.so.0()(64bit)
-Requires: libpangoxft-1.0.so.0()(64bit)
-Requires: libpixman-1.so.0()(64bit)
-Requires: libstdc++.so.6()(64bit)
-Requires: libxcb.so.1()(64bit)
-Requires: libxml2.so.2()(64bit)
-Requires: libz.so.1()(64bit)
-%else
-Requires: libICE.so.6
-Requires: libORBit-2.so.0
-Requires: libSM.so.6
-Requires: libX11.so.6
-Requires: libXau.so.6
-Requires: libXcomposite.so.1
-Requires: libXcursor.so.1
-Requires: libXdamage.so.1
-Requires: libXdmcp.so.6
-Requires: libXext.so.6
-Requires: libXfixes.so.3
-Requires: libXft.so.2
-Requires: libXi.so.6
-Requires: libXinerama.so.1
-Requires: libXrandr.so.2
-Requires: libXrender.so.1
-Requires: libatk-1.0.so.0
-Requires: libfontconfig.so.1
-Requires: libfreetype.so.6
-Requires: libgconf-2.so.4
-Requires: libgdk-x11-2.0.so.0
-Requires: libgdk_pixbuf-2.0.so.0
-Requires: libgio-2.0.so.0
-Requires: libglib-2.0.so.0
-Requires: libgmodule-2.0.so.0
-Requires: libgobject-2.0.so.0
-Requires: libgstinterfaces-0.10.so.0
-Requires: libgstreamer-0.10.so.0
-Requires: libgthread-2.0.so.0
-Requires: libgtk-x11-2.0.so.0
-Requires: libpango-1.0.so.0
-Requires: libpangocairo-1.0.so.0
-Requires: libpangoft2-1.0.so.0
-Requires: libpangox-1.0.so.0
-Requires: libpangoxft-1.0.so.0
-Requires: libpixman-1.so.0
-Requires: libstdc++.so.6
-Requires: libxcb.so.1
-Requires: libxml2.so.2
-Requires: libz.so.1
-%endif
-
-%description
-%{summary}
-
-%build
-
-%install
-%{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}
-# use rsync if possible
-if [ -z "`which rsync >&/dev/null || echo 1`" ]; then
- mkdir -p %{buildroot}%{installdir}
- rsync -a --exclude='downloads/*' \
- --exclude='parts/*__compile__/*' \
- --exclude='parts/*__unpack__/*' \
- %{installdir}/ %{buildroot}%{installdir}/
-else
- %{__cp} -ar --parents %{installdir} %{buildroot}
- %{__rm} -rf %{buildroot}%{installdir}/downloads/*
- %{__rm} -rf %{buildroot}%{installdir}/parts/*__compile__/*
- %{__rm} -rf %{buildroot}%{installdir}/parts/*__unpack__/*
-fi
-# post-script strip fails for read-only files
-chmod -R u+w %{buildroot}%{installdir}/*parts
-# make extends-cache visible for any user
-chmod -R +r %{buildroot}%{installdir}/extends-cache
-
-%files
-%defattr(-, root, root, 0755)
-%{installdir}
-
-%clean
-%{__rm} -rf %{buildroot}
Removed: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec?rev=43472&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec (removed)
@@ -1,46 +0,0 @@
-%define version trunk
-%define name erp5-official-instance
-%define release r41268
-%define erp5user erp5
-%define installdir /var/lib/erp5
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Open Source ERP Solution
-URL: http://www.erp5.org
-License: GPL
-Vendor: Nexedi
-Packager: Nexedi SA <info at nexedi.com>
-Group: Databases
-AutoReqProv:0
-Provides: erp5
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-%description
-%{summary}
-
-%pre
-%_pre_useradd %{erp5user} %{installdir} /bin/false
-
-%build
-
-%install
-%{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}
-# use rsync if possible
-if [ -z "`which rsync >&/dev/null || echo 1`" ]; then
- mkdir -p %{buildroot}%{installdir}
- rsync -a %{installdir}/ %{buildroot}%{installdir}/
-else
- %{__cp} -ar --parents %{installdir} %{buildroot}
-fi
-# post-script strip fails for read-only files
-chmod -R u+w %{buildroot}%{installdir}/*parts
-
-%files
-%defattr(-, root, root, 0755)
-%{installdir}
-
-%clean
-%{__rm} -rf %{buildroot}
Added: erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec?rev=43473&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec (added)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-software.spec [utf8] Fri Feb 18 13:57:37 2011
@@ -0,0 +1,138 @@
+%define version trunk
+%define name erp5-official-software
+%define release r41268
+%define installdir /opt/erp5/%{version}
+
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Summary: Open Source ERP Solution
+URL: http://www.erp5.org
+License: GPL
+Vendor: Nexedi
+Packager: Nexedi SA <info at nexedi.com>
+Group: Databases
+AutoReqProv:0
+Provides: erp5
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+# here, we need to require libraries that are linked in
+# parts/libreoffice-bin, but some non-important libraries are ignored
+# (eg. only required for KDE/Gnome integration, or OpenGL slide
+# transitions module).
+%ifarch x86_64
+Requires: libICE.so.6()(64bit)
+Requires: libORBit-2.so.0()(64bit)
+Requires: libSM.so.6()(64bit)
+Requires: libX11.so.6()(64bit)
+Requires: libXau.so.6()(64bit)
+Requires: libXcomposite.so.1()(64bit)
+Requires: libXcursor.so.1()(64bit)
+Requires: libXdamage.so.1()(64bit)
+Requires: libXdmcp.so.6()(64bit)
+Requires: libXext.so.6()(64bit)
+Requires: libXfixes.so.3()(64bit)
+Requires: libXft.so.2()(64bit)
+Requires: libXi.so.6()(64bit)
+Requires: libXinerama.so.1()(64bit)
+Requires: libXrandr.so.2()(64bit)
+Requires: libXrender.so.1()(64bit)
+Requires: libatk-1.0.so.0()(64bit)
+Requires: libfontconfig.so.1()(64bit)
+Requires: libfreetype.so.6()(64bit)
+Requires: libgconf-2.so.4()(64bit)
+Requires: libgdk-x11-2.0.so.0()(64bit)
+Requires: libgdk_pixbuf-2.0.so.0()(64bit)
+Requires: libgio-2.0.so.0()(64bit)
+Requires: libglib-2.0.so.0()(64bit)
+Requires: libgmodule-2.0.so.0()(64bit)
+Requires: libgobject-2.0.so.0()(64bit)
+Requires: libgstinterfaces-0.10.so.0()(64bit)
+Requires: libgstreamer-0.10.so.0()(64bit)
+Requires: libgthread-2.0.so.0()(64bit)
+Requires: libgtk-x11-2.0.so.0()(64bit)
+Requires: libpango-1.0.so.0()(64bit)
+Requires: libpangocairo-1.0.so.0()(64bit)
+Requires: libpangoft2-1.0.so.0()(64bit)
+Requires: libpangox-1.0.so.0()(64bit)
+Requires: libpangoxft-1.0.so.0()(64bit)
+Requires: libpixman-1.so.0()(64bit)
+Requires: libstdc++.so.6()(64bit)
+Requires: libxcb.so.1()(64bit)
+Requires: libxml2.so.2()(64bit)
+Requires: libz.so.1()(64bit)
+%else
+Requires: libICE.so.6
+Requires: libORBit-2.so.0
+Requires: libSM.so.6
+Requires: libX11.so.6
+Requires: libXau.so.6
+Requires: libXcomposite.so.1
+Requires: libXcursor.so.1
+Requires: libXdamage.so.1
+Requires: libXdmcp.so.6
+Requires: libXext.so.6
+Requires: libXfixes.so.3
+Requires: libXft.so.2
+Requires: libXi.so.6
+Requires: libXinerama.so.1
+Requires: libXrandr.so.2
+Requires: libXrender.so.1
+Requires: libatk-1.0.so.0
+Requires: libfontconfig.so.1
+Requires: libfreetype.so.6
+Requires: libgconf-2.so.4
+Requires: libgdk-x11-2.0.so.0
+Requires: libgdk_pixbuf-2.0.so.0
+Requires: libgio-2.0.so.0
+Requires: libglib-2.0.so.0
+Requires: libgmodule-2.0.so.0
+Requires: libgobject-2.0.so.0
+Requires: libgstinterfaces-0.10.so.0
+Requires: libgstreamer-0.10.so.0
+Requires: libgthread-2.0.so.0
+Requires: libgtk-x11-2.0.so.0
+Requires: libpango-1.0.so.0
+Requires: libpangocairo-1.0.so.0
+Requires: libpangoft2-1.0.so.0
+Requires: libpangox-1.0.so.0
+Requires: libpangoxft-1.0.so.0
+Requires: libpixman-1.so.0
+Requires: libstdc++.so.6
+Requires: libxcb.so.1
+Requires: libxml2.so.2
+Requires: libz.so.1
+%endif
+
+%description
+%{summary}
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__mkdir_p} %{buildroot}
+# use rsync if possible
+if [ -z "`which rsync >&/dev/null || echo 1`" ]; then
+ mkdir -p %{buildroot}%{installdir}
+ rsync -a --exclude='downloads/*' \
+ --exclude='parts/*__compile__/*' \
+ --exclude='parts/*__unpack__/*' \
+ %{installdir}/ %{buildroot}%{installdir}/
+else
+ %{__cp} -ar --parents %{installdir} %{buildroot}
+ %{__rm} -rf %{buildroot}%{installdir}/downloads/*
+ %{__rm} -rf %{buildroot}%{installdir}/parts/*__compile__/*
+ %{__rm} -rf %{buildroot}%{installdir}/parts/*__unpack__/*
+fi
+# post-script strip fails for read-only files
+chmod -R u+w %{buildroot}%{installdir}/*parts
+# make extends-cache visible for any user
+chmod -R +r %{buildroot}%{installdir}/extends-cache
+
+%files
+%defattr(-, root, root, 0755)
+%{installdir}
+
+%clean
+%{__rm} -rf %{buildroot}
More information about the Erp5-report
mailing list