rpms/subversion/devel subversion.spec,1.153,1.154

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6607

Modified Files:
	subversion.spec 
Log Message:
Ship svn2cl (#496456).


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- subversion.spec	19 Sep 2009 14:50:13 -0000	1.153
+++ subversion.spec	19 Sep 2009 14:54:38 -0000	1.154
@@ -12,10 +12,12 @@
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%global svn2cl_version 0.11
+
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -123,6 +125,23 @@ Requires: ruby(abi) = 1.8
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
 
+%package svn2cl
+Group: Development/Tools
+Summary: Create a ChangeLog from a Subversion log
+License: BSD
+# -5: fake release for the Obsoletes to work
+Provides: svn2cl = %{svn2cl_version}-5
+Obsoletes: svn2cl < 0.11-4
+BuildArch: noarch
+Requires: libxslt
+Requires: subversion = %{version}
+
+%description svn2cl
+svn2cl is a simple XSL transformation and shell script wrapper for
+generating a classic GNU-style ChangeLog from a subversion repository
+log.  It is made from several changelog-like scripts using common XSLT
+constructs found in different places.
+
 %prep
 %setup -q
 %patch2 -p1 -b .deplibs
@@ -136,6 +155,16 @@ sed -i -e 's|-fpie|-fPIE|g' Makefile.in
 %endif
 %patch8 -p1 -b .kwallet
 
+sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
+        contrib/client-side/svn2cl/svn2cl.sh
+# Sanity check svn2cl_version
+v=$(contrib/client-side/svn2cl/svn2cl.sh -V | head -n 1 | awk '{ print $2 }')
+if [ "$v" != "%{svn2cl_version}" ]; then
+        echo -n "ERROR: svn2cl_version not up to date in specfile: "
+        echo "'$v' <> '%{svn2cl_version}'"
+        exit 1
+fi
+
 %build
 # Regenerate the buildsystem, so that:
 #  1) patches applied to configure.in take effect
@@ -231,6 +260,14 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Install svn2cl
+pushd contrib/client-side/svn2cl
+install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
+install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
+install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1
+popd
+
 # Install bash completion
 install -Dpm 644 tools/client-side/bash_completion \
         $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
@@ -333,9 +370,18 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_javadir}/svn-javahl.jar
 %endif
 
+%files svn2cl
+%defattr(-,root,root,-)
+%doc contrib/client-side/svn2cl/NEWS contrib/client-side/svn2cl/README
+%doc contrib/client-side/svn2cl/TODO contrib/client-side/svn2cl/authors.xml
+%doc contrib/client-side/svn2cl/svn2html.css
+%{_bindir}/svn2cl
+%{_datadir}/svn2cl/
+%{_mandir}/man1/svn2cl.1*
+
 %changelog
-* Sat Sep 19 2009 Ville Skyttä <ville.skytta at iki.fi>
-- Ship bash completion (#496456).
+* Sat Sep 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.5-2
+- Ship svn2cl and bash completion (#496456).
 - Add %%defattr to -gnome and -kde.
 
 * Sun Aug 23 2009 Joe Orton <jorton at redhat.com> 1.6.5-1