packages: subversion/subversion-DESTDIR.patch, subversion/subversion.spec -...

arekm arekm at pld-linux.org
Fri Sep 16 11:11:52 CEST 2011 

Author: arekm                        Date: Fri Sep 16 09:11:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.7.0rc3 (final in 2 weeks); disable ruby as it supports ruby 1.8 only; todo item obsolete (bug resolved some time ago)

---- Files affected:
packages/subversion:
   subversion-DESTDIR.patch (1.4 -> 1.5) , subversion.spec (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: packages/subversion/subversion-DESTDIR.patch
diff -u packages/subversion/subversion-DESTDIR.patch:1.4 packages/subversion/subversion-DESTDIR.patch:1.5
--- packages/subversion/subversion-DESTDIR.patch:1.4	Fri Mar  6 08:46:44 2009
+++ packages/subversion/subversion-DESTDIR.patch	Fri Sep 16 11:11:47 2011
@@ -18,14 +18,15 @@
  INSTALL_DATA = $(INSTALL) -m 644
  INSTALL_LOCALE = $(INSTALL_DATA)
  
---- subversion-1.3.0/build/generator/gen_make.py.orig	2005-11-17 01:43:35.000000000 +0100
-+++ subversion-1.3.0/build/generator/gen_make.py	2006-01-13 21:40:05.377108000 +0100
-@@ -407,7 +407,7 @@
-           base, ext = os.path.splitext(fname)
-           name = string.replace(base, 'mod_', '')
-           self.ofile.write('\tcd %s ; '
--                           '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; '
-+                           '$(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; '
-                            '$(INSTALL_MOD_SHARED) -n %s %s\n'
-                            % (dirname, name, fname))
-           if ext == '.la':
+--- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~	2011-04-27 23:54:33.000000000 +0200
++++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt	2011-09-16 08:46:27.559338812 +0200
+@@ -125,7 +125,7 @@
+ ########################################
+ [for areas]
+ [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
+-	cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
++	cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
+ [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+ 	$(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
+ 	$(MKDIR) [areas.files.installdir]
+

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.314 packages/subversion/subversion.spec:1.315
--- packages/subversion/subversion.spec:1.314	Wed Aug  3 08:16:48 2011
+++ packages/subversion/subversion.spec	Fri Sep 16 11:11:47 2011
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - http://subversion.tigris.org/issues/show_bug.cgi?id=2753
 #
 # Conditional build:
 %bcond_with	net_client_only		# build only net client
@@ -9,7 +7,7 @@
 %bcond_without	python			# build without Python bindings (broken)
 %bcond_without	csvn			# build Python csvn bindings
 %bcond_without	perl			# build without Perl bindings
-%bcond_without	ruby			# build without Ruby bindings
+%bcond_with	ruby			# build without Ruby bindings
 %bcond_without	apache			# build without Apache support (webdav, etc)
 %bcond_without	javahl			# build without javahl support (Java high-level bindings)
 %bcond_without	tests			# don't perform "make check"
@@ -53,12 +51,13 @@
 Summary(pl.UTF-8):	System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):	Sistema de versionamento concorrente
 Name:		subversion
-Version:	1.6.17
-Release:	2
+Version:	1.7.0
+Release:	0.1
 License:	Apache/BSD-like
 Group:		Development/Version Control
-Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	81e5dc5beee4b3fc025ac70c0b6caa14
+#Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2
+Source0:	http://www.idg.pl/mirrors/apache/subversion/subversion-1.7.0-rc3.tar.bz2
+# Source0-md5:	c27b70bd8a73fef0ec54c62312c528b9
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -91,7 +90,8 @@
 BuildRequires:	swig-python >= 1.3.24
 %endif
 %if %{with ruby}
-BuildRequires:	ruby-devel
+BuildRequires:	ruby-devel >= 1:1.8
+BuildRequires:	ruby-devel < 1:1.9
 BuildRequires:	ruby-rubygems
 BuildRequires:	swig-ruby >= 1.3.24
 %endif
@@ -417,7 +417,7 @@
 uwierzytelniać się przy użyciu Portfela KDE.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc3
 %patch0 -p0
 %patch1 -p1
 %patch2 -p0
@@ -684,7 +684,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS CHANGES COPYING INSTALL README
+%doc BUGS CHANGES INSTALL README
 %doc doc/*/*.html
 %doc tools/hook-scripts/*.{pl,py,example}
 %doc tools/hook-scripts/mailer/*.{py,example}
@@ -692,12 +692,14 @@
 %attr(755,root,root) %{_bindir}/svn
 %attr(755,root,root) %{_bindir}/svnadmin
 %attr(755,root,root) %{_bindir}/svndumpfilter
+%attr(755,root,root) %{_bindir}/svnrdump
 %attr(755,root,root) %{_bindir}/svnlook
 %attr(755,root,root) %{_bindir}/svnsync
 %attr(755,root,root) %{_bindir}/svnversion
 %{_mandir}/man1/svn.1*
 %{_mandir}/man1/svnadmin.1*
 %{_mandir}/man1/svndumpfilter.1*
+%{_mandir}/man1/svnrdump.1*
 %{_mandir}/man1/svnlook.1*
 %{_mandir}/man1/svnsync.1*
 %{_mandir}/man1/svnversion.1*
@@ -914,6 +916,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315  2011/09/16 09:11:47  arekm
+- up to 1.7.0rc3 (final in 2 weeks); disable ruby as it supports ruby 1.8 only; todo item obsolete (bug resolved some time ago)
+
 Revision 1.314  2011/08/03 06:16:48  baggins
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion-DESTDIR.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.314&r2=1.315&f=u

More information about the pld-cvs-commit mailing list