rpms/rcs/devel rcs-5.7-DESTDIR.patch,NONE,1.1 rcs.spec,1.20,1.21

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1066

Modified Files:
	rcs.spec 
Added Files:
	rcs-5.7-DESTDIR.patch 
Log Message:
fix license tag

rcs-5.7-DESTDIR.patch:

--- NEW FILE rcs-5.7-DESTDIR.patch ---
diff -up rcs-5.7/man/Makefile.in.BAD rcs-5.7/man/Makefile.in
--- rcs-5.7/man/Makefile.in.BAD	2008-09-03 16:00:36.000000000 -0400
+++ rcs-5.7/man/Makefile.in	2008-09-03 16:01:35.000000000 -0400
@@ -49,16 +49,16 @@ rcsfile.5 : rcsfile.5in
 check dvi info TAGS ::
 
 installdirs :: ../mkinstalldirs
-	-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
+	-$(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
 
 man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
 
 install :: installdirs
 	-for m in $(man1pages); do \
-		$(INSTALL_DATA) $(srcdir)/$$m.1 $(man1dir)/$$m$(man1ext); \
+		$(INSTALL_DATA) $(srcdir)/$$m.1 $(DESTDIR)$(man1dir)/$$m$(man1ext); \
 	done
 	-{ test -f rcsfile.5 || cd $(srcdir); } && \
-	$(INSTALL_DATA) rcsfile.5 $(man5dir)/rcsfile$(man5ext)
+	$(INSTALL_DATA) rcsfile.5 $(DESTDIR)$(man5dir)/rcsfile$(man5ext)
 
 uninstall ::
 	for m in $(man1pages); do \
diff -up rcs-5.7/src/Makefile.in.BAD rcs-5.7/src/Makefile.in
--- rcs-5.7/src/Makefile.in.BAD	2008-09-03 15:59:48.000000000 -0400
+++ rcs-5.7/src/Makefile.in	2008-09-03 16:00:26.000000000 -0400
@@ -110,11 +110,11 @@ all :: $(PROGRAMS)
 	$(CC) -c $(ALL_CFLAGS) $<
 
 installdirs :: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(bindir)
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
 
 install :: all installdirs
 	for p in $(PROGRAMS); do \
-	  $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
 	done
 
 uninstall ::


Index: rcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rcs.spec	19 Feb 2008 06:34:20 -0000	1.20
+++ rcs.spec	3 Sep 2008 20:05:23 -0000	1.21
@@ -1,17 +1,17 @@
-Summary: Revision Control System (RCS) file version management tools.
+Summary: Revision Control System (RCS) file version management tools
 Name: rcs
 Version: 5.7
-Release: 32
-License: GPL
+Release: 33%{?dist}
+License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
 Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.gz
-Patch: rcs-5.7-stupidrcs.patch
+Patch0: rcs-5.7-stupidrcs.patch
 Patch1: rcs-5.7-security.patch
 Patch2: rcs-5.7-sameuserlocks.patch
 Patch3: rcs-5.7-option.patch
 Patch4: rcs-5.7-newsvnsyntax.patch
-Prefix: %{_prefix}
+Patch5: rcs-5.7-DESTDIR.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
 
@@ -32,24 +32,20 @@
 %patch2 -p1 -b .sameuserlocks
 %patch3 -p1 -b .option
 %patch4 -p1 -b .newsvnsyntax
-
+%patch5 -p1 -b .DESTDIR
 autoconf
 
 %build
-
 %configure --with-diffutils
-
 touch src/conf.h
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-#make prefix=${RPM_BUILD_ROOT}/%{_prefix} install
-%makeinstall man1dir=${RPM_BUILD_ROOT}%{_mandir}/man1 man5dir=${RPM_BUILD_ROOT}%{_mandir}/man5
+make DESTDIR=${RPM_BUILD_ROOT} man1dir=%{_mandir}/man1 man5dir=%{_mandir}/man5 install
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS rcs_func.ms rcs.ms README REFS
 %{_bindir}/*
 %{_mandir}/man[15]/*
@@ -58,6 +54,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.7-33
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.7-32
 - Autorebuild for GCC 4.3