rpms/gpm/devel gpm-1.20.6-multilib.patch, NONE, 1.1 gpm.spec, 1.72, 1.73 gpm-1.20.1-multilib.patch, 1.3, NONE

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/gpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24233

Modified Files:
	gpm.spec 
Added Files:
	gpm-1.20.6-multilib.patch 
Removed Files:
	gpm-1.20.1-multilib.patch 
Log Message:
Fixed gpm.info.gz building


gpm-1.20.6-multilib.patch:

--- NEW FILE gpm-1.20.6-multilib.patch ---
diff -up gpm-1.20.6/contrib/Makefile.in.multilib gpm-1.20.6/contrib/Makefile.in
--- gpm-1.20.6/contrib/Makefile.in.multilib	2008-06-19 07:48:48.000000000 +0200
+++ gpm-1.20.6/contrib/Makefile.in	2009-02-24 10:36:09.000000000 +0100
@@ -9,10 +9,10 @@ top_builddir = ..
 
 include $(top_builddir)/Makefile.include
 
-all: $(srcdir)/$(ELISP)
+all: $(filter-out %.elc,$(srcdir)/$(ELISP))
 
 install: all
-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
 		$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
 	done; fi
 
@@ -20,7 +20,7 @@ install: all
 	$(EMACS) -batch -l $(srcdir)/emacs/exec.el -exec '(byte-compile-file "$<")'
 
 uninstall:
-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
 		rm -f $(lispdir)/$$i ;\
 	done; fi 
 
@@ -28,4 +28,4 @@ dist:
 	$(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/
 
 clean distclean:
-	$(RM) -f $(srcdir)/emacs/*.elc Makefile
+	$(RM) $(srcdir)/emacs/*.elc Makefile
diff -up gpm-1.20.6/doc/Makefile.in.multilib gpm-1.20.6/doc/Makefile.in
--- gpm-1.20.6/doc/Makefile.in.multilib	2009-02-09 10:58:53.000000000 +0100
+++ gpm-1.20.6/doc/Makefile.in	2009-02-24 10:36:09.000000000 +0100
@@ -130,8 +130,8 @@ install:	all installdirs
 	#i keep all my infopages compressed and i'm tired to do it by
 	#hand, so check if there are any compressed pages and do this
 	#one too
-	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
-		&& gzip -f $(infodir)/gpm.info
+	#-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
+	#	&& gzip -f $(infodir)/gpm.info
 	# Hmm.... shouldn't man pages be compressed too?
    # maybe they should, but at least at my system they are not.
 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gpm.spec	11 Feb 2009 10:21:19 -0000	1.72
+++ gpm.spec	24 Feb 2009 09:44:33 -0000	1.73
@@ -1,14 +1,14 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
 Source: http://unix.schottelius.org/gpm/archives/%{name}-%{version}.tar.gz
 Source1: gpm.init
 Source2: inputattach.c
-Patch1: gpm-1.20.1-multilib.patch
+Patch1: gpm-1.20.6-multilib.patch
 Patch2: gpm-1.20.1-lib-silent.patch
 Patch3: gpm-1.20.3-gcc4.3.patch
 Patch4: gpm-1.20.5-close-fds.patch
@@ -62,7 +62,6 @@
 touch -c -r TODO TODO.utf8
 mv -f TODO.utf8 TODO
 
-rm -f configure
 autoreconf
 
 %build
@@ -144,6 +143,9 @@
 %{_libdir}/libgpm.a
 
 %changelog
+* Tue Feb 24 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.6-2
+- Fixed gpm.info.gz building
+
 * Tue Feb 03 2009 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.6-1
 - Spec review (#225856)
 - Updated to 1.20.6


--- gpm-1.20.1-multilib.patch DELETED ---