From: <val...@or...> - 2008-06-24 21:03:04
|
Author: valleegr Date: 2008-06-24 16:54:40 EDT (Tue, 24 Jun 2008) New Revision: 7083 URL: https://svn.oscar.openclustergroup.org/trac/oscar/changeset/7083 Log: [packman] Revisit Debian and RPM scripts in order to have as many things in common as possible (easier to maintain). Text files modified: pkgsrc/packman/trunk/ChangeLog | 6 +++++ pkgsrc/packman/trunk/Makefile | 30 ++++++++++++++++++++----- pkgsrc/packman/trunk/debian/changelog | 6 +++++ pkgsrc/packman/trunk/packman-depman.spec | 47 +++++++++------------------------------ 4 files changed, 47 insertions(+), 42 deletions(-) Modified: pkgsrc/packman/trunk/ChangeLog ============================================================================== --- pkgsrc/packman/trunk/ChangeLog (original) +++ pkgsrc/packman/trunk/ChangeLog 2008-06-24 16:54:40 EDT (Tue, 24 Jun 2008) @@ -1,3 +1,9 @@ +packman-2.9.2: +* Revisit the Makefile in order to be able to use it on both RPM and Debian +based systems (the best of the different scripts). +* Revisit the spec file in order to use the Makefile everytime it is possible +(easier to maintain the code). + packman-2.9.1: * For Debian, switch back to apt-get instead of aptitude; problems with untrusted packages. Modified: pkgsrc/packman/trunk/Makefile ============================================================================== --- pkgsrc/packman/trunk/Makefile (original) +++ pkgsrc/packman/trunk/Makefile 2008-06-24 16:54:40 EDT (Tue, 24 Jun 2008) @@ -1,21 +1,39 @@ LIBDIR=usr/lib/perl5/OSCAR/ BINDIR=usr/bin +MANDIR=usr/share/man/man3 all: + /usr/bin/pod2man --section=3 PackMan.pm | gzip > PackMan.3.gz + /usr/bin/pod2man --section=3 PackMan/RPM.pm | gzip > PackMan-RPM.3.gz + /usr/bin/pod2man --section=3 PackMan/DEB.pm | gzip > PackMan-DEB.3.gz install: install -d -m 0755 $(DESTDIR)/$(LIBDIR) install -d -m 0755 $(DESTDIR)/$(LIBDIR)/PackMan/ install -d -m 0755 $(DESTDIR)/$(BINDIR) - install -m 0755 packman $(DESTDIR)/$(BINDIR) - install -m 0755 PackMan.pm $(DESTDIR)/$(LIBDIR) - install -m 0755 PackManDefs.pm $(DESTDIR)/$(LIBDIR) - install -m 0755 PackMan/DEB.pm $(DESTDIR)/$(LIBDIR)/PackMan/ - install -m 0755 PackMan/RPM.pm $(DESTDIR)/$(LIBDIR)/PackMan/ + install -d -m 0755 $(DESTDIR)/$(MANDIR) + install -m 0755 packman $(DESTDIR)/$(BINDIR) + install -m 0755 PackMan.pm $(DESTDIR)/$(LIBDIR) + install -m 0755 PackManDefs.pm $(DESTDIR)/$(LIBDIR) + install -m 0755 PackMan/DEB.pm $(DESTDIR)/$(LIBDIR)/PackMan/ + install -m 0755 PackMan/RPM.pm $(DESTDIR)/$(LIBDIR)/PackMan/ + install -m 0644 PackMan.3.gz $(DESTDIR)/$(MANDIR) + install -m 0644 PackMan-RPM.3.gz $(DESTDIR)/$(MANDIR) + install -m 0644 PackMan-DEB.3.gz $(DESTDIR)/$(MANDIR) deb :: dpkg-buildpackage -rfakeroot clean: - + rm -f PackMan.3.gz PackMan-RPM.3.gz PackMan-DEB.3.gz + rm -f build-stamp configure-stamp + rm -rf debian/files debian/packman + rm -f ./packman-depman.tar.gz + +dist: clean + rm -rf /tmp/packman-depman + mkdir /tmp/packman-depman + cp -rf * /tmp/packman-depman + cd /tmp; tar czf ./packman-depman.tar.gz packman-depman + mv /tmp/packman-depman.tar.gz . Modified: pkgsrc/packman/trunk/debian/changelog ============================================================================== --- pkgsrc/packman/trunk/debian/changelog (original) +++ pkgsrc/packman/trunk/debian/changelog 2008-06-24 16:54:40 EDT (Tue, 24 Jun 2008) @@ -1,3 +1,9 @@ +packman (2.9.2-1) stable; urgency=low + + * New upstream version + + -- Geoffroy Vallee <val...@or...> Tue, 24 Jun 2008 16:53:35 -0400 + packman (2.9.1-1) stable; urgency=low * New upstream version Modified: pkgsrc/packman/trunk/packman-depman.spec ============================================================================== --- pkgsrc/packman/trunk/packman-depman.spec (original) +++ pkgsrc/packman/trunk/packman-depman.spec 2008-06-24 16:54:40 EDT (Tue, 24 Jun 2008) @@ -7,7 +7,7 @@ Summary: A package and dependency manager abstraction layer. Name: packman-depman -Version: 2.9.1 +Version: 2.9.2 Release: 1 Vendor: Open Cluster Group <http://OSCAR.OpenClusterGroup.org/> Distribution: OSCAR @@ -15,7 +15,7 @@ License: GPL Group: Development/Libraries Source: %{name}.tar.gz -BuildRoot: %{_localstatedir}/tmp/%{name}-root +BuildRoot: %{_localstatedir}/%{name}-root BuildArch: noarch @@ -47,58 +47,33 @@ %setup -n %{name} %build -/usr/bin/pod2man --section=3 PackMan.pm | gzip > PackMan.3.gz -/usr/bin/pod2man --section=3 DepMan.pm | gzip > DepMan.3.gz -/usr/bin/pod2man --section=3 PackMan/RPM.pm | gzip > PackMan-RPM.3.gz -/usr/bin/pod2man --section=3 PackMan/DEB.pm | gzip > PackMan-DEB.3.gz -/usr/bin/pod2man --section=3 DepMan/UpdateRPMs.pm | gzip > DepMan-UpdateRPMs.3.gz -/usr/bin/pod2man --section=3 DepMan/UpdateDEBs.pm | gzip > DepMan-UpdateDEBs.3.gz - +make %install %__rm -rf $RPM_BUILD_ROOT - -%__install -m 755 -d %{libtarget}/PackMan -%__install -m 755 -d %{libtarget}/DepMan -%__install -m 755 PackMan.pm %{libtarget} -%__install -m 755 DepMan.pm %{libtarget} -%__install -m 755 packman %{bintarget} -%__install -m 755 PackMan/RPM.pm %{libtarget}/PackMan -%__install -m 755 PackMan/DEB.pm %{libtarget}/PackMan -%__install -m 755 DepMan/UpdateRPMs.pm %{libtarget}/DepMan -%__install -m 755 DepMan/UpdateDEBs.pm %{libtarget}/DepMan -%__install -m 755 -d %{mantarget} -%__install -m 644 PackMan.3.gz %{mantarget} -%__install -m 644 DepMan.3.gz %{mantarget} -%__install -m 644 PackMan-RPM.3.gz %{mantarget} -%__install -m 644 PackMan-DEB.3.gz %{mantarget} -%__install -m 644 DepMan-UpdateRPMs.3.gz %{mantarget} -%__install -m 644 DepMan-UpdateDEBs.3.gz %{mantarget} - +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=/usr/lib/perl5/site_perl/OSCAR %clean rpms %__rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{binpref}/PackMan.pm -%{binpref}/DepMan.pm +%{binpref}/packman +%{libpref}/PackMan.pm %{manpref}/PackMan.3.* -%{manpref}/DepMan.3.* %files rpms %defattr(-,root,root) -%{binpref}/PackMan/RPM.pm -%{binpref}/PackMan/DEB.pm -%{binpref}/DepMan/UpdateRPMs.pm -%{binpref}/DepMan/UpdateDEBs.pm +%{libpref}/PackManDefs.pm +%{libpref}/PackMan/RPM.pm +%{libpref}/PackMan/DEB.pm %{manpref}/PackMan-RPM.3.* %{manpref}/PackMan-DEB.3.* -%{manpref}/DepMan-UpdateRPMs.3.* -%{manpref}/DepMan-UpdateDEBs.3.* %changelog +* Tue Jun 24 2008 Geoffroy Vallee <val...@or...> 2.9.2-1 +- new upstream version (see ChangeLog for more details). * Sun Jun 22 2008 Geoffroy Vallee <val...@or...> 2.9.1-1 - new upstream version (see ChangeLog for more details). * Thu Nov 08 2007 Erich Focht -> 2.9.0-1 |