OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2007 15:42:31
Branch: HEAD Handle: 2007011214423001
Modified files:
openpkg-src/bacula bacula.patch bacula.spec
Log:
require g++; avoid gzip, so dependency can be dropped
Summary:
Revision Changes Path
1.6 +33 -0 openpkg-src/bacula/bacula.patch
1.40 +2 -6 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 bacula.patch
--- openpkg-src/bacula/bacula.patch 15 May 2006 07:31:39 -0000 1.5
+++ openpkg-src/bacula/bacula.patch 12 Jan 2007 14:42:30 -0000 1.6
@@ -1,3 +1,36 @@
+Index: manpages/Makefile.in
+--- manpages/Makefile.in.orig 2006-08-27 20:30:56 +0200
++++ manpages/Makefile.in 2007-01-12 15:35:55 +0100
+@@ -20,23 +20,21 @@
+ install:
+ $(MKDIR) $(DESTDIR)/$(mandir)/man8
+ for I in ${MAN8}; \
+- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
+- rm -f $$I.gz); \
++ do \
++ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
+ done
+ $(MKDIR) $(DESTDIR)/$(mandir)/man1
+ for I in ${MAN1}; \
+- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
+- rm -f $$I.gz); \
++ do \
++ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
+ done
+
+ uninstall:
+ for I in ${MAN8}; \
+- do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
++ do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
+ done
+ for I in ${MAN1}; \
+- do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
++ do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
+ done
+
+ clean: dummy
Index: scripts/bacula.in
--- scripts/bacula.in.orig 2006-04-05 15:18:45 +0200
+++ scripts/bacula.in 2006-05-14 20:38:13 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 bacula.spec
--- openpkg-src/bacula/bacula.spec 8 Jan 2007 17:01:36 -0000 1.39
+++ openpkg-src/bacula/bacula.spec 12 Jan 2007 14:42:31 -0000 1.40
@@ -33,7 +33,7 @@
Group: System
License: GPL
Version: 2.0.0
-Release: 20070108
+Release: 20070112
# package options
%option with_server yes
@@ -61,7 +61,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, gzip
+BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes
PreReq: OpenPKG, openpkg >= 20060823
BuildPreReq: readline, zlib
PreReq: readline, zlib
@@ -248,10 +248,6 @@
-e 's,@with_server@,%{with_server},g' \
%{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # unpack manual pages
- %{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man1/*.gz
- %{l_gzip} -d $RPM_BUILD_ROOT%{l_prefix}/man/man8/*.gz
-
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
