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: 30-Jul-2007 19:56:36
Branch: HEAD Handle: 2007073018563500
Added files:
openpkg-src/svnnotify svnnotify.patch
Modified files:
openpkg-src/svnnotify svnnotify.spec
Log:
ensure that svnnotify picks up the right tools
Summary:
Revision Changes Path
1.1 +21 -0 openpkg-src/svnnotify/svnnotify.patch
1.2 +5 -2 openpkg-src/svnnotify/svnnotify.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/svnnotify/svnnotify.patch
============================================================================
$ cvs diff -u -r0 -r1.1 svnnotify.patch
--- /dev/null 2007-07-30 19:56:28 +0200
+++ svnnotify.patch 2007-07-30 19:56:36 +0200
@@ -0,0 +1,21 @@
+Index: SVN-Notify-2.66/lib/SVN/Notify.pm
+--- SVN-Notify-2.66/lib/SVN/Notify.pm.orig 2007-06-17 07:08:29 +0200
++++ SVN-Notify-2.66/lib/SVN/Notify.pm 2007-07-30 19:48:01 +0200
+@@ -851,7 +851,7 @@
+ my $exe = SVN::Notify->find_exe($exe_name);
+
+ This method searches through the system path, as well as the extra
directories
+-F</usr/local/bin> and F</usr/sbin> (because they're common paths for
++F<@l_prefix@/bin> and F</usr/sbin> (because they're common paths for
+ C<svnlook> and C<sendmail> for an executable file with the name
C<$exe_name>.
+ The first one it finds is returned with its full path. If none is found,
+ C<find_exe()> returns undef.
+@@ -863,7 +863,7 @@
+ $exe .= '.exe' if WIN32;
+ require File::Spec;
+ for my $path (
+- File::Spec->path, qw(/usr/local/bin /usr/bin /usr/sbin),
++ File::Spec->path, qw(@l_prefix@/bin /usr/bin /usr/sbin),
+ 'C:\\program files\\subversion\\bin'
+ ) {
+ my $file = File::Spec->catfile($path, $exe);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/svnnotify/svnnotify.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 svnnotify.spec
--- openpkg-src/svnnotify/svnnotify.spec 30 Jul 2007 17:15:38 -0000
1.1
+++ openpkg-src/svnnotify/svnnotify.spec 30 Jul 2007 17:56:35 -0000
1.2
@@ -45,12 +45,13 @@
# list of sources
Source0:
http://www.cpan.org/modules/by-module/SVN/SVN-Notify-%{V_svn_notify}.tar.gz
Source1:
http://www.cpan.org/modules/by-module/SVN/SVN-Notify-Config-%{V_svn_notify_config}.tar.gz
+Patch0: svnnotify.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, perl-openpkg
-PreReq: OpenPKG, openpkg >= 20060823
+PreReq: OpenPKG, openpkg >= 20060823, subversion
BuildPreReq: perl, perl-net, perl-xml, perl-module
PreReq: perl, perl-net, perl-xml, perl-module
%if "%{with_config}" == "yes"
@@ -87,6 +88,7 @@
%if "%{with_config}" == "yes"
%setup -q -D -T -a 1
%endif
+ %{l_sed} <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
%build
%{l_prefix}/bin/perl-openpkg prepare
@@ -102,7 +104,8 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE1} install
%endif
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} `cat perl-openpkg-files`
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
