rpms/cvs/devel cvs.spec,1.48,1.49

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9846

Modified Files:
	cvs.spec 
Log Message:
- spec cleanup
- use dist, SOURCE0 now points to correct upstream URL



Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cvs.spec	28 Jul 2006 13:08:44 -0000	1.48
+++ cvs.spec	25 Oct 2006 14:15:07 -0000	1.49
@@ -1,18 +1,31 @@
 # Use PAM for pserver autentization
-%define  pamified  1
+%define pamified 1
+# Use kerberos
+%define kerberized 1  
 
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 4
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
-Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
-Source1: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2.sig
-Source2: cvs.xinetd
-Source3: cvs.pam
-Source4: cvs.sh
+Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
+Source1: cvs.xinetd
+Source2: cvs.pam
+Source3: cvs.sh
 URL: http://www.cvshome.org/
+Prereq: /sbin/install-info
+Requires: vim-minimal
+Prefix: %{_prefix}
+Buildroot: %{_tmppath}/%{name}-root
+BuildPreReq: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel, vim-minimal
+%if %{kerberized}
+BuildPrereq: krb5-devel
+%endif
+%if %{pamified}
+BuildPreReq: pam-devel
+%endif
+
 Patch0: cvs-1.11.22-cvspass.patch
 Patch1: cvs-1.11.19-extzlib.patch
 Patch2: cvs-1.11.19-netbsd-tag.patch
@@ -29,15 +42,6 @@
 Patch15: cvs-1.11.21-sort.patch
 Patch16: cvs-1.11.22-free.patch
 Patch17: cvs-1.11.22-ipv6-proxy.patch
-Prereq: /sbin/install-info
-Requires: vim-minimal
-Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-root
-BuildPreReq: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel, vim-minimal
-%{!?nokerberos:BuildPrereq: krb5-devel}
-%if %{pamified}
-BuildPreReq: pam-devel
-%endif
 
 
 %description
@@ -89,12 +93,16 @@
 PAM_CONFIG="--enable-pam"
 %endif
 
-%{!?nokerberos:k5prefix=`krb5-config --prefix`}
-%{!?nokerberos:CPPFLAGS=-I${k5prefix}/include/kerberosIV; export CPPFLAGS}
-%{!?nokerberos:CFLAGS=-I${k5prefix}/include/kerberosIV; export CFLAGS}
-%{!?nokerberos:LIBS="-lkrb4 -ldes425 -lk5crypto"; export LIBS}
-%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" $PAM_CONFIG \
-%{!?nokerberos: --with-gssapi --with-krb4 --enable-encryption}
+%if %{kerberized}
+	k5prefix=`krb5-config --prefix`
+	CPPFLAGS=-I${k5prefix}/include/kerberosIV; export CPPFLAGS
+	CFLAGS=-I${k5prefix}/include/kerberosIV; export CFLAGS
+	LIBS="-lkrb4 -ldes425 -lk5crypto"; export LIBS
+	%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" $PAM_CONFIG \
+	 --with-gssapi --with-krb4 --enable-encryption
+%else
+	%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" $PAM_CONFIG
+%endif
 
 make
 if [ `id -u` -ne 0 ] ; then
@@ -108,12 +116,12 @@
 # in the %%post
 gzip $RPM_BUILD_ROOT/%{_infodir}/cvs* || true
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/%{name}
+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
 %if %{pamified}
-install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cvs
+install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cvs
 %endif
-install -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.sh
+install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.sh
 
 
 %clean
@@ -133,7 +141,6 @@
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING* DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS
 %doc PROJECTS TODO README
-#%doc doc/*.ps
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/*.info*
@@ -144,6 +151,10 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Oct 25 2006 Jindrich Novy <jnovy at redhat.com> - 1.11.22-5
+- spec cleanup
+- use dist, SOURCE0 now points to correct upstream URL
+
 * Thu Jul 28 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-4
 - added ipv6 patch (#199404)