[svn] r6068 - in trunk/rpms: amavisd-new fail2ban ms-sys subversion
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Dec 31 17:12:10 CET 2007
Author: dag
Date: 2007-12-31 17:12:01 +0100 (Mon, 31 Dec 2007)
New Revision: 6068
Modified:
trunk/rpms/amavisd-new/amavisd-new.spec
trunk/rpms/fail2ban/fail2ban.spec
trunk/rpms/ms-sys/ms-sys.spec
trunk/rpms/subversion/subversion.spec
Log:
Updates
Modified: trunk/rpms/amavisd-new/amavisd-new.spec
===================================================================
--- trunk/rpms/amavisd-new/amavisd-new.spec 2007-12-30 20:50:11 UTC (rev 6067)
+++ trunk/rpms/amavisd-new/amavisd-new.spec 2007-12-31 16:12:01 UTC (rev 6068)
@@ -11,7 +11,7 @@
Summary: Mail virus-scanner
Name: amavisd-new
-Version: 2.5.2
+Version: 2.5.3
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -61,10 +61,10 @@
%{__cat} <<EOF >amavisd.logrotate
%{_localstatedir}/log/amavis.log {
- create 600 amavis amavis
- missingok
- copytruncate
- notifempty
+ create 600 amavis amavis
+ missingok
+ copytruncate
+ notifempty
}
EOF
@@ -123,77 +123,77 @@
desc="Mail Virus Scanner"
start() {
- if [ "$MILTER_SOCKET" -a -x "%{_sbindir}/$prog2" ]; then
- echo -n $"Starting $desc ($prog2): "
- daemon --user "$AMAVIS_USER" %{_sbindir}/$prog2 -p "$MILTER_SOCKET" $MILTER_FLAGS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog2
- fi
- echo -n $"Starting $desc ($prog): "
- daemon --user "$AMAVIS_USER" %{_sbindir}/$prog -c "$CONFIG_FILE"
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ if [ "$MILTER_SOCKET" -a -x "%{_sbindir}/$prog2" ]; then
+ echo -n $"Starting $desc ($prog2): "
+ daemon --user "$AMAVIS_USER" %{_sbindir}/$prog2 -p "$MILTER_SOCKET" $MILTER_FLAGS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog2
+ fi
+ echo -n $"Starting $desc ($prog): "
+ daemon --user "$AMAVIS_USER" %{_sbindir}/$prog -c "$CONFIG_FILE"
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
stop() {
- echo -n $"Shutting down $desc ($prog): "
- killproc $prog
-# su - $AMAVIS_USER -c "%{_sbindir}/$prog -c $CONFIG_FILE stop"
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
- if [ "$MILTER_SOCKET" -o -f %{_localstatedir}/lock/subsys/$prog2 ]; then
- echo -n $"Shutting down $desc ($prog2): "
- killproc $prog2
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog2
- fi
- return $RETVAL
+ echo -n $"Shutting down $desc ($prog): "
+ killproc $prog
+# su - $AMAVIS_USER -c "%{_sbindir}/$prog -c $CONFIG_FILE stop"
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
+ if [ "$MILTER_SOCKET" -o -f %{_localstatedir}/lock/subsys/$prog2 ]; then
+ echo -n $"Shutting down $desc ($prog2): "
+ killproc $prog2
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog2
+ fi
+ return $RETVAL
}
reload() {
- echo -n $"Reloading $desc ($prog): "
- killproc $prog -HUP
-# su - $AMAVIS_USER -c "%{_sbindir}/$prog -c $CONFIG_FILE reload"
- RETVAL=$?
- echo
- return $RETVAL
+ echo -n $"Reloading $desc ($prog): "
+ killproc $prog -HUP
+# su - $AMAVIS_USER -c "%{_sbindir}/$prog -c $CONFIG_FILE reload"
+ RETVAL=$?
+ echo
+ return $RETVAL
}
restart() {
- stop
- start
+ stop
+ start
}
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart)
- restart
- ;;
+ restart
+ ;;
reload)
- reload
- ;;
+ reload
+ ;;
condrestart)
- [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
- RETVAL=$?
- ;;
+ [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
+ RETVAL=$?
+ ;;
status)
- status $prog
- status $prog2
- RETVAL=$?
- ;;
+ status $prog
+ status $prog2
+ RETVAL=$?
+ ;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
@@ -202,12 +202,12 @@
%build
cd helper-progs
%configure \
- --with-milterlib="%{_libdir}" \
- --with-user="amavis" \
- --with-sockname="%{_localstatedir}/amavis/amavisd.sock" \
- --with-runtime-dir="%{_localstatedir}/amavis" \
- --enable-postfix \
- --enable-all
+ --enable-postfix \
+ --enable-all \
+ --with-milterlib="%{_libdir}" \
+ --with-runtime-dir="%{_localstatedir}/amavis" \
+ --with-sockname="%{_localstatedir}/amavis/amavisd.sock" \
+ --with-user="amavis"
%{__make} %{?_smp_mflags}
%install
@@ -216,12 +216,12 @@
%makeinstall -C helper-progs
%{__perl} -pi.orig -e '
- s|=\s*'\''vscan'\''|= "amavis"|;
- s|^#*(\$MYHOME)\s*=.*$|$1 = "%{_localstatedir}/amavis";|;
- s|^(#*\$SYSLOG.+)$|$1\n\$LOGFILE = "%{_localstatedir}/log/amavis.log";|;
- s|^#*(\$QUARANTINEDIR)\s*=.*$|$1 = "%{_localstatedir}/virusmails";|;
- s|^#* *(\$db_home\s+=.*)$|$1|;
- ' amavisd.conf
+ s|=\s*'\''vscan'\''|= "amavis"|;
+ s|^#*(\$MYHOME)\s*=.*$|$1 = "%{_localstatedir}/amavis";|;
+ s|^(#*\$SYSLOG.+)$|$1\n\$LOGFILE = "%{_localstatedir}/log/amavis.log";|;
+ s|^#*(\$QUARANTINEDIR)\s*=.*$|$1 = "%{_localstatedir}/virusmails";|;
+ s|^#* *(\$db_home\s+=.*)$|$1|;
+ ' amavisd.conf
%{__install} -d -m0700 %{buildroot}%{_localstatedir}/virusmails/
%{__install} -d -m0755 %{buildroot}%{_localstatedir}/amavis/{db,tmp,var}/
@@ -242,33 +242,33 @@
%pre
if ! /usr/bin/id amavis &>/dev/null; then
- /usr/sbin/useradd -r -d "/var/amavis" -s /bin/sh -c "Amavis email scan user" -M amavis || \
- %logmsg "Unexpected error adding user \"amavis\"."
+ /usr/sbin/useradd -r -d "/var/amavis" -s /bin/sh -c "Amavis email scan user" -M amavis || \
+ %logmsg "Unexpected error adding user \"amavis\"."
fi
if ! /usr/bin/id -n -G amavis | grep -q "\<clamav\>"; then
- /usr/sbin/usermod -G $(id -Gn clamav | tr ' ' ','),amavis clamav || \
- %logmsg "Failed to add user \"amavis\" to group \"clamav\"."
+ /usr/sbin/usermod -G $(id -Gn clamav | tr ' ' ','),amavis clamav || \
+ %logmsg "Failed to add user \"amavis\" to group \"clamav\"."
fi
%post
/sbin/chkconfig --add amavisd
for file in /etc/postfix/aliases /etc/mail/aliases /etc/aliases; do
- if [ -r "$file" ]; then
- if ! grep -q "^virusalert:" "$file"; then
- echo -e "virusalert:\troot" >> "$file"
- /usr/bin/newaliases &>/dev/null || \
- %logmsg "Cannot exec newaliases. Please run it manually."
- fi
- fi
+ if [ -r "$file" ]; then
+ if ! grep -q "^virusalert:" "$file"; then
+ echo -e "virusalert:\troot" >> "$file"
+ /usr/bin/newaliases &>/dev/null || \
+ %logmsg "Cannot exec newaliases. Please run it manually."
+ fi
+ fi
done
%post milter
if [ -f /etc/mail/sendmail.mc ]; then
- if ! grep -q "milter-amavis" /etc/mail/sendmail.mc; then
- echo -e "\ndnl define(\`MILTER', 1)\ndnl INPUT_MAIL_FILTER(\`milter-amavis', \`S=local:/var/amavis/amavis-milter.sock, F=T, T=S:10m;R:10m;E:10m')" >>/etc/mail/sendmail.mc
- fi
+ if ! grep -q "milter-amavis" /etc/mail/sendmail.mc; then
+ echo -e "\ndnl define(\`MILTER', 1)\ndnl INPUT_MAIL_FILTER(\`milter-amavis', \`S=local:/var/amavis/amavis-milter.sock, F=T, T=S:10m;R:10m;E:10m')" >>/etc/mail/sendmail.mc
+ fi
fi
%preun
@@ -279,10 +279,10 @@
%postun
if [ $1 -eq 0 ]; then
- /usr/sbin/userdel amavis || %logmsg "User \"amavis\" could not be deleted."
- /usr/sbin/groupdel amavis || %logmsg "Group \"amavis\" could not be deleted."
+ /usr/sbin/userdel amavis || %logmsg "User \"amavis\" could not be deleted."
+ /usr/sbin/groupdel amavis || %logmsg "Group \"amavis\" could not be deleted."
else
- /sbin/service amavisd condrestart &>/dev/null || :
+ /sbin/service amavisd condrestart &>/dev/null || :
fi
%files
@@ -313,6 +313,9 @@
%{_sbindir}/amavis-milter
%changelog
+* Mon Dec 31 2007 Dag Wieers <dag at wieers.com> - 2.5.3-1
+- Updated to release 2.5.3.
+
* Thu Jun 28 2007 Dag Wieers <dag at wieers.com> - 2.5.2-1
- Updated to release 2.5.2.
Modified: trunk/rpms/fail2ban/fail2ban.spec
===================================================================
--- trunk/rpms/fail2ban/fail2ban.spec 2007-12-30 20:50:11 UTC (rev 6067)
+++ trunk/rpms/fail2ban/fail2ban.spec 2007-12-31 16:12:01 UTC (rev 6068)
@@ -6,18 +6,22 @@
Summary: Scan logfiles and ban ip addresses with too many password failures
Name: fail2ban
-Version: 0.6.2
+Version: 0.8.1
Release: 1
License: GPL
-Group: Applications/System
+Group: ystem Environment/Daemons
URL: http://fail2ban.sourceforge.net/
Source: http://dl.sf.net/fail2ban/fail2ban-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-BuildRequires: python, dos2unix
+BuildRequires: dos2unix
+BuildRequires: python-devel >= 2.4
+Requires: gamin-python
+Requires: iptables
Requires: python
+Requires: tcp_wrappers
%description
Fail2Ban monitors log files like /var/log/pwdfail or /var/log/apache/error_log
@@ -26,19 +30,31 @@
%prep
%setup
-%{__perl} -pi -e "s|# chkconfig: 345 |# chkconfig: - |g;" config/redhat-initd
-dos2unix config/redhat-initd
+%{__perl} -pi -e 's|^# chkconfig:.+$|# chkconfig: 345 92 08|' files/redhat-initd
+%{__cat} <<EOF >fail2ban.logrotate
+/var/log/fail2ban.log {
+ missingok
+ notifempty
+ size 30k
+ create 0600 root root
+ postrotate
+ /usr/bin/fail2ban-client reload 2> /dev/null || true
+ endscript
+}
+EOF
+
%build
%{__python} setup.py build
%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
-%{__install} -D -m0600 config/fail2ban.conf.iptables %{buildroot}%{_sysconfdir}/fail2ban.conf
-%{__install} -D -m0755 config/redhat-initd %{buildroot}%{_initrddir}/fail2ban
-%{__install} -D -m0644 man/fail2ban.conf.5 %{buildroot}%{_mandir}/man5/fail2ban.conf.5
-%{__install} -D -m0644 man/fail2ban.8 %{buildroot}%{_mandir}/man8/fail2ban.8
+%{__install} -Dp -m0755 files/redhat-initd %{buildroot}%{_initrddir}/fail2ban
+%{__install} -Dp -m0644 fail2ban.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fail2ban
+%{__install} -Dp -m0644 man/fail2ban-client.1 %{buildroot}%{_mandir}/man1/fail2ban-client.1
+%{__install} -Dp -m0644 man/fail2ban-regex.1 %{buildroot}%{_mandir}/man1/fail2ban-regex.1
+%{__install} -Dp -m0644 man/fail2ban-server.1 %{buildroot}%{_mandir}/man1/fail2ban-server.1
%clean
%{__rm} -rf %{buildroot}
@@ -61,15 +77,23 @@
%files
%defattr(-, root, root, 0755)
-%doc CHANGELOG README TODO
-%doc %{_mandir}/man5/fail2ban.conf.5*
-%doc %{_mandir}/man8/fail2ban.8*
-%config(noreplace) %{_sysconfdir}/fail2ban.conf
+%doc CHANGELOG COPYING README TODO
+%doc %{_mandir}/man1/fail2ban-client.1*
+%doc %{_mandir}/man1/fail2ban-regex.1*
+%doc %{_mandir}/man1/fail2ban-server.1*
+%config(noreplace) %{_sysconfdir}/fail2ban/
+%config(noreplace) %{_sysconfdir}/logrotate.d/fail2ban
%config %{_initrddir}/fail2ban
-%{_bindir}/fail2ban
-%{_libdir}/fail2ban/
+%{_bindir}/fail2ban-client
+%{_bindir}/fail2ban-regex
+%{_bindir}/fail2ban-server
+%{_datadir}/fail2ban/
%changelog
+* Mon Dec 31 2007 Dag Wieers <dag at wieers.com> - 0.8.1-1
+- Updated to release 0.8.1.
+- Incorporated appropriate changes from fedora SPEC.
+
* Wed Mar 21 2007 Dag Wieers <dag at wieers.com> - 0.6.2-1
- Updated to release 0.6.2.
Modified: trunk/rpms/ms-sys/ms-sys.spec
===================================================================
--- trunk/rpms/ms-sys/ms-sys.spec 2007-12-30 20:50:11 UTC (rev 6067)
+++ trunk/rpms/ms-sys/ms-sys.spec 2007-12-31 16:12:01 UTC (rev 6068)
@@ -4,8 +4,8 @@
Summary: Create DOS/MS-compatible boot records
Name: ms-sys
-Version: 2.1.2
-Release: 1.2
+Version: 2.1.3
+Release: 1
License: GPL
Group: Applications/System
URL: http://ms-sys.sourceforge.net/
@@ -26,19 +26,15 @@
%build
%{__make} debug \
- SHELL="/bin/bash" \
- PREFIX="%{_prefix}" \
- CC="${CC:-%{__cc}}" \
- EXTRA_CFLAGS="%{optflags} -fasm" \
- EXTRA_LDFLAGS="%{optflags}"
+ CC="${CC:-%{__cc}}" \
+ EXTRA_CFLAGS="%{optflags} -fasm" \
+ EXTRA_LDFLAGS="%{optflags}" \
+ PREFIX="%{_prefix}" \
+ SHELL="/bin/bash"
%install
%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
- %{buildroot}%{_mandir}/man1/
-%makeinstall \
- PREFIX="%{buildroot}%{_prefix}" \
- MANDIR="%{buildroot}%{_mandir}"
+%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
%find_lang %{name}
%clean
@@ -46,13 +42,13 @@
%files -f %{name}.lang
%defattr(-, root, root, 0755)
-%doc CHANGELOG CONTRIBUTORS COPYING README TODO
+%doc CHANGELOG CONTRIBUTORS COPYING FAQ README TODO
%doc %{_mandir}/man1/ms-sys.1*
%{_bindir}/ms-sys
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 2.1.2-1.2
-- Rebuild for Fedora Core 5.
+* Mon Dec 31 2007 Dag Wieers <dag at wieers.com> - 2.1.3-1
+- Updated to release 2.1.3.
* Sat Nov 26 2005 Dag Wieers <dag at wieers.com> - 2.1.2-1
- Updated to release 2.1.2.
Modified: trunk/rpms/subversion/subversion.spec
===================================================================
--- trunk/rpms/subversion/subversion.spec 2007-12-30 20:50:11 UTC (rev 6067)
+++ trunk/rpms/subversion/subversion.spec 2007-12-31 16:12:01 UTC (rev 6068)
@@ -6,6 +6,8 @@
%{?dtag: %{expand: %%define %dtag 1}}
+%define _without_ruby 1
+
#{?el3:#define _without_swig 1}
%{?rh9:%define _without_pie 1}
%{?rh9:%define _without_swig 1}
@@ -19,13 +21,13 @@
# set to zero to avoid running test suite
%define make_check 0
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
Summary: Modern Version Control System designed to replace CVS
Name: subversion
-Version: 1.4.4
+Version: 1.4.6
### FC3 comes with release 1.1
Release: 0.1
License: BSD
@@ -42,10 +44,12 @@
Patch3: subversion-0.31.0-rpath.patch
Patch6: subversion-1.4.2-pie.patch
Patch7: subversion-1.1.3-java.patch
+Patch8: subversion-1.4.4-macropen.patch
+Patch9: subversion-1.4.4-swig1333.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
-BuildRequires: expat-devel, docbook-style-xsl, gettext
+BuildRequires: db4-devel >= 4.1.25, expat-devel, docbook-style-xsl, gettext
BuildRequires: apr-util-devel >= 0.9.3-2, openssl-devel
BuildRequires: apr-devel >= 0.9.4
BuildRequires: neon-devel >= 0.24.7-1
@@ -92,19 +96,41 @@
%package perl
Group: Development/Libraries
Summary: Perl bindings to the Subversion libraries
-BuildRequires: perl >= 2:5.8.0
+BuildRequires: perl >= 2:5.8.0, perl(ExtUtils::MakeMaker)
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.
+%package javahl
+Group: Development/Libraries
+Summary: JNI bindings to the Subversion libraries
+Requires: subversion = %{version}-%{release}
+%{?_with_java:BuildRequires: java-devel}
+
+%description javahl
+This package includes the JNI bindings to the Subversion libraries.
+
+%package ruby
+Group: Development/Libraries
+Summary: Ruby bindings to the Subversion libraries
+%{!?_without_ruby:BuildRequires: ruby-devel >= 1.8.2, ruby >= 1.8.2}
+Requires: subversion = %{version}-%{release}, ruby-libs >= 1.8.2
+Requires: ruby(abi) = 1.8
+
+%description ruby
+This package includes the Ruby 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}
+%{?_with_java:%patch7 -p1 -b .java}
+%patch8 -p1 -b .macropen
+%patch9 -p1 -b .swig133
%{__rm} -rf neon apr apr-util
@@ -130,47 +156,52 @@
# fix shebang lines, #111498
%{__perl} -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
+# override weird -shrext from ruby
+export svn_cv_ruby_link="%{__cc} -shared"
+export svn_cv_ruby_sitedir_libsuffix=""
+export svn_cv_ruby_sitedir_archsuffix=""
+
export CC=gcc CXX=g++
+#export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
%configure \
- --disable-mod-activation \
- --disable-static \
- --with-apr="%{_prefix}" \
- --with-apr-util="%{_prefix}" \
- --with-apxs="%{_sbindir}/apxs" \
- --with-expat \
+ --disable-mod-activation \
+ --disable-static \
+ --with-apr="%{_prefix}" \
+ --with-apr-util="%{_prefix}" \
+ --with-apxs="%{_sbindir}/apxs" \
+ --with-expat \
--with-neon="%{_prefix}" \
--with-ruby-sitedir="%{ruby_sitearch}" \
- --with-ssl \
+ --with-ssl \
--with-swig \
%{!?_without_swig:--with-swig="swig-%{swig_version}/install"}
+# --disable-neon-version-check \
# 1.3.0 tarball ships with generated swig sources
-#make extraclean-swig-headers swig-headers
+#%{__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
+%{__make} %{?_smp_mflags} swig-py swig-py-lib %{swigdirs}
+%{__make} %{?_smp_mflags} swig-pl swig-pl-lib
+%{!?_without_ruby:%{__make} %{?_smp_mflags} swig-rb swig-rb-lib}
+%{?_with_java:%{_make} %{?_smp_mflags} javahl}
%endif
%install
%{__rm} -rf %{buildroot}
-%{__make} install \
- DESTDIR="%{buildroot}"
+%{__make} install DESTDIR="%{buildroot}"
%if %{!?_without_swig:1}0
-%{__make} install-swig-py install-swig-pl-lib %{swigdirs} \
- DESTDIR="%{buildroot}"
+%{__make} install-swig-py %{swigdirs} DESTDIR="%{buildroot}"
+%{__make} install-swig-pl-lib %{swigdirs} DESTDIR="%{buildroot}"
+%{!?_without_ruby:%{__make} install-swig-rb %{swigdirs} DESTDIR="%{buildroot}"}
+%{?_with_java:%{__make} install-javahl 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
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/subversion
# Add subversion.conf configuration file into httpd/conf.d directory.
%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/subversion.conf
@@ -221,6 +252,10 @@
%postun -p /sbin/ldconfig
%post perl -p /sbin/ldconfig
%postun perl -p /sbin/ldconfig
+%{!?_without_ruby:%post ruby -p /sbin/ldconfig}
+%{!?_without_ruby:%postun ruby -p /sbin/ldconfig}
+%{?_with_java:%post javahl -p /sbin/ldconfig}
+%{?_with_java:%postun javahl -p /sbin/ldconfig}
%files -f %{name}.lang
%defattr(-, root, root, 0755)
@@ -246,9 +281,10 @@
%{_datadir}/emacs/site-lisp/
%{_datadir}/xemacs/site-packages/lisp/
%{!?_without_swig:%exclude %{_libdir}/libsvn_swig_perl*}
-%{!?_without_swig:%exclude %{_mandir}/man*/*::*}
+%{!?_without_swig:%exclude %{_mandir}/man3/*::*.3pm*}
%{!?_without_swig:%{python_sitearch}/svn/}
%{!?_without_swig:%{python_sitearch}/libsvn/}
+%{!?_without_ruby:%exclude %{_libdir}/libsvn_swig_ruby*}
%files devel
%defattr(-, root, root, 0755)
@@ -272,7 +308,24 @@
%{_libdir}/libsvn_swig_perl*
%endif
+%if {!?_without_ruby:1}0
+%files ruby
+%defattr(-, root, root, 0755)
+%{_libdir}/libsvn_swig_ruby*
+%{ruby_sitearch}/svn/
+%endif
+
+%if %{?_with_java:1}0
+%files javahl
+%defattr(-, root, root, 0755)
+%{_libdir}/libsvnjavahl-1.*
+%{_libdir}/svn-javahl/
+%endif
+
%changelog
+* Mon Dec 31 2007 Dag Wieers <dag at wieers.com> - 1.4.6-0.1
+- Updated to release 1.4.6.
+
* Mon Jul 02 2007 Dag Wieers <dag at wieers.com> - 1.4.4-0.1
- Updated to release 1.4.4.
More information about the svn-commits
mailing list