rpms/rapidsvn/devel rapidsvn.spec,1.9,1.10

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/rapidsvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28892

Modified Files:
	rapidsvn.spec 
Log Message:
* Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 0.9.4-5
- don't link against neon directly



Index: rapidsvn.spec
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rapidsvn.spec	19 Aug 2007 11:32:55 -0000	1.9
+++ rapidsvn.spec	23 Aug 2007 14:30:16 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rapidsvn
 Version:        0.9.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical interface for the Subversion revision control system
 
 Group:          Development/Tools
@@ -17,7 +17,7 @@
 # has unresolved symbols if run against svncpp from the 0.9.1 distribution
 Requires:       svncpp = %{version}
 
-BuildRequires:  apr-devel, apr-util-devel, neon-devel
+BuildRequires:  apr-devel, apr-util-devel
 BuildRequires:  libtool >= 1.4.2
 
 # For doc generation; rapidsvn needs the "dot" tool from graphviz
@@ -80,13 +80,18 @@
 EOF
 
 %build
+# rapidsvn doesn't use neon directly, so trick the configure
+# script into not linking against it using /bin/true in place
+# of neon-config
+
 %configure \
         --disable-static \
         --disable-no-exceptions \
         --with-svn-lib=%{_libdir} \
         --with-apu-config=%{_bindir}/apu-1-config \
         --with-apr-config=%{_bindir}/apr-1-config \
-        --with-docbook-xsl-manpages=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl
+        --with-docbook-xsl-manpages=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+        --with-neon-config=/bin/true
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -146,6 +151,9 @@
 %{_libdir}/libsvncpp.so
 
 %changelog
+* Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 0.9.4-5
+- don't link against neon directly
+
 * Sat Dec 30 2006 Tim Jackson <rpm at timj.co.uk> 0.9.4-3
 - Apply patches to build against wxGTK 2.8