rpms/distcache/devel .cvsignore,1.3,1.4 distcache.spec,1.19,1.20

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/distcache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15358

Modified Files:
	.cvsignore distcache.spec 
Log Message:
* Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.4.5-15
- fix License, BuildRoot, Source0, drop .la files, detabify



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/distcache/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 04:18:39 -0000	1.3
+++ .cvsignore	22 Aug 2007 10:03:11 -0000	1.4
@@ -1 +1,4 @@
 distcache-1.4.5.tar.bz2
+x86_64
+distcache-1.4.5
+*.rpm


Index: distcache.spec
===================================================================
RCS file: /cvs/extras/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- distcache.spec	12 Jul 2006 05:39:36 -0000	1.19
+++ distcache.spec	22 Aug 2007 10:03:11 -0000	1.20
@@ -2,20 +2,19 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 14.1
-License: LGPL
+Release: 15
+License: LGPLv2
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/distcache/%{name}-%{version}.tar.bz2
 Patch0: distcache-1.4.5-setuid.patch
 Patch1: distcache-1.4.5-libdeps.patch
 Source1: dc_server.init
 Source2: dc_client.init
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake >= 1.7, autoconf >= 2.50, libtool, openssl-devel
-Requires(post): /sbin/chkconfig, /sbin/ldconfig, /usr/sbin/useradd
+Requires(post): /sbin/chkconfig, /sbin/ldconfig, shadow-utils
 Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 The distcache package provides a variety of functionality for
@@ -50,15 +49,16 @@
 make -C ssl install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 755 $RPM_SOURCE_DIR/dc_server.init \
+install -p -m 755 $RPM_SOURCE_DIR/dc_server.init \
         $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/dc_server
-install -m 755 $RPM_SOURCE_DIR/dc_client.init \
+install -p -m 755 $RPM_SOURCE_DIR/dc_client.init \
         $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/dc_client
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_bindir}/{nal_test,piper}
+rm -f $RPM_BUILD_ROOT%{_bindir}/{nal_test,piper} \
+      $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %post
 /sbin/chkconfig --add dc_server
@@ -66,14 +66,14 @@
 /sbin/ldconfig
 # Add the "distcache" user
 /usr/sbin/useradd -c "Distcache" -u 94 \
-	-s /sbin/nologin -r -d / distcache 2> /dev/null || :
+        -s /sbin/nologin -r -d / distcache 2> /dev/null || :
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/service dc_server stop > /dev/null 2>&1
-	/sbin/service dc_client stop > /dev/null 2>&1
-	/sbin/chkconfig --del dc_server
-	/sbin/chkconfig --del dc_client
+    /sbin/service dc_server stop > /dev/null 2>&1
+    /sbin/service dc_client stop > /dev/null 2>&1
+    /sbin/chkconfig --del dc_server
+    /sbin/chkconfig --del dc_client
 fi
 
 %postun -p /sbin/ldconfig
@@ -96,11 +96,13 @@
 %defattr(-,root,root,-)
 %{_includedir}/distcache
 %{_includedir}/libnal
-%{_libdir}/*.*a
 %{_libdir}/*.so
 %{_mandir}/man2/*
 
 %changelog
+* Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 1.4.5-15
+- fix License, BuildRoot, Source0, drop .la files, detabify
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-14.1
 - rebuild