Fix apr Conflicts syntax in -libs.

Fix obsolete chown syntax in subversion.conf.
Fix use of spaces vs tabs in specfile.
This commit is contained in:
Ville Skyttä 2011-10-15 21:24:00 +03:00
parent 55db97a19b
commit c4444b4cbe
2 changed files with 11 additions and 6 deletions

View File

@ -19,7 +19,7 @@ LoadModule authz_svn_module modules/mod_authz_svn.so
#
# # cd /var/www/svn
# # svnadmin create stuff
# # chown -R apache.apache stuff
# # chown -R apache:apache stuff
# # chcon -R -t httpd_sys_content_t stuff
#

View File

@ -15,7 +15,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.7.0
Release: 1%{?dist}
Release: 2%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
@ -57,7 +57,7 @@ compelling replacement for CVS.
Group: Development/Tools
Summary: Libraries for Subversion Version Control system
# APR 1.3.x interfaces are required
Conflicts: apr%{?_isa}< 1.3.0
Conflicts: apr%{?_isa} < 1.3.0
%description libs
The subversion-libs package includes the essential shared libraries
@ -217,7 +217,7 @@ install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/h
# Install SysV init script
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
install -p -m 755 $RPM_SOURCE_DIR/svnserve.init \
$RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
$RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
# Remove unpackaged files
rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \
@ -295,8 +295,8 @@ rm -rf ${RPM_BUILD_ROOT}
%preun
if [ $1 = 0 ]; then
/sbin/service svnserve stop > /dev/null 2>&1
/sbin/chkconfig --del svnserve
/sbin/service svnserve stop > /dev/null 2>&1
/sbin/chkconfig --del svnserve
fi
%post libs -p /sbin/ldconfig
@ -388,6 +388,11 @@ fi
%endif
%changelog
* Sat Oct 15 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-2
- Fix apr Conflicts syntax in -libs.
- Fix obsolete chown syntax in subversion.conf.
- Fix use of spaces vs tabs in specfile.
* Wed Oct 12 2011 Joe Orton <jorton@redhat.com> - 1.7.0-1
- update to 1.7.0
- drop svn2cl (no longer shipped in upstream tarball)