Author: arekm Date: Mon Jan 2 09:22:46 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merged 1.3.0 from DEVEL
---- Files affected: SPECS: subversion.spec (1.149 -> 1.150) ---- Diffs: ================================================================ Index: SPECS/subversion.spec diff -u SPECS/subversion.spec:1.149 SPECS/subversion.spec:1.150 --- SPECS/subversion.spec:1.149 Thu Dec 22 00:18:53 2005 +++ SPECS/subversion.spec Mon Jan 2 10:22:41 2006 @@ -5,7 +5,6 @@ # without db => net_client_only - spec will be more simpler, I think) # # Conditional build: -%bcond_with internal_neon # build with internal neon %bcond_with net_client_only # build only net client %bcond_without python # build without python bindings %bcond_without perl # build without perl bindings @@ -16,18 +15,17 @@ Summary(pl): System kontroli wersji podobny, ale lepszy, niż CVS Summary(pt_BR): Sistema de versionamento concorrente Name: subversion -Version: 1.2.3 -Release: 2 +Version: 1.3.0 +Release: 1 License: Apache/BSD Style Group: Development/Version Control -Source0: http://subversion.tigris.org/tarballs/%{name}-%{version}.tar.bz2 -# Source0-md5: a14bc6590241b6e5c2ff2b354cc184a1 +Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz +# Source0-md5: 0d91a7fe152d0373044c47c54deb2c9a Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init Source4: %{name}-svnserve.sysconfig Patch0: %{name}-home_etc.patch -Patch1: %{name}-po.pl.patch URL: http://subversion.tigris.org/ %if %{with net_client_only} %global apache_modules_api 0 @@ -49,10 +47,7 @@ BuildRequires: expat-devel BuildRequires: gettext-devel BuildRequires: libtool >= 1.4-9 -%if %{without internal_neon} -BuildRequires: neon-devel < 0.25.0 BuildRequires: neon-devel >= 0.24.7 -%endif %if %{with python} BuildRequires: python-devel >= 2.2 BuildRequires: python-modules >= 2.2 @@ -115,7 +110,7 @@ Summary(pl): Biblioteka subversion oraz ładowalne moduły Group: Libraries Obsoletes: libsubversion0 -%{!?with_internal_neon:Requires: neon >= 0.24.6} +Requires: neon >= 0.24.7 %description libs Subversion libraries and modules. @@ -130,7 +125,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: apr-util-devel >= 1:1.0.0 -%{!?with_internal_neon:Requires: neon-devel >= 0.24.6} +Requires: neon-devel >= 0.24.7 Obsoletes: libsubversion0-devel %description devel @@ -194,9 +189,9 @@ Summary: bash completion for subversion Summary(pl): Dopełnienia basha dla subversion Group: Applications/Shells -Requires: %{name} = %{version}-%{release} Requires: bash-completion -Conflicts: %{name}-tools <= 1.1.0-0.rc2.1 +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-tools <= 1.1.0-0.rc6.1 %description -n bash-completion-subversion Bash completion for subversion. @@ -270,10 +265,8 @@ %prep %setup -q +rm -rf apr apr-util neon %patch0 -p0 -%patch1 -p1 - -rm -rf apr-util{,/xml/expat}/autom4te.cache %build cp -f /usr/share/automake/config.sub ac-helpers @@ -304,7 +297,7 @@ --without-swig \ %endif %endif - %{!?with_internal_neon:--with-neon=%{_prefix}} \ + --with-neon=%{_prefix} \ --with-apr=%{_bindir}/apr-1-config \ --with-apr-util=%{_bindir}/apu-1-config @@ -438,7 +431,6 @@ %{_mandir}/man5/* %{_mandir}/man8/* %exclude %{_mandir}/man?/svnserve* -%{?with_internal_neon:%exclude %{_mandir}/man1/neon*} %files libs -f %{name}.lang %defattr(644,root,root,755) @@ -525,10 +517,36 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.150 2006/01/02 09:22:41 arekm +- merged 1.3.0 from DEVEL + Revision 1.149 2005/12/21 23:18:53 glen - rebuild with new apache - sort BR/R - rel 2 + +Revision 1.148.2.7 2006/01/02 09:17:13 arekm +- up to final 1.3.0 (temporary use gz tarball since bz2 is broken on upstream server) + +Revision 1.148.2.6 2005/12/18 19:04:38 pluto +- updated to 1.3.0rc6. + +Revision 1.148.2.5 2005/11/24 09:33:20 pluto +- ehh, typo. + +Revision 1.148.2.4 2005/11/24 09:30:41 pluto +- alt. source0 for unrelased sources. + +Revision 1.148.2.3 2005/11/24 09:24:46 pluto +- updated to 1.3.0rc4. + +Revision 1.148.2.2 2005/11/04 12:10:34 pluto +- files fixed. + +Revision 1.148.2.1 2005/11/04 12:08:13 pluto +- updated to 1.3.0rc2. + # works with neon { 0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 } + # contains fixes specifically made for the needs of GCC developers :) Revision 1.148 2005/10/11 19:40:25 qboosh - removed svn-config duplicate from base ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/subversion.spec?r1=1.149&r2=1.150&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
