rpms/subversion/devel subversion.spec,1.97,1.98
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Wed Aug 22 10:37:59 UTC 2007
- Previous message (by thread): rpms/opal/F-7 ekiga-429076-42.patch, NONE, 1.1 ekiga-429076-50.patch, NONE, 1.1 opal.spec, 1.19, 1.20 rfc2833_duration.patch, 1.1, NONE
- Next message (by thread): rpms/system-config-network/F-7 .cvsignore, 1.19, 1.20 sources, 1.21, 1.22 system-config-network.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16529
Modified Files:
subversion.spec
Log Message:
* Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.4.4-4
- trim dependencies from .la files
- detabify spec file
- test suite disabled to ease stress on builders
Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- subversion.spec 8 Aug 2007 14:04:42 -0000 1.97
+++ subversion.spec 22 Aug 2007 10:37:26 -0000 1.98
@@ -1,5 +1,5 @@
# set to zero to avoid running test suite
-%define make_check 1
+%define make_check 0
%define with_java 1
@@ -15,7 +15,7 @@
Summary: Modern Version Control System designed to replace CVS
Name: subversion
Version: 1.4.4
-Release: 3
+Release: 4
License: BSD
Group: Development/Tools
URL: http://subversion.tigris.org/
@@ -124,7 +124,7 @@
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
- --with-swig --with-neon=%{_prefix} \
+ --with-swig --with-neon=%{_prefix} \
--with-ruby-sitedir=%{ruby_sitearch} \
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
--disable-static
@@ -134,7 +134,7 @@
make swig-py swig-py-lib %{swigdirs}
make swig-pl swig-pl-lib swig-rb swig-rb-lib
%if %{with_java}
-make javahl
+make %{?_smp_mflags} javahl
%endif
%install
@@ -184,6 +184,12 @@
# Rename authz_svn INSTALL doc for docdir
ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
+# Trim exported dependencies to SVN and APR libraries only:
+sed -i "/^dependency_libs/{
+ s, -l[^ ']*, ,g;
+ s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
+ }" $RPM_BUILD_ROOT%{_libdir}/*.la
+
%find_lang %{name}
%if %{make_check}
@@ -267,6 +273,11 @@
%endif
%changelog
+* Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.4.4-4
+- trim dependencies from .la files
+- detabify spec file
+- test suite disabled to ease stress on builders
+
* Wed Aug 8 2007 Joe Orton <jorton at redhat.com> 1.4.4-3
- fix build with new glibc open()-as-macro
- build all swig code in %%build, not %%install
- Previous message (by thread): rpms/opal/F-7 ekiga-429076-42.patch, NONE, 1.1 ekiga-429076-50.patch, NONE, 1.1 opal.spec, 1.19, 1.20 rfc2833_duration.patch, 1.1, NONE
- Next message (by thread): rpms/system-config-network/F-7 .cvsignore, 1.19, 1.20 sources, 1.21, 1.22 system-config-network.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list