|
|
@@ -12,9 +12,9 @@
|
|
|
Summary: Modern Version Control System
|
|
|
Summary(ja): モダンなバージョン管理システム
|
|
|
Name: subversion
|
|
|
-Version: 1.6.17
|
|
|
+Version: 1.7.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
-License: ASL 1.1
|
|
|
+License: ASL 2.0
|
|
|
Group: Development/Tools
|
|
|
URL: http://subversion.apache.org/
|
|
|
|
|
|
@@ -26,10 +26,7 @@ SOURCE0: subversion-%{version}.tar.bz2
|
|
|
SOURCE1: subversion.conf
|
|
|
SOURCE2: httpd.davcheck.conf
|
|
|
SOURCE3: filter-requires.sh
|
|
|
-Patch1: subversion-1.6.0-deplibs.patch
|
|
|
-Patch3: subversion-1.6.1-rpath.patch
|
|
|
-Patch6: subversion-1.5.0-pie.patch
|
|
|
-Patch10: subversion-1.5.7-update-neon-m4.patch
|
|
|
+Patch3: subversion-1.7.0-rpath.patch
|
|
|
|
|
|
Requires: db4 >= %{db_version}
|
|
|
Requires: expat
|
|
|
@@ -126,12 +123,7 @@ This package includes the Python bindings to the Subversion libraries.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1 -p1 -b .deplibs
|
|
|
%patch3 -p1 -b .rpath
|
|
|
-## comment out: 1.6.9-1
|
|
|
-#%patch6 -p1 -b .pie
|
|
|
-## comment out: 1.6.9-1
|
|
|
-#%patch10 -p1 -b .nola
|
|
|
|
|
|
rm -rf neon apr apr-util db4
|
|
|
|
|
|
@@ -273,6 +265,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 18 2012 IWAI, Masaharu <iwai@alib.jp> 1.7.6-1
|
|
|
+- new upstream release
|
|
|
+- update License
|
|
|
+- update rpath patch (Patch3) from Fedora 1.7.6-1.fc19
|
|
|
+- drop deplibs patch (Patch1)
|
|
|
+- drop obsolete patch files: Patch6, 10
|
|
|
+
|
|
|
* Fri Jun 3 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp>
|
|
|
- new upstream release with security fix (CVE-2011-1752, 1783, 1921)
|
|
|
- add configure option with-gnome-keyring
|
iwaim