rpms/cvs/devel cvs.spec,1.54,1.55

[Štěpán Kasal (kasal)]

Author: kasal

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

Modified Files:
	cvs.spec 
Log Message:
- make sccs2rcs non-executable, so that find-requires do not add
  dependency on /bin/csh when /bin/csh is available
- add CSH=/bin/csh to configure, so that sccs2rcs #! line is not
  corrupted  when /bin/csh is not available
- replace the deprecated %%makeinstall (see Packaging Guidelines)


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cvs.spec	19 Feb 2007 14:07:02 -0000	1.54
+++ cvs.spec	15 Jun 2007 15:25:58 -0000	1.55
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -99,12 +99,12 @@
 	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
+	KRB_CONFIG="--with-gssapi --with-krb4 --enable-encryption"
 %endif
 
+%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" \
+  $PAM_CONFIG $KRB_CONFIG CSH=/bin/csh
+
 make
 
 %check
@@ -114,7 +114,7 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-%{makeinstall}
+make DESTDIR="$RPM_BUILD_ROOT" install
 # forcefully compress the info pages so that install-info will work properly
 # in the %%post
 gzip $RPM_BUILD_ROOT/%{_infodir}/cvs* || true
@@ -126,6 +126,8 @@
 %endif
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.sh
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.csh
+# Don't let find provides to add csh to automatic requires
+chmod a-x $RPM_BUILD_ROOT/%{_datadir}/%{name}/contrib/sccs2rcs
 
 
 %clean
@@ -157,6 +159,13 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Fri Jun 15 2007 Stepan Kasal <skasal at redhat.com> - 1.11.22-10
+- make sccs2rcs non-executable, so that find-requires do not add
+  dependency on /bin/csh when /bin/csh is available
+- add CSH=/bin/csh to configure, so that sccs2rcs #! line is not
+  corrupted  when /bin/csh is not available
+- replace the deprecated %%makeinstall (see Packaging Guidelines)
+
 * Mon Feb 19 2007 Jindrich Novy <jnovy at redhat.com> - 1.11.22-9
 - fix permissions of cvs.sh, add cvs.csh to /etc/profile.d (#225672)