rpms/clide/devel clide-Makefile.patch, NONE, 1.1 clide.spec, 1.1, 1.2 Makefile.patch, 1.1, NONE

[richardfearn]

Author: richardfearn

Update of /cvs/pkgs/rpms/clide/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12098

Modified Files:
	clide.spec 
Added Files:
	clide-Makefile.patch 
Removed Files:
	Makefile.patch 
Log Message:
update to 0.9-2

clide-Makefile.patch:
 Makefile |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE clide-Makefile.patch ---
diff -urN clide-0.9/Makefile clide-0.9-fedora/Makefile
--- clide-0.9/Makefile	2010-05-19 13:16:02.000000000 +0100
+++ clide-0.9-fedora/Makefile	2010-06-07 21:09:39.000000000 +0100
@@ -50,6 +50,7 @@
 all: manpages
 	for file in $(UTILS) ; do \
 		cat $$file | sed 's|^#!/usr/bin/perl|#!$(PERL)|' > $$file.out ; \
+		touch -r $$file $$file.out ; \
 		mv $$file.out $$file ; chmod a+x $$file ; done
 
 install:
@@ -81,21 +82,17 @@
 manpages:
 	for doc in $(UTILS) ; do \
 		pod2man $$doc > $$doc.1 ; \
-		gzip $$doc.1 ; chmod 644 $$doc.1.gz \
+		touch -r $$doc $$doc.1 \
 		; done
 
 rpminstall:
 	install -m 0755 -d		$(BINDIR)
 	for util in $(UTILS) ; do \
-	    install -m 0755 $$util	$(BINDIR) ; done
-
-	install -m 0755 -d		$(DOCDIR)
-	for doc in $(DOCS) ; do \
-	    install -m 0644 $$doc	$(DOCDIR) ; done
+	    install -p -m 0755 $$util	$(BINDIR) ; done
 
 	install -m 0755 -d		$(MANDIR)
 	for man in $(UTILS) ; do \
-		install -m 0644 $$man.1.gz $(MANDIR) ; done
+		install -p -m 0644 $$man.1 $(MANDIR) ; done
 
 clean:
 	rm -f $(PROJECT).spec


Index: clide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clide/devel/clide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- clide.spec	16 Jun 2010 20:06:05 -0000	1.1
+++ clide.spec	16 Jun 2010 20:11:09 -0000	1.2
@@ -1,13 +1,19 @@
 Name:           clide
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Color and style highlighting program for text
 
 Group:          Applications/Text
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://suso.suso.org/xulu/Clide
 Source0:        http://suso.suso.org/programs/clide/downloads/clide-%{version}.tar.gz
-Patch0:         Makefile.patch
+
+# Makefile changes (sent upstream):
+#  1. Preserve timestamps of the clide script and man page.
+#  2. Don't compress the man page (this is done automatically).
+#  3. Don't install doc files (this is done automatically).
+Patch0:         clide-Makefile.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -22,6 +28,10 @@ include Perl Compatible Regular Expressi
 %setup -q
 %patch0 -p1
 
+# Remove LICENSE, which states that clide is GPLv2+; upstream has confirmed that
+# clide is GPLv3+, as the script itself says
+rm -f LICENSE
+
 %build
 make manpages
 
@@ -35,9 +45,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/clide
-%doc CHANGELOG COPYING GOALS IDEAS LICENSE README WARNING
-%{_mandir}/man1/clide.1.gz
+%doc CHANGELOG COPYING GOALS IDEAS README WARNING
+%{_mandir}/man1/clide.1*
 
 %changelog
+* Mon Jun  7 2010 Richard Fearn <richardfearn at gmail.com> - 0.9-2
+- clide is GPLv3+; remove LICENSE file, which contradicts this
+- Rename Makefile patch, and describe its purpose
+- Don't compress the man page; this is done automatically
+- Remove the doc file installation from the "rpminstall" target in the Makefile,
+  not the "install" target
+
 * Wed May 19 2010 Richard Fearn <richardfearn at gmail.com> - 0.9-1
 - Initial package for Fedora


--- Makefile.patch DELETED ---