- shadow outer var fix

[packages/cvsspam.git] / cvsspam.spec

diff --git a/cvsspam.spec b/cvsspam.spec
index f4ea79d559a2f484d8b1ca6c592ea817baa8f521..b390fc2b2dc912c6d7e6229302857ac05a2a6c59 100644 (file)
--- a/cvsspam.spec
+++ b/cvsspam.spec
@@ -2,22 +2,27 @@ Summary:      CVSspam emails you diffs when someone commits a change to your CVS repo
 Summary(pl.UTF-8):     CVSspam - wysyłanie różnic po wykonaniu zmiany w repozytorium CVS
 Name:          cvsspam
 Version:       0.2.12
-Release:       7.1
+Release:       13.1
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/%{name}-%{version}.tar.gz
 # Source0-md5: 0afa4fbaf1c9edb27385e46337f80f4b
-Patch0:                %{name}-users_file_charset.patch
+Source1:       %{name}-branch.sh
 Patch100:      %{name}-branch.diff
+Patch0:                %{name}-textdiff.patch
+Patch1:                %{name}-tracfunc.patch
+Patch2:                ruby19.patch
+Patch3:                ruby19-shadow-outer-var.patch
 URL:           http://www.badgers-in-foil.co.uk/projects/cvsspam/
 BuildRequires: rpmbuild(macros) >= 1.277
-Requires:      cvs
+Requires:      cvs-client
 %{?ruby_mod_ver_requires_eq}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/%{name}
 %define                _datadir        %{_prefix}/share/%{name}
+%define                _libdir         %{_prefix}/lib
 
 %description
 CVSspam sends email when a change is committed to the CVS repository.
@@ -33,16 +38,23 @@ możliwe, generowane są odnośniki do frontendów WWW do CVS i systemów
 
 %prep
 %setup -q
-%patch100 -p1
+rm svn_post_commit_hook.rb
+%patch100 -p0
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_datadir},%{_sysconfdir}}
+install -p {collect_diffs,cvsspam,record_lastdir}.rb $RPM_BUILD_ROOT%{_datadir}
+cp -a cvsspam.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-install {collect_diffs,cvsspam,record_lastdir}.rb $RPM_BUILD_ROOT%{_datadir}
-install cvsspam.conf $RPM_BUILD_ROOT%{_sysconfdir}
+# svn part
+install -p svn_post_commit_hook.rb $RPM_BUILD_ROOT%{_datadir}
 
+# compat
 ln -s %{_datadir} $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %clean
@@ -63,8 +75,9 @@ EOF
 %files
 %defattr(644,root,root,755)
 %doc CREDITS TODO cvsspam-doc.pdf cvsspam-doc.html
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cvsspam.conf
 %dir %{_datadir}
-%attr(755,root,root) %{_datadir}/*
+%attr(755,root,root) %{_datadir}/*.rb
+
 %ghost %{_libdir}/%{name}
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*