[svn] r4900 - in trunk/rpms: 4g8 mercator nmap subversion
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Nov 19 00:59:50 CET 2006
Author: dag
Date: 2006-11-19 00:59:38 +0100 (Sun, 19 Nov 2006)
New Revision: 4900
Added:
trunk/rpms/subversion/subversion-1.2.spec
trunk/rpms/subversion/subversion-1.3.0-pie.patch
trunk/rpms/subversion/subversion-1.4.spec
Modified:
trunk/rpms/4g8/4g8.spec
trunk/rpms/mercator/mercator.spec
trunk/rpms/nmap/nmap.spec
Log:
Updates
Modified: trunk/rpms/4g8/4g8.spec
===================================================================
--- trunk/rpms/4g8/4g8.spec 2006-11-18 23:37:30 UTC (rev 4899)
+++ trunk/rpms/4g8/4g8.spec 2006-11-18 23:59:38 UTC (rev 4900)
@@ -52,7 +52,7 @@
%{__rm} -rf %{buildroot}
%changelog
-p Thu Apr 15 2004 Dag Wieers <dag at wieers.com> - 1.0-1
+* Thu Apr 15 2004 Dag Wieers <dag at wieers.com> - 1.0-1
- Updated to release 1.0.
* Mon Jan 26 2004 Dag Wieers <dag at wieers.com> - 0.9-0.b
Modified: trunk/rpms/mercator/mercator.spec
===================================================================
--- trunk/rpms/mercator/mercator.spec 2006-11-18 23:37:30 UTC (rev 4899)
+++ trunk/rpms/mercator/mercator.spec 2006-11-18 23:59:38 UTC (rev 4900)
@@ -66,8 +66,5 @@
* Thu Aug 24 2006 Dries Verachtert <dries at ulyssis.org> - 0.2.5-1
- Updated to release 0.2.5.
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.2.4-1.2
-- Rebuild for Fedora Core 5.
-
* Wed Jan 04 2006 Dries Verachtert <dries at ulyssis.org> - 0.2.4-1
- Initial package.
Modified: trunk/rpms/nmap/nmap.spec
===================================================================
--- trunk/rpms/nmap/nmap.spec 2006-11-18 23:37:30 UTC (rev 4899)
+++ trunk/rpms/nmap/nmap.spec 2006-11-18 23:59:38 UTC (rev 4900)
@@ -4,6 +4,9 @@
%{?dist: %{expand: %%define %dist 1}}
+%{!?dist:%define _with_libpcapdevel 1}
+%{?fc6:%define _with_libpcapdevel 1}
+
%{?fc1:%define _without_gtk24 1}
%{?el3:%define _without_gtk24 1}
%{?rh9:%define _without_gtk24 1}
@@ -27,7 +30,7 @@
Source: http://download.insecure.org/nmap/dist/nmap-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, libpcap, pcre-devel, openssl-devel
-%{?fc6:BuildRequires:libpcap-devel}
+%{?_with_libpcapdevel:BuildRequires:libpcap-devel}
%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
%{!?_without_gtk24:BuildRequires: gtk2-devel >= 2.4}
Added: trunk/rpms/subversion/subversion-1.2.spec
===================================================================
--- trunk/rpms/subversion/subversion-1.2.spec (rev 0)
+++ trunk/rpms/subversion/subversion-1.2.spec 2006-11-18 23:59:38 UTC (rev 4900)
@@ -0,0 +1,461 @@
+# $Id: subversion.spec 3386 2005-07-13 04:11:39Z dag $
+# Authority: dag
+
+##ExcludeDist: fc3
+##Tag: test
+
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el3:%define _without_swig 1}
+%{?rh9:%define _without_pie 1}
+%{?rh9:%define _without_swig 1}
+%{?rh7:%define _without_pie 1}
+%{?rh7:%define _without_swig 1}
+%{?el2:%define _without_pie 1}
+%{?el2:%define _without_swig 1}
+
+# set to zero to avoid running test suite
+%define make_check 0
+
+%define python_dir %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+Summary: Modern Version Control System designed to replace CVS
+Name: subversion
+Version: 1.2.1
+### FC3 comes with release 1.1
+Release: 0.1.rf
+License: BSD
+Group: Development/Tools
+URL: http://subversion.tigris.org/
+
+Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.bz2
+Source1: subversion.conf
+Source3: filter-requires.sh
+Source4: http://www.xsteve.at/prg/emacs/psvn.el
+Patch1: subversion-0.24.2-swig.patch
+Patch2: subversion-0.20.1-deplibs.patch
+Patch3: subversion-0.31.0-rpath.patch
+Patch6: subversion-1.0.3-pie.patch
+Patch7: subversion-1.1.3-java.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: autoconf, libtool, python, python-devel, texinfo
+BuildRequires: expat-devel, docbook-style-xsl
+BuildRequires: apr-devel >= 0.9.3-2, apr-util-devel >= 0.9.3-2, openssl-devel
+BuildRequires: neon-devel >= 0.24.7-1
+#%{!?_without_swig:BuildRequires: swig >= 1.3.21-5}
+%{!?_without_swig:BuildRequires: swig}
+
+%define __perl_requires %{SOURCE3}
+
+# Put Python bindings in site-packages
+%define swigdirs swig_pydir=%{python_dir}/libsvn swig_pydir_extra=%{python_dir}/svn
+
+%description
+Subversion is a concurrent version control system which enables one
+or more users to collaborate in developing and maintaining a
+hierarchy of files and directories while keeping a history of all
+changes. Subversion only stores the differences between versions,
+instead of every complete file. Subversion is intended to be a
+compelling replacement for CVS.
+
+%package devel
+Group: Development/Tools
+Summary: Development package for Subversion developers.
+Requires: subversion = %{version}-%{release}, apr-devel, apr-util-devel
+
+%description devel
+The subversion-devel package includes the static libraries and
+include files for developers interacting with the subversion
+package.
+
+%package -n mod_dav_svn
+Group: System Environment/Daemons
+Summary: Apache server module for Subversion server.
+Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
+Requires: subversion = %{version}-%{release}
+BuildRequires: httpd-devel >= 2.0.45
+
+%description -n mod_dav_svn
+The mod_dav_svn package allows access to a Subversion repository
+using HTTP, via the Apache httpd server.
+
+%package perl
+Group: Development/Libraries
+Summary: Perl bindings to the Subversion libraries
+BuildRequires: perl >= 2:5.8.0
+Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
+Requires: subversion = %{version}-%{release}
+
+%description perl
+This package includes the Perl bindings to the Subversion libraries.
+
+%prep
+%setup
+%patch1 -p1 -b .swig
+%patch2 -p1 -b .deplibs
+%patch3 -p1 -b .rpath
+%{!?_without_pie:%patch6 -p1 -b .pie}
+
+%{__rm} -rf neon apr apr-util
+
+echo _without_swig: %{_without_swig}
+echo _without_pie: %{_without_pie}
+echo dist: %{dist}
+
+%build
+./autogen.sh
+
+# requirement for apr 0.9.5 seems to be bogus
+%{__perl} -pi.orig -e 's/\.\[5-9\]/\.\[4-9\]/' configure
+
+# fix shebang lines, #111498
+%{__perl} -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
+
+export CC=gcc CXX=g++
+%configure \
+ --with-apr="%{_prefix}" \
+ --with-apr-util="%{_prefix}" \
+ --with-apxs="%{_sbindir}/apxs" \
+ --disable-mod-activation \
+ --with-neon="%{_prefix}" \
+%{!?_without_swig:--with-swig} \
+ --with-expat \
+ --with-ssl
+%{__make} %{?_smp_mflags} all
+
+%if %{!?_without_swig:1}0
+%{__make} %{?_smp_mflags} swig-py %{swigdirs}
+
+%{__make} %{?_smp_mflags} swig-pl %{swigdirs}
+
+# build the perl modules
+#pushd subversion/bindings/swig/perl
+#CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor"
+#%{__make} %{?_smp_mflags}
+#popd
+%endif
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install \
+ DESTDIR="%{buildroot}"
+
+%if %{!?_without_swig:1}0
+%{__make} install-swig-py %{swigdirs} \
+ DESTDIR="%{buildroot}"
+%{__make} install-swig-pl-lib %{swigdirs} \
+ DESTDIR="%{buildroot}"
+
+%{__make} pure_vendor_install -C subversion/bindings/swig/perl/native \
+ PERL_INSTALL_ROOT="%{buildroot}"
+%endif
+
+%find_lang %{name}
+
+# Add subversion.conf configuration file into httpd/conf.d directory.
+%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/subversion.conf
+
+# Remove unpackaged files
+%{__rm} -rf %{buildroot}%{_includedir}/subversion-*/*.txt \
+ %{buildroot}%{python_dir}/*/*.{a,la}
+
+%if %{!?_without_swig:1}0
+# remove stuff produced with Perl modules
+find %{buildroot} -type f \
+ -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \
+ -print0 | xargs -0 rm -f
+
+# make Perl modules writable so they get stripped
+find %{buildroot}%{_libdir}/perl5 -type f -perm 555 -print0 |
+ xargs -0 chmod 755
+%endif
+
+# unnecessary libraries for swig bindings
+%{__rm} -f %{buildroot}%{_libdir}/libsvn_swig_*.{so,la,a}
+
+# Trim what goes in docdir
+%{__rm} -rf tools/*/*.in tools/test-scripts \
+ doc/book/book/images/images doc/book/book/images/*.ppt
+
+# Install psvn for emacs and xemacs
+%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_datadir}/emacs/site-lisp/psvn.el
+%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_datadir}/xemacs/site-packages/lisp/psvn.el
+
+# Rename authz_svn INSTALL doc for docdir
+ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
+
+%if %{make_check}
+%check
+export LANG=C LC_ALL=C
+%{__make} check CLEANUP=yes
+%endif
+
+find tools/ -type f -exec %{__chmod} -x {} \;
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%post perl -p /sbin/ldconfig
+%postun perl -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
+%doc tools/ subversion/LICENSE mod_authz_svn-INSTALL
+%doc doc/book/svn-book.html
+%doc contrib/client-side/svn_load_dirs{.pl,_*,.README}
+%{_bindir}/*
+%{_libdir}/libsvn_*.so.*
+%{_mandir}/man*/*
+%{_datadir}/emacs/site-lisp/
+%{_datadir}/xemacs/site-packages/lisp/
+%{!?_without_swig:%exclude %{_libdir}/libsvn_swig_perl*}
+%{!?_without_swig:%exclude %{_mandir}/man*/*::*}
+%{!?_without_swig:%{python_dir}/svn/}
+%{!?_without_swig:%{python_dir}/libsvn/}
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/subversion-1/
+%{_libdir}/libsvn*.a
+%{_libdir}/libsvn*.la
+%{_libdir}/libsvn*.so
+%{!?_without_swig:%exclude %{_libdir}/libsvn_swig_perl*}
+
+%files -n mod_dav_svn
+%defattr(-, root, root, 0755)
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/subversion.conf
+%{_libdir}/httpd/modules/mod_dav_svn.so
+%{_libdir}/httpd/modules/mod_authz_svn.so
+
+%if %{!?_without_swig:1}0
+%files perl
+%defattr(-, root, root, 0755)
+%{perl_vendorarch}/auto/SVN
+%{perl_vendorarch}/SVN
+%{_libdir}/libsvn_swig_perl*
+%{_mandir}/man*/*::*
+%endif
+
+%changelog
+* Wed Jul 13 2005 Dag Wieers <dag at wieers.com> - 1.2.1-0.1
+- Updated to release 1.2.1
+
+* Mon Jun 06 2005 Dag Wieers <dag at wieers.com> - 1.2.0-0.2
+- Moved perl examples to subversion-perl.
+
+* Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 1.2.0-0.1
+- Updated to release 1.2.0.
+
+* Tue Apr 05 2005 Dag Wieers <dag at wieers.com> - 1.1.4-0.1
+- Updated to release 1.1.4.
+
+* Sat Jan 15 2005 Dag Wieers <dag at wieers.com> - 1.1.3-0.1
+- Updated to release 1.1.3.
+
+* Tue Jan 04 2005 Dag Wieers <dag at wieers.com> - 1.1.2-0.1
+- Updated to release 1.1.2.
+
+* Sat Dec 04 2004 Dag Wieers <dag at wieers.com> - 1.1.1-0.1
+- Updated to release 1.1.1.
+
+* Mon Nov 01 2004 Dag Wieers <dag at wieers.com> - 1.0.9-2
+- Backported changes from Red Hat's EL3 packages. (Joe Orton)
+
+* Mon Nov 01 2004 Dag Wieers <dag at wieers.com> - 1.0.9-1
+- Updated to release 1.0.9.
+
+* Thu Sep 23 2004 Dag Wieers <dag at wieers.com> - 1.0.8-1
+- Updated to release 1.0.8.
+
+* Wed Sep 22 2004 Dag Wieers <dag at wieers.com> - 1.0.7-1
+- Updated to release 1.0.7.
+
+* Fri Jun 11 2004 Dag Wieers <dag at wieers.com> - 1.0.5-1
+- Updated to release 1.0.5.
+
+* Sat May 22 2004 Dag Wieers <dag at wieers.com> - 1.0.4-1
+- Updated to release 1.0.4.
+
+* Fri May 21 2004 Joe Orton <jorton at redhat.com> 1.0.3-2
+- build /usr/bin/* as PIEs
+- add fix for libsvn_client symbol namespace violation (r9608)
+
+* Wed May 19 2004 Joe Orton <jorton at redhat.com> 1.0.3-1
+- update to 1.0.3
+
+* Sun May 16 2004 Joe Orton <jorton at redhat.com> 1.0.2-3
+- add ldconfig invocations for -perl post/postun (Ville Skyttä)
+
+* Tue May 4 2004 Joe Orton <jorton at redhat.com> 1.0.2-2
+- add perl MODULE_COMPAT requirement for -perl subpackage
+- move perl man pages into -perl subpackage
+- clean up -perl installation and dependencies (Ville Skyttä, #123045)
+
+* Mon Apr 19 2004 Joe Orton <jorton at redhat.com> 1.0.2-1
+- update to 1.0.2
+
+* Fri Mar 12 2004 Joe Orton <jorton at redhat.com> 1.0.1-1
+- update to 1.0.1; cvs2svn no longer included
+
+* Fri Mar 12 2004 Joe Orton <jorton at redhat.com> 1.0.0-3
+- add -perl subpackage for Perl bindings (steve at silug.org)
+- include mod_authz_svn INSTALL file
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com> 1.0.0-2.1
+- rebuilt
+
+* Wed Feb 25 2004 Joe Orton <jorton at redhat.com> 1.0.0-2
+- add fix for lack of apr_dir_read ordering guarantee (Philip Martin)
+- enable compression in ra_dav by default (Tobias Ringström)
+
+* Mon Feb 23 2004 Joe Orton <jorton at redhat.com> 1.0.0-1
+- update to one-dot-oh
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com> 0.37.0-2
+- rebuilt
+
+* Sat Jan 24 2004 Joe Orton <jorton at redhat.com> 0.37.0-1
+- update to 0.37.0
+
+* Tue Jan 13 2004 Joe Orton <jorton at redhat.com> 0.36.0-1
+- update to 0.36.0
+
+* Thu Jan 8 2004 Joe Orton <jorton at redhat.com> 0.35.1-1
+- update to 0.35.1
+- fix shebang lines in hook scripts (#111498)
+
+* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 0.34.0-3
+- rebuild against db-4.2.52.
+
+* Thu Dec 4 2003 Joe Orton <jorton at redhat.com> 0.34.0-2
+- package all man pages
+
+* Thu Dec 04 2003 Joe Orton <jorton at redhat.com> 0.34.0-1
+- update to 0.34.0
+
+* Thu Nov 13 2003 Joe Orton <jorton at redhat.com> 0.32.1-3
+- remove workarounds for #109268 and #109267
+
+* Thu Nov 6 2003 Joe Orton <jorton at redhat.com> 0.32.1-2
+- rebuild for Python 2.3.2
+- remove libtool workaround
+- add workarounds for #109268 and #109267
+
+* Fri Oct 24 2003 Joe Orton <jorton at redhat.com> 0.32.1-1
+- update to 0.31.2
+- work around libtool/ppc64/db4 confusion
+
+* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 0.31.0-2.1
+- rebuild against db-4.2.42.
+
+* Fri Oct 10 2003 Joe Orton <jorton at redhat.com> 0.31.0-2
+- include The Book
+- don't add an RPATH for libdir to executables
+
+* Thu Oct 9 2003 Joe Orton <jorton at redhat.com> 0.31.0-1
+- update to 0.31.0
+
+* Wed Sep 24 2003 Joe Orton <jorton at redhat.com> 0.30.0-1
+- update to 0.30.0
+
+* Sun Sep 7 2003 Joe Orton <jorton at redhat.com> 0.29.0-1
+- update to 0.29.0
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Jul 15 2003 Joe Orton <jorton at redhat.com> 0.25-1
+- update to 0.25
+
+* Mon Jul 14 2003 Joe Orton <jorton at redhat.com> 0.24.2-4
+- rebuild
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-3
+- rebuild
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-2
+- don't use any LDFLAGS when building swig, fix for libdir=lib64
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-1
+- update to 0.24.2; fix Python bindings
+
+* Tue Jun 17 2003 Joe Orton <jorton at redhat.com> 0.24.1-1
+- update to 0.24.1; include mod_authz_svn
+- force use of CC=gcc CXX=g++
+
+* Mon Jun 9 2003 Joe Orton <jorton at redhat.com> 0.23.0-2
+- add cvs2svn man page
+
+* Mon Jun 9 2003 Joe Orton <jorton at redhat.com> 0.23.0-1
+- update to 0.23.0
+
+* Sun Jun 8 2003 Joe Orton <jorton at redhat.com> 0.22.2-7
+- package cvs2svn to be usable outside docdir
+- remove unnecessary files
+
+* Thu Jun 5 2003 Joe Orton <jorton at redhat.com> 0.22.2-6
+- add fix for unhandled deadlock errors in libsvn_fs
+- don't package the out-of-date info pages
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com> 0.22.2-5
+- rebuilt
+
+* Tue Jun 3 2003 Joe Orton <jorton at redhat.com> 0.22.2-4
+- cleanups
+
+* Mon Jun 2 2003 Elliot Lee <sopwith at redhat.com> 0.22.2-3
+- Add back in s390x, excludearch bad.
+
+* Tue May 20 2003 Jeff Johnson <jbj at redhat.com> 0.22.2-2
+- use external neon-0.23.9-2 (i.e. with neon-config), drop internal neon.
+- use db-4.1.25, not db-4.0.14.
+- do "make check" (but ignore failure for now).
+- s390x knows not of httpd >= 2.0.45.
+
+* Thu May 8 2003 Joe Orton <jorton at redhat.com> 0.22.2-1
+- update to 0.22.2; add mod_dav_svn subpackage
+- include Python bindings
+- neon: force use of expat, enable SSL
+- drop check for specific apr version added in -3
+
+* Thu May 1 2003 Joe Orton <jorton at redhat.com> 0.20.1-6
+- filter out perl(Config::IniFiles) requirement
+
+* Thu May 1 2003 Joe Orton <jorton at redhat.com> 0.20.1-5
+- fail early if apr-config is not 0.9.3
+
+* Wed Apr 30 2003 Joe Orton <jorton at redhat.com> 0.20.1-4
+- fix workaround for non-lib64 platforms
+
+* Wed Apr 30 2003 Joe Orton <jorton at redhat.com> 0.20.1-3
+- add workaround for libtool problem
+
+* Tue Apr 29 2003 Joe Orton <jorton at redhat.com> 0.20.1-2
+- require and use system apr, apr-util libraries
+- use License not Copyright
+
+* Fri Apr 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 0.20.1
+
+* Wed Jan 22 2003 Jeff Johnson <jbj at redhat.com> 0.17.1-4503.0
+- upgrade to 0.17.1.
+
+* Wed Dec 11 2002 Jeff Johnson <jbj at redhat.com> 0.16-3987.1
+- upgrade to 0.16.
+
+* Wed Nov 13 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.2
+- don't mess with the info handbook install yet.
+
+* Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.1
+- use libdir, build on x86_64 too.
+- avoid "perl(Config::IniFiles) >= 2.27" dependency.
+
+* Sat Nov 9 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.0
+- first build from adapted spec file, only client and libraries for now.
+- internal apr/apr-utils/neon until incompatibilities sort themselves out.
+- avoid libdir issues on x86_64 for the moment.
Added: trunk/rpms/subversion/subversion-1.3.0-pie.patch
===================================================================
--- trunk/rpms/subversion/subversion-1.3.0-pie.patch (rev 0)
+++ trunk/rpms/subversion/subversion-1.3.0-pie.patch 2006-11-18 23:59:38 UTC (rev 4900)
@@ -0,0 +1,72 @@
+
+Build subversion executables as PIEs. Requires a slight jig to
+ensure that executables in the test suite are *not* built using
+-pie, since that doesn't work when main() is not itself an
+object built with -pie.
+
+--- subversion-1.3.0/build/generator/gen_base.py.pie
++++ subversion-1.3.0/build/generator/gen_base.py
+@@ -399,6 +399,9 @@
+ self.manpages = options.get('manpages', '')
+ self.testing = options.get('testing')
+
++ if self.install == 'test' or self.install == 'bdb-test':
++ self.link_cmd = '$(LINK_TEST)'
++
+ def add_dependencies(self):
+ TargetLinked.add_dependencies(self)
+
+@@ -441,8 +444,11 @@
+ self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
+ self.msvc_export = string.split(options.get('msvc-export', ''))
+
+- ### hmm. this is Makefile-specific
+- self.link_cmd = '$(LINK_LIB)'
++ ### more Makefile-specific stuff:
++ if self.install == 'test':
++ self.link_cmd = '$(LINK_TEST_LIB)'
++ elif self.link_cmd == '$(LINK)':
++ self.link_cmd = '$(LINK_LIB)'
+
+ class TargetApacheMod(TargetLib):
+
+--- subversion-1.3.0/Makefile.in.pie
++++ subversion-1.3.0/Makefile.in
+@@ -143,9 +143,10 @@
+ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
+
+-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
++BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
++COMPILE = $(BASE_COMPILE) -fpie
+ COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
+-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
+
+ # special compilation for files destined for mod_dav_svn
+ COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
+@@ -160,8 +161,11 @@
+ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
+ COMPILE_JAVAHL_JAVAH = $(JAVAH)
+
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+-LINK_LIB = $(LINK) -rpath $(libdir)
++BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK = $(BASE_LINK) -pie
++LINK_TEST = $(BASE_LINK) -no-install
++LINK_LIB = $(BASE_LINK) -rpath $(libdir)
++LINK_TEST_LIB = $(BASE_LINK)
+
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module
+--- subversion-1.3.0/build.conf.pie
++++ subversion-1.3.0/build.conf
+@@ -356,7 +356,7 @@
+ lang = python
+ path = subversion/bindings/swig/python/libsvn_swig_py
+ libs = libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr
+-link-cmd = $(LINK) $(SWIG_PY_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
Added: trunk/rpms/subversion/subversion-1.4.spec
===================================================================
--- trunk/rpms/subversion/subversion-1.4.spec (rev 0)
+++ trunk/rpms/subversion/subversion-1.4.spec 2006-11-18 23:59:38 UTC (rev 4900)
@@ -0,0 +1,479 @@
+# $Id: subversion.spec 4608 2006-08-02 15:32:29Z dag $
+# Authority: dag
+
+##ExcludeDist: fc3
+##Tag: test
+
+%{?dist: %{expand: %%define %dist 1}}
+
+#{?el3:#define _without_swig 1}
+%{?rh9:%define _without_pie 1}
+%{?rh9:%define _without_swig 1}
+%{?rh7:%define _without_pie 1}
+%{?rh7:%define _without_swig 1}
+%{?el2:%define _without_pie 1}
+%{?el2:%define _without_swig 1}
+
+%define swig_version 1.3.25
+
+# set to zero to avoid running test suite
+%define make_check 0
+
+%define python_dir %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+Summary: Modern Version Control System designed to replace CVS
+Name: subversion
+Version: 1.4.2
+### FC3 comes with release 1.1
+Release: 0.1
+License: BSD
+Group: Development/Tools
+URL: http://subversion.tigris.org/
+
+Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.bz2
+Source1: subversion.conf
+Source3: filter-requires.sh
+Source4: http://www.xsteve.at/prg/emacs/psvn.el
+Source10: http://dl.sf.net/swig/swig-%{swig_version}.tar.gz
+#Patch1: subversion-0.24.2-swig.patch
+Patch2: subversion-0.20.1-deplibs.patch
+Patch3: subversion-0.31.0-rpath.patch
+Patch6: subversion-1.4.2-pie.patch
+Patch7: subversion-1.1.3-java.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
+BuildRequires: expat-devel, docbook-style-xsl
+BuildRequires: apr-util-devel >= 0.9.3-2, openssl-devel
+BuildRequires: apr-devel >= 0.9.7
+BuildRequires: neon-devel >= 0.24.7-1
+#%{!?_without_swig:BuildRequires: swig >= 1.3.21-5}
+#%{!?_without_swig:BuildRequires: swig}
+
+%define __perl_requires %{SOURCE3}
+
+# Put Python bindings in site-packages
+%define swigdirs swig_pydir=%{python_dir}/libsvn swig_pydir_extra=%{python_dir}/svn
+
+%description
+Subversion is a concurrent version control system which enables one
+or more users to collaborate in developing and maintaining a
+hierarchy of files and directories while keeping a history of all
+changes. Subversion only stores the differences between versions,
+instead of every complete file. Subversion is intended to be a
+compelling replacement for CVS.
+
+%package devel
+Group: Development/Tools
+Summary: Development package for Subversion developers.
+Requires: subversion = %{version}-%{release}, apr-devel, apr-util-devel
+
+%description devel
+The subversion-devel package includes the static libraries and
+include files for developers interacting with the subversion
+package.
+
+%package -n mod_dav_svn
+Group: System Environment/Daemons
+Summary: Apache server module for Subversion server.
+Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
+Requires: subversion = %{version}-%{release}
+BuildRequires: httpd-devel >= 2.0.45
+
+%description -n mod_dav_svn
+The mod_dav_svn package allows access to a Subversion repository
+using HTTP, via the Apache httpd server.
+
+%package perl
+Group: Development/Libraries
+Summary: Perl bindings to the Subversion libraries
+BuildRequires: perl >= 2:5.8.0
+Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
+Requires: subversion = %{version}-%{release}
+
+%description perl
+This package includes the Perl bindings to the Subversion libraries.
+
+%prep
+%setup -a 10
+#patch1 -p1 -b .swig
+%patch2 -p1 -b .deplibs
+%patch3 -p1 -b .rpath
+%{!?_without_pie:%patch6 -p1 -b .pie}
+
+%{__rm} -rf neon apr apr-util
+
+echo _without_swig: %_without_swig
+echo _without_pie: %_without_pie
+echo dist: %dist
+
+%build
+%if %{!?_without_swig:1}0
+cd swig-%{swig_version}
+[ ! -r configure ] && ./autogen.sh
+%configure --prefix="$(pwd)/install" --exec-prefix="$(pwd)/install" --bindir="$(pwd)/install/bin" --datadir="$(pwd)/install/share"
+%{__make}
+%{__make} install
+cd -
+%endif
+
+./autogen.sh
+
+# requirement for apr 0.9.5 seems to be bogus
+%{__perl} -pi.orig -e 's/\.\[5-9\]/\.\[4-9\]/' configure
+
+# fix shebang lines, #111498
+%{__perl} -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
+
+export CC=gcc CXX=g++
+%configure \
+ --with-apr="%{_prefix}" \
+ --with-apr-util="%{_prefix}" \
+ --with-apxs="%{_sbindir}/apxs" \
+ --disable-mod-activation \
+%{!?_without_swig:--with-swig=swig-%{swig_version}/install} \
+ --with-expat \
+ --with-ssl
+# --with-neon="%{_prefix}" \
+# 1.3.0 tarball ships with generated swig sources
+#make extraclean-swig-headers swig-headers
+%{__make} %{?_smp_mflags} all
+
+%if %{!?_without_swig:1}0
+%{__make} %{?_smp_mflags} swig-pl swig-py %{swigdirs}
+
+# build the perl modules
+#pushd subversion/bindings/swig/perl
+#CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor"
+#%{__make} %{?_smp_mflags}
+#popd
+%endif
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install \
+ DESTDIR="%{buildroot}"
+
+%if %{!?_without_swig:1}0
+%{__make} install-swig-py install-swig-pl-lib %{swigdirs} \
+ DESTDIR="%{buildroot}"
+
+%{__make} pure_vendor_install -C subversion/bindings/swig/perl/native \
+ PERL_INSTALL_ROOT="%{buildroot}"
+%endif
+
+%{__install} -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/subversion
+
+# Add subversion.conf configuration file into httpd/conf.d directory.
+%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/subversion.conf
+
+# Remove unpackaged files
+%{__rm} -rf %{buildroot}%{_includedir}/subversion-*/*.txt \
+ %{buildroot}%{python_dir}/*/*.{a,la}
+
+%if %{!?_without_swig:1}0
+# remove stuff produced with Perl modules
+find %{buildroot} -type f \
+ -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \
+ -print0 | xargs -0 rm -f
+
+# make Perl modules writable so they get stripped
+find %{buildroot}%{_libdir}/perl5 -type f -perm 555 -print0 |
+ xargs -0 chmod 0755
+%endif
+
+# unnecessary libraries for swig bindings
+%{__rm} -f %{buildroot}%{_libdir}/libsvn_swig_*.{so,la,a}
+
+# Trim what goes in docdir
+%{__rm} -rf tools/*/*.in tools/test-scripts \
+ doc/book/book/images/images doc/book/book/images/*.ppt
+
+# Install psvn for emacs and xemacs
+%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_datadir}/emacs/site-lisp/psvn.el
+%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_datadir}/xemacs/site-packages/lisp/psvn.el
+
+# Rename authz_svn INSTALL doc for docdir
+ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
+
+%find_lang %{name}
+
+%if %{make_check}
+%check
+export LANG=C LC_ALL=C
+%{__make} check CLEANUP=yes
+%endif
+
+find tools/ -type f -exec %{__chmod} -x {} \;
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%post perl -p /sbin/ldconfig
+%postun perl -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
+%doc mod_authz_svn-INSTALL subversion/LICENSE tools/
+%doc contrib/client-side/svn_load_dirs{.pl,_*,.README}
+%{_bindir}/svn*
+%{_libdir}/libsvn_*.so.*
+%{_mandir}/man?/svn*
+%{_datadir}/emacs/site-lisp/
+%{_datadir}/xemacs/site-packages/lisp/
+%{!?_without_swig:%exclude %{_libdir}/libsvn_swig_perl*}
+%{!?_without_swig:%exclude %{_mandir}/man*/*::*}
+%{!?_without_swig:%{python_dir}/svn/}
+%{!?_without_swig:%{python_dir}/libsvn/}
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/subversion-1/
+%{_libdir}/libsvn_*.a
+%{_libdir}/libsvn_*.la
+%{_libdir}/libsvn_*.so
+%{!?_without_swig:%exclude %{_libdir}/libsvn_swig_perl*}
+
+%files -n mod_dav_svn
+%defattr(-, root, root, 0755)
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/subversion.conf
+%{_libdir}/httpd/modules/mod_dav_svn.so
+%{_libdir}/httpd/modules/mod_authz_svn.so
+
+%if %{!?_without_swig:1}0
+%files perl
+%defattr(-, root, root, 0755)
+%{perl_vendorarch}/auto/SVN
+%{perl_vendorarch}/SVN
+%{_libdir}/libsvn_swig_perl*
+%{_mandir}/man*/*::*
+%endif
+
+%changelog
+* Wed Nov 08 2006 Dag Wieers <dag at wieers.com> - 1.4.2-0.1
+- Updated to release 1.4.2
+
+* Tue Aug 01 2006 Dag Wieers <dag at wieers.com> - 1.3.2-0.1
+- Updated to release 1.3.2
+
+* Wed Jul 13 2005 Dag Wieers <dag at wieers.com> - 1.2.1-0.1
+- Updated to release 1.2.1
+
+* Mon Jun 06 2005 Dag Wieers <dag at wieers.com> - 1.2.0-0.2
+- Moved perl examples to subversion-perl.
+
+* Sat Jun 04 2005 Dag Wieers <dag at wieers.com> - 1.2.0-0.1
+- Updated to release 1.2.0.
+
+* Tue Apr 05 2005 Dag Wieers <dag at wieers.com> - 1.1.4-0.1
+- Updated to release 1.1.4.
+
+* Sat Jan 15 2005 Dag Wieers <dag at wieers.com> - 1.1.3-0.1
+- Updated to release 1.1.3.
+
+* Tue Jan 04 2005 Dag Wieers <dag at wieers.com> - 1.1.2-0.1
+- Updated to release 1.1.2.
+
+* Sat Dec 04 2004 Dag Wieers <dag at wieers.com> - 1.1.1-0.1
+- Updated to release 1.1.1.
+
+* Mon Nov 01 2004 Dag Wieers <dag at wieers.com> - 1.0.9-2
+- Backported changes from Red Hat's EL3 packages. (Joe Orton)
+
+* Mon Nov 01 2004 Dag Wieers <dag at wieers.com> - 1.0.9-1
+- Updated to release 1.0.9.
+
+* Thu Sep 23 2004 Dag Wieers <dag at wieers.com> - 1.0.8-1
+- Updated to release 1.0.8.
+
+* Wed Sep 22 2004 Dag Wieers <dag at wieers.com> - 1.0.7-1
+- Updated to release 1.0.7.
+
+* Fri Jun 11 2004 Dag Wieers <dag at wieers.com> - 1.0.5-1
+- Updated to release 1.0.5.
+
+* Sat May 22 2004 Dag Wieers <dag at wieers.com> - 1.0.4-1
+- Updated to release 1.0.4.
+
+* Fri May 21 2004 Joe Orton <jorton at redhat.com> 1.0.3-2
+- build /usr/bin/* as PIEs
+- add fix for libsvn_client symbol namespace violation (r9608)
+
+* Wed May 19 2004 Joe Orton <jorton at redhat.com> 1.0.3-1
+- update to 1.0.3
+
+* Sun May 16 2004 Joe Orton <jorton at redhat.com> 1.0.2-3
+- add ldconfig invocations for -perl post/postun (Ville Skyttä)
+
+* Tue May 4 2004 Joe Orton <jorton at redhat.com> 1.0.2-2
+- add perl MODULE_COMPAT requirement for -perl subpackage
+- move perl man pages into -perl subpackage
+- clean up -perl installation and dependencies (Ville Skyttä, #123045)
+
+* Mon Apr 19 2004 Joe Orton <jorton at redhat.com> 1.0.2-1
+- update to 1.0.2
+
+* Fri Mar 12 2004 Joe Orton <jorton at redhat.com> 1.0.1-1
+- update to 1.0.1; cvs2svn no longer included
+
+* Fri Mar 12 2004 Joe Orton <jorton at redhat.com> 1.0.0-3
+- add -perl subpackage for Perl bindings (steve at silug.org)
+- include mod_authz_svn INSTALL file
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com> 1.0.0-2.1
+- rebuilt
+
+* Wed Feb 25 2004 Joe Orton <jorton at redhat.com> 1.0.0-2
+- add fix for lack of apr_dir_read ordering guarantee (Philip Martin)
+- enable compression in ra_dav by default (Tobias Ringström)
+
+* Mon Feb 23 2004 Joe Orton <jorton at redhat.com> 1.0.0-1
+- update to one-dot-oh
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com> 0.37.0-2
+- rebuilt
+
+* Sat Jan 24 2004 Joe Orton <jorton at redhat.com> 0.37.0-1
+- update to 0.37.0
+
+* Tue Jan 13 2004 Joe Orton <jorton at redhat.com> 0.36.0-1
+- update to 0.36.0
+
+* Thu Jan 8 2004 Joe Orton <jorton at redhat.com> 0.35.1-1
+- update to 0.35.1
+- fix shebang lines in hook scripts (#111498)
+
+* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 0.34.0-3
+- rebuild against db-4.2.52.
+
+* Thu Dec 4 2003 Joe Orton <jorton at redhat.com> 0.34.0-2
+- package all man pages
+
+* Thu Dec 04 2003 Joe Orton <jorton at redhat.com> 0.34.0-1
+- update to 0.34.0
+
+* Thu Nov 13 2003 Joe Orton <jorton at redhat.com> 0.32.1-3
+- remove workarounds for #109268 and #109267
+
+* Thu Nov 6 2003 Joe Orton <jorton at redhat.com> 0.32.1-2
+- rebuild for Python 2.3.2
+- remove libtool workaround
+- add workarounds for #109268 and #109267
+
+* Fri Oct 24 2003 Joe Orton <jorton at redhat.com> 0.32.1-1
+- update to 0.31.2
+- work around libtool/ppc64/db4 confusion
+
+* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 0.31.0-2.1
+- rebuild against db-4.2.42.
+
+* Fri Oct 10 2003 Joe Orton <jorton at redhat.com> 0.31.0-2
+- include The Book
+- don't add an RPATH for libdir to executables
+
+* Thu Oct 9 2003 Joe Orton <jorton at redhat.com> 0.31.0-1
+- update to 0.31.0
+
+* Wed Sep 24 2003 Joe Orton <jorton at redhat.com> 0.30.0-1
+- update to 0.30.0
+
+* Sun Sep 7 2003 Joe Orton <jorton at redhat.com> 0.29.0-1
+- update to 0.29.0
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Jul 15 2003 Joe Orton <jorton at redhat.com> 0.25-1
+- update to 0.25
+
+* Mon Jul 14 2003 Joe Orton <jorton at redhat.com> 0.24.2-4
+- rebuild
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-3
+- rebuild
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-2
+- don't use any LDFLAGS when building swig, fix for libdir=lib64
+
+* Tue Jun 24 2003 Joe Orton <jorton at redhat.com> 0.24.2-1
+- update to 0.24.2; fix Python bindings
+
+* Tue Jun 17 2003 Joe Orton <jorton at redhat.com> 0.24.1-1
+- update to 0.24.1; include mod_authz_svn
+- force use of CC=gcc CXX=g++
+
+* Mon Jun 9 2003 Joe Orton <jorton at redhat.com> 0.23.0-2
+- add cvs2svn man page
+
+* Mon Jun 9 2003 Joe Orton <jorton at redhat.com> 0.23.0-1
+- update to 0.23.0
+
+* Sun Jun 8 2003 Joe Orton <jorton at redhat.com> 0.22.2-7
+- package cvs2svn to be usable outside docdir
+- remove unnecessary files
+
+* Thu Jun 5 2003 Joe Orton <jorton at redhat.com> 0.22.2-6
+- add fix for unhandled deadlock errors in libsvn_fs
+- don't package the out-of-date info pages
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com> 0.22.2-5
+- rebuilt
+
+* Tue Jun 3 2003 Joe Orton <jorton at redhat.com> 0.22.2-4
+- cleanups
+
+* Mon Jun 2 2003 Elliot Lee <sopwith at redhat.com> 0.22.2-3
+- Add back in s390x, excludearch bad.
+
+* Tue May 20 2003 Jeff Johnson <jbj at redhat.com> 0.22.2-2
+- use external neon-0.23.9-2 (i.e. with neon-config), drop internal neon.
+- use db-4.1.25, not db-4.0.14.
+- do "make check" (but ignore failure for now).
+- s390x knows not of httpd >= 2.0.45.
+
+* Thu May 8 2003 Joe Orton <jorton at redhat.com> 0.22.2-1
+- update to 0.22.2; add mod_dav_svn subpackage
+- include Python bindings
+- neon: force use of expat, enable SSL
+- drop check for specific apr version added in -3
+
+* Thu May 1 2003 Joe Orton <jorton at redhat.com> 0.20.1-6
+- filter out perl(Config::IniFiles) requirement
+
+* Thu May 1 2003 Joe Orton <jorton at redhat.com> 0.20.1-5
+- fail early if apr-config is not 0.9.3
+
+* Wed Apr 30 2003 Joe Orton <jorton at redhat.com> 0.20.1-4
+- fix workaround for non-lib64 platforms
+
+* Wed Apr 30 2003 Joe Orton <jorton at redhat.com> 0.20.1-3
+- add workaround for libtool problem
+
+* Tue Apr 29 2003 Joe Orton <jorton at redhat.com> 0.20.1-2
+- require and use system apr, apr-util libraries
+- use License not Copyright
+
+* Fri Apr 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 0.20.1
+
+* Wed Jan 22 2003 Jeff Johnson <jbj at redhat.com> 0.17.1-4503.0
+- upgrade to 0.17.1.
+
+* Wed Dec 11 2002 Jeff Johnson <jbj at redhat.com> 0.16-3987.1
+- upgrade to 0.16.
+
+* Wed Nov 13 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.2
+- don't mess with the info handbook install yet.
+
+* Sun Nov 10 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.1
+- use libdir, build on x86_64 too.
+- avoid "perl(Config::IniFiles) >= 2.27" dependency.
+
+* Sat Nov 9 2002 Jeff Johnson <jbj at redhat.com> 0.15-3687.0
+- first build from adapted spec file, only client and libraries for now.
+- internal apr/apr-utils/neon until incompatibilities sort themselves out.
+- avoid libdir issues on x86_64 for the moment.
More information about the svn-commits
mailing list