rpms/gpm/devel .cvsignore, 1.5, 1.6 gpm-1.20.1-multilib.patch, 1.2, 1.3 gpm-1.20.1-weak-wgetch.patch, 1.3, 1.4 gpm.spec, 1.61, 1.62 sources, 1.6, 1.7

Thu Jul 17 09:19:35 UTC 2008

Author: zprikryl

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

Modified Files:
	.cvsignore gpm-1.20.1-multilib.patch 
	gpm-1.20.1-weak-wgetch.patch gpm.spec sources 
Log Message:
Updated to 1.20.5.
Removed doc patch.
Removed lisp stuff, it is part of emacs-common now.
Spec clean up.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	29 May 2008 11:51:59 -0000	1.5
+++ .cvsignore	17 Jul 2008 09:18:40 -0000	1.6
@@ -1 +1 @@
-gpm-1.20.3.tar.gz
+gpm-1.20.5.tar.gz

gpm-1.20.1-multilib.patch:

Index: gpm-1.20.1-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm-1.20.1-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpm-1.20.1-multilib.patch	20 Oct 2004 21:28:19 -0000	1.2
+++ gpm-1.20.1-multilib.patch	17 Jul 2008 09:18:40 -0000	1.3
@@ -48,5 +48,5 @@
  	$(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/
  
  clean distclean:
--	$(RM) -f $(srcdir)/emacs/*.elc
-+	$(RM) $(srcdir)/emacs/*.elc
+-	$(RM) -f $(srcdir)/emacs/*.elc Makefile
++	$(RM) $(srcdir)/emacs/*.elc Makefile

gpm-1.20.1-weak-wgetch.patch:

Index: gpm-1.20.1-weak-wgetch.patch
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm-1.20.1-weak-wgetch.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpm-1.20.1-weak-wgetch.patch	9 Sep 2004 05:52:50 -0000	1.3
+++ gpm-1.20.1-weak-wgetch.patch	17 Jul 2008 09:18:40 -0000	1.4
@@ -14,8 +14,8 @@
  
  int Gpm_Wgetch(WINDOW *win)
  {
---- gpm-1.20.1/configure.in.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
-+++ gpm-1.20.1/configure.in	2004-03-22 15:51:24.000000000 -0500
+--- gpm-1.20.1/configure.ac.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
++++ gpm-1.20.1/configure.ac	2004-03-22 15:51:24.000000000 -0500
 @@ -115,7 +115,7 @@
              AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
          else :; fi
@@ -24,15 +24,3 @@
 +    SHARED_LIBS="-lc"
      LIBS=$SAVELIBS ;;
  esac    
- 
---- gpm-1.20.1/configure.weak-wgetch	2004-03-22 15:49:55.000000000 -0500
-+++ gpm-1.20.1/configure	2004-03-22 15:51:24.000000000 -0500
-@@ -4295,7 +4295,7 @@
- 
-         else :; fi
-     done
--    SHARED_LIBS="$LIBS $TERMLIBS -lc"
-+    SHARED_LIBS="-lc"
-     LIBS=$SAVELIBS ;;
- esac
- 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gpm.spec	4 Jun 2008 12:06:10 -0000	1.61
+++ gpm.spec	17 Jul 2008 09:18:40 -0000	1.62
@@ -1,25 +1,24 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
-Version: 1.20.3
-Release: 2%{?dist}
+Version: 1.20.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
-Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
+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
 Patch2: gpm-1.20.1-lib-silent.patch
 Patch3: gpm-1.20.3-gcc4.3.patch
 Patch4: gpm-1.20.3-close-fds.patch
-Patch5: gpm-1.20.1-doc.patch
-Patch6: gpm-1.20.1-weak-wgetch.patch
-
+Patch5: gpm-1.20.1-weak-wgetch.patch
 Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
 Requires: bash >= 2.0
 # this defines the library version that this package builds.
-%define LIBVER 1.20.0
+%define LIBVER 2.1.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: sed gawk texinfo bison ncurses-devel autoconf
+BuildRequires: sed gawk texinfo bison ncurses-devel autoconf
 
 %description
 Gpm provides mouse support to text-based Linux applications like the
@@ -47,16 +46,13 @@
 %patch2 -p1 -b .lib-silent
 %patch3 -p1 -b .gcc4.3
 %patch4 -p1 -b .close-fds
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .weak-wgetch
-
+%patch5 -p1 -b .weak-wgetch
 
 %build
 rm -f configure
 rm -f src/prog/open_console.o
 autoconf
 CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" \
-    lispdir=%{buildroot}%{_datadir}/emacs/site-lisp \
     %configure
 make
 gcc $RPM_OPT_FLAGS -o inputattach %{SOURCE2}
@@ -64,57 +60,23 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}
 
-PATH=/sbin:$PATH:/usr/sbin:$PATH
+%makeinstall
 
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
-%makeinstall lispdir=%{buildroot}%{_datadir}/emacs/site-lisp
-install -m 755 inputattach %{buildroot}/%{_sbindir}
-
-%ifnarch s390 s390x
-install -m644 doc/gpm-root.1 %{buildroot}%{_mandir}/man1
-install -m644 conf/gpm-root.conf %{buildroot}%{_sysconfdir}
-install -s -m755 src/prog/hltest %{buildroot}%{_bindir}
-%else
-rm -f $RPM_BUILD_ROOT%{_bindir}/{mev,gpm-root}
-%endif
-
-# The emacs-common package contains a newer version of this.
-#cp contrib/emacs/t-mouse.el* %{buildroot}%{_datadir}/emacs/site-lisp
-
-{
-  pushd %{buildroot}
-  chmod +x .%{_libdir}/libgpm.so.%{LIBVER}
-  ln -sf libgpm.so.%{LIBVER} .%{_libdir}/libgpm.so
-  /sbin/ldconfig -n .%{_libdir}
-  popd
-}
+ln -sf libgpm.so.%{LIBVER} $RPM_BUILD_ROOT/%{_libdir}/libgpm.so
 
 %ifnarch s390 s390x
+mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d  
+install -m 755 inputattach %{buildroot}%{_sbindir}
+install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir}
 install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm
-%endif
-
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-#cat >$RPM_BUILD_ROOT/etc/sysconfig/gpm <<EOF
-## Additional options for gpm (e.g. acceleration), device
-#OPTIONS=""
-#DEVICE="/dev/input/mice"
-#MOUSETYPE="exps2"
-#EOF
-
+%else
+# we're shipping only libraries in s390[x], so
 # remove stuff from the buildroot that we aren't shipping
-rm -f $RPM_BUILD_ROOT%{_bindir}/disable-paste
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/mouse-test.1*
-%ifarch s390 s390x
-rm -f $RPM_BUILD_ROOT/usr/sbin/gpm
-rm -f $RPM_BUILD_ROOT/usr/bin/hltest
-rm -f $RPM_BUILD_ROOT/usr/bin/mouse-test
-rm -rf $RPM_BUILD_ROOT/%{_mandir}
-rm -f $RPM_BUILD_ROOT/usr/sbin/inputattach
-rm -f $RPM_BUILD_ROOT/usr/bin/display-buttons
-rm -f $RPM_BUILD_ROOT/usr/bin/display-coords
+rm -rf %{buildroot}%{_sbindir}
+rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_mandir}
 %endif
 
 %clean
@@ -124,48 +86,39 @@
 %ifnarch s390 s390x
 /sbin/chkconfig --add gpm
 %endif
-/sbin/ldconfig
 /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir
-exit 0
+/sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir
 %ifnarch s390 s390x   
-    service gpm stop >/dev/null 2>&1
+if [ "$1" = "0" ]; then
+    /sbin/service gpm stop >/dev/null 2>&1
     /sbin/chkconfig --del gpm
-%endif
 fi
+%endif
+/sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir
 
 %postun
 %ifnarch s390 s390x
 if [ "$1" -ge "1" ]; then
-  service gpm condrestart >/dev/null 2>&1
+    /sbin/service gpm condrestart >/dev/null 2>&1
 fi
 %endif
 /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
+%doc BUGS COPYING README TODO
+%doc doc/README* doc/FAQ doc/Announce doc/changes/*
+%{_infodir}/*
+%{_libdir}/libgpm.so.*
 %ifnarch s390 s390x
-%config %{_sysconfdir}/gpm-root.conf
-%config %{_sysconfdir}/rc.d/init.d/gpm
-%{_bindir}/mev
-%{_bindir}/gpm-root
-%{_bindir}/hltest
-%{_bindir}/mouse-test
-%{_bindir}/display-coords
-%{_bindir}/display-buttons
-%{_mandir}/man1/mev.1*
-%{_mandir}/man1/gpm-root*
-%{_mandir}/man7/gpm-types*
-%{_mandir}/man8/gpm*
-/usr/sbin/gpm
-/usr/sbin/inputattach
+%config(noreplace) %{_sysconfdir}/gpm-*
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/gpm
+%{_sbindir}/*
+%{_bindir}/*
+%{_mandir}/*/*
 %endif
-#%{_datadir}/emacs/site-lisp/t-mouse.el*
-%{_infodir}/gpm.info*
-%{_libdir}/libgpm.so.*
 
 %files devel
 %defattr(-,root,root)
@@ -174,6 +127,12 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Thu Jul 17 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.5-1
+- Updated to 1.20.5
+- Removed doc patch
+- Removed lisp stuff, it is part of emacs-common now 
+- Spec clean up
+
 * Thu Jun 04 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.3-2
 - Enable gpm in runlevel 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 May 2008 11:51:59 -0000	1.6
+++ sources	17 Jul 2008 09:18:40 -0000	1.7
@@ -1 +1 @@
-212251312c7db0396974f25d86d4ae6c  gpm-1.20.3.tar.gz
+3915bdd6bf947ef867752a30b4be2387  gpm-1.20.5.tar.gz


