- merged

[packages/cvsspam.git] / cvsspam.spec

diff --git a/cvsspam.spec b/cvsspam.spec
index a1562827061f11de03015a9e80a54e8ce24e5f03..7cf681f533960fd8c6a3a0f8a06887f6b3f0b9fa 100644 (file)
--- a/cvsspam.spec
+++ b/cvsspam.spec
@@ -1,30 +1,28 @@
 Summary:       CVSspam emails you diffs when someone commits a change to your CVS repository
-Summary(pl):   CVSspam - wysy³anie ró¿nic po wykonaniu zmiany w repozytorium CVS
+Summary(pl.UTF-8):     CVSspam - wysyłanie różnic po wykonaniu zmiany w repozytorium CVS
 Name:          cvsspam
-Version:       0.2.11
-Release:       6.1
-Epoch:         0
+Version:       0.2.12
+Release:       11.4
 License:       GPL
 Group:         Applications/System
-Source0:       http://www.badgers-in-foil.co.uk/projects/cvsspam/%{name}-%{version}.tar.gz
-# Source0-md5: e2fe350b845ad1d2ff935f623a0f543a
-Patch0:                %{name}-users-quote.patch
-Patch1:                %{name}-charset-arg.patch
-Patch2:                %{name}-filenr.patch
-Patch3:                %{name}-trailing-cvsinfo-slash.patch
-Patch4:                %{name}-optkb_binary_hint.patch
-Patch5:                %{name}-encode_email_personal_name.patch
-Patch6:                %{name}-cvsroot_trailing_slash.patch
-Patch7:                %{name}-mail_threading.patch
+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}-svn-noshortrepo.patch
 URL:           http://www.badgers-in-foil.co.uk/projects/cvsspam/
-BuildRequires: rpmbuild(macros) >= 1.177
-Requires:      cvs
-Requires:      ruby
+BuildRequires: rpmbuild(macros) >= 1.277
+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.
@@ -32,22 +30,20 @@ Syntax-highlighted diffs describe the changes made, and links to Web
 frontends on CVS and bug tracking systems are generated where
 possible.
 
-%description -l pl
-CVSspam wysy³a wiadomo¶æ po wykonaniu zmiany w repozytorium CVS.
-Ró¿nice z pod¶wietlaniem sk³adni opisuj± wykonane zmiany, a je¶li to
-mo¿liwe, generowane s± odno¶niki do frontendów WWW do CVS i systemów
-¶ledzenia b³êdów.
+%description -l pl.UTF-8
+CVSspam wysyła wiadomość po wykonaniu zmiany w repozytorium CVS.
+Różnice z podświetlaniem składni opisują wykonane zmiany, a jeśli to
+możliwe, generowane są odnośniki do frontendów WWW do CVS i systemów
+śledzenia błędów.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+rm -f svn_*.rb
+%patch100 -p0
+%patch101 -p0
+%patch0 -p0
+%patch1 -p0
 %patch2 -p1
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
-%patch6 -p0
-%patch7 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,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
@@ -67,7 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 rmdir %{_libdir}/%{name} 2>/dev/null || mv -v %{_libdir}/%{name}{,.rpmsave}
 ln -s %{_datadir} %{_libdir}/%{name}
 %banner %{name} -e <<EOF
-NOTE: The cvsspam programs have been moved to %{_datadir}.
+NOTE:
+The cvsspam programs have been moved to %{_datadir}.
 I've created compat symlink so you don't feel so much pain of that.
 
 EOF
@@ -75,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}/*