- merged

[packages/cvsspam.git] / cvsspam.spec

diff --git a/cvsspam.spec b/cvsspam.spec
index e4d934034ffc7e8ab62df6c080a85ef1401304c3..7cf681f533960fd8c6a3a0f8a06887f6b3f0b9fa 100644 (file)
--- a/cvsspam.spec
+++ b/cvsspam.spec
@@ -2,17 +2,17 @@ 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:       11
+Release:       11.4
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/%{name}-%{version}.tar.gz
 # Source0-md5: 0afa4fbaf1c9edb27385e46337f80f4b
+Source1:       %{name}-branch.sh
 Patch100:      %{name}-branch.diff
 Patch101:      %{name}-svnspam-branch.diff
 Patch0:                %{name}-multibyte_enc_disables_highlight-patch1.diff
 Patch1:                %{name}-textdiff.patch
-Patch2:                %{name}-rfc2045.patch
-Patch3:                %{name}-trac.patch
+Patch2:                %{name}-svn-noshortrepo.patch
 URL:           http://www.badgers-in-foil.co.uk/projects/cvsspam/
 BuildRequires: rpmbuild(macros) >= 1.277
 Requires:      cvs-client
@@ -38,12 +38,12 @@ możliwe, generowane są odnośniki do frontendów WWW do CVS i systemów
 
 %prep
 %setup -q
+rm -f svn_*.rb
 %patch100 -p0
-%patch101 -p1
+%patch101 -p0
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +52,9 @@ install -d $RPM_BUILD_ROOT{%{_libdir},%{_datadir},%{_sysconfdir}}
 install {collect_diffs,cvsspam,record_lastdir}.rb $RPM_BUILD_ROOT%{_datadir}
 install cvsspam.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
+# svn part
+install svn_post_commit_hook.rb $RPM_BUILD_ROOT%{_datadir}
+
 ln -s %{_datadir} $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %clean
@@ -72,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}/*