Hello community,
here is the log from the commit of package gpm for openSUSE:Factory checked in at 2013-04-17 17:41:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpm (Old)
and /work/SRC/openSUSE:Factory/.gpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpm", Maintainer is "nadvornik@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpm/gpm.changes 2013-02-15 18:45:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gpm.new/gpm.changes 2013-04-17 17:41:11.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Apr 16 15:01:42 CEST 2013 - pth@suse.de
+
+- Add software URL.
+- Remove the patches tarball as upstream doesn't provide it anymore.
+
+-------------------------------------------------------------------
+Tue Apr 16 12:23:35 CEST 2013 - pth@suse.de
+
+- Update to 1.20.7:
+
+- Adapt patches to changed sources.
+- Add patch to pass the directory for gpm.h when generating
+ dependencies: gpm-dependencies.patch
+- Add patch that enables the creation of the libgpm.so symlink
+ again and installs it: gpm-do_create_symlink.patch
+- Removed patches not needed anymore:
+ gpm-gcc4.3.patch
+ gpm-libtool.patch
+ config-guess-sub-update.patch
+
+-------------------------------------------------------------------
Old:
----
config-guess-sub-update.patch
gpm-1.20.6-patches.tar.lzma
gpm-1.20.6.tar.lzma
gpm-gcc4.3.patch
gpm-libtool.patch
New:
----
gpm-1.20.7.tar.lzma
gpm-dependencies.patch
gpm-do_create_symlink.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpm.spec ++++++
--- /var/tmp/diff_new_pack.sTZyX4/_old 2013-04-17 17:41:29.000000000 +0200
+++ /var/tmp/diff_new_pack.sTZyX4/_new 2013-04-17 17:41:29.000000000 +0200
@@ -17,15 +17,14 @@
Name: gpm
-Version: 1.20.6
+Version: 1.20.7
Release: 0
Summary: Console Mouse Support
License: GPL-2.0+
Group: System/Console
Url: http://linux.schottelius.org/gpm/
-Source0: gpm-%{version}.tar.lzma
-Source1: gpm-%{version}-patches.tar.lzma
+Source0: http://www.nico.schottelius.org/software/gpm/archives/gpm-%{version}.tar.lzma
Source2: rcgpm
Source3: sysconfig.mouse-%{name}
Source4: README.SuSE
@@ -45,15 +44,17 @@
Patch19: gpm-use_getdtablesize.patch
Patch20: gpm-int_ptr_casts.patch
Patch21: gpm-close-fds.patch
-Patch22: gpm-gcc4.3.patch
Patch23: gpm-lib-silent.patch
-Patch24: gpm-libtool.patch
Patch25: gpm-multilib.patch
Patch26: gpm-weak-wgetch.patch
-Patch27: config-guess-sub-update.patch
+#PATCH-FIX-UPSTREAM Pass path to gpm.h
+Patch28: gpm-dependencies.patch
+#PATCH-FIX-UPSTREAM Create the symlink libgpm.so
+Patch29: gpm-do_create_symlink.patch
BuildRequires: bison
BuildRequires: libtool
BuildRequires: lzma
+BuildRequires: makeinfo
BuildRequires: ncurses-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq
@@ -94,18 +95,18 @@
%patch19
%patch20
%patch21
-%patch22
%patch23
-%patch24
%patch25
%patch26
-%patch27
+%patch28
+%patch29
cp %{S:2} %{S:3} %{S:4} .
%build
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
-export SUSE_ASNEEDED=0
+#export SUSE_ASNEEDED=0
+./autogen.sh
autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM" \
%configure --disable-static \
@@ -171,8 +172,8 @@
%files
%defattr(-,root,root)
-%doc BUGS COPYING README README.SuSE TODO doc/changes
-%doc doc/Announce doc/FAQ doc/README*
+%doc COPYING README README.gpm2 README.SuSE TODO
+%doc doc/Announce doc/FAQ doc/README* doc/changelog
%{_infodir}/*
%{_mandir}/*/*
%dir %config /etc/gpm
@@ -186,7 +187,7 @@
%files devel
%defattr(-,root,root)
-%{_includedir}/*.h
+%{_includedir}/gpm.h
%{_libdir}/libgpm.so
%changelog
++++++ gpm-DESTDIR.patch ++++++
--- /var/tmp/diff_new_pack.sTZyX4/_old 2013-04-17 17:41:29.000000000 +0200
+++ /var/tmp/diff_new_pack.sTZyX4/_new 2013-04-17 17:41:29.000000000 +0200
@@ -1,8 +1,15 @@
+---
+ Makefile.in | 8 ++++++--
+ Makefile.include.in | 1 +
+ doc/Makefile.in | 31 ++++++++++---------------------
+ src/Makefile.in | 19 ++++++++++---------
+ 4 files changed, 27 insertions(+), 32 deletions(-)
+
Index: Makefile.in
===================================================================
---- Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100
-+++ Makefile.in 2010-09-07 19:08:40.912655993 +0200
-@@ -87,9 +87,13 @@ install-strip:
+--- Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200
++++ Makefile.in 2013-04-16 11:42:15.933917724 +0200
+@@ -65,9 +65,13 @@ install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install
installdirs:
@@ -20,8 +27,8 @@
### GENERIC
Index: Makefile.include.in
===================================================================
---- Makefile.include.in.orig 2009-02-09 10:58:53.000000000 +0100
-+++ Makefile.include.in 2010-09-07 19:03:04.962483820 +0200
+--- Makefile.include.in.orig 2012-10-26 23:21:38.000000000 +0200
++++ Makefile.include.in 2013-04-16 11:42:15.933917724 +0200
@@ -43,6 +43,7 @@ YACC = @YACC@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -32,8 +39,8 @@
ELISP = @ELISP@
Index: doc/Makefile.in
===================================================================
---- doc/Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100
-+++ doc/Makefile.in 2010-09-07 19:09:37.506283144 +0200
+--- doc/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200
++++ doc/Makefile.in 2013-04-16 11:42:15.933917724 +0200
@@ -111,29 +111,18 @@ gpmdoc.ps: gpm.ps
# install & uninstall
@@ -76,17 +83,19 @@
# e.g. /var/cache/man/cat1/mev.1.gz. Deleting these is not our job,
Index: src/Makefile.in
===================================================================
---- src/Makefile.in.orig 2009-02-09 10:58:53.000000000 +0100
-+++ src/Makefile.in 2010-09-07 19:07:57.361560078 +0200
-@@ -104,15 +104,16 @@ check: all
+--- src/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200
++++ src/Makefile.in 2013-04-16 11:47:36.772320635 +0200
+@@ -104,17 +104,17 @@ check: all
installdirs:
install: check
- $(INSTALL_PROGRAM) gpm $(sbindir)/gpm
-- $(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
-- $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
+ $(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm
-+ $(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a
+ if [ -f lib/libgpm.a ] ; then \
+- $(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \
++ $(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a ; \
+ fi
+- $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
+ $(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h
# POSIX requires the range of a for loop be nonempty and Bash
# 2.x goes along; unfortunately that means an additional
@@ -94,13 +103,12 @@
if test "x@SHLIB@" != "x" ; then \
- $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
- cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
-+ $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \
-+ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \
-+ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@; \
++ $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ; \
++ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
echo "WARNING: We installed a lib, you should now call ldconfig" ; \
echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \
echo "Or to update everything just type ldconfig" ; \
-@@ -122,7 +123,7 @@ install: check
+@@ -124,7 +124,7 @@ install: check
# prog/
for i in $(PROG); do \
@@ -109,3 +117,18 @@
done
install-strip:
+@@ -133,10 +133,11 @@ install-strip:
+ # Note: this leaves around /usr/lib/libgpm.so.1 and /usr/lib/libgpm.so.1.nn
+ # This is probably the right thing, because programs may be linked to it
+ uninstall:
+- rm -f $(bindir)/mev $(bindir)/gpm-root $(bindir)/disable-paste \
+- $(sbindir)/gpm $(libdir)/libgpm.a $(libdir)/libgpm.so $(includedir)/gpm.h
++ rm -f $(DESTDIR)$(bindir)/mev $(DESTDIR)$(bindir)/gpm-root $(DESTDIR)$(bindir)/disable-paste \
++ $(DESTDIR)$(sbindir)/gpm $(DESTDIR)$(libdir)/libgpm.a $(DESTDIR)$(libdir)/libgpm.so \
++ $(DESTDIR) $(includedir)/gpm.h
+ for i in $(PROG); do \
+- rm -f $(bindir)/$$i ;\
++ rm -f $(DESTDIR)$(bindir)/$$i ;\
+ done
+
+ # Configure & unconfigure
++++++ gpm-ceil.patch ++++++
--- /var/tmp/diff_new_pack.sTZyX4/_old 2013-04-17 17:41:29.000000000 +0200
+++ /var/tmp/diff_new_pack.sTZyX4/_new 2013-04-17 17:41:29.000000000 +0200
@@ -2,11 +2,16 @@
have to make the argument non-constant.
================================================================================
-Index: configure.ac
+---
+ configure.ac.footer | 20 ++++++++++++++++++++
+ src/Makefile.in | 3 ++-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+Index: configure.ac.footer
===================================================================
---- configure.ac.orig 2009-02-09 10:58:53.000000000 +0100
-+++ configure.ac 2010-09-08 16:10:06.434722846 +0200
-@@ -108,6 +108,25 @@ fi
+--- configure.ac.footer.orig 2012-10-26 23:21:38.000000000 +0200
++++ configure.ac.footer 2013-04-16 12:21:01.350791832 +0200
+@@ -112,6 +112,25 @@ fi
AC_CHECK_FUNCS(vsyslog syslog)
AC_FUNC_ALLOCA
@@ -32,28 +37,19 @@
case $with_curses in
No|no|N|n) SHARED_LIBS=-lc ;;
*)
-@@ -138,6 +157,7 @@ AC_SUBST(ELISP)
+@@ -142,6 +161,7 @@ AC_SUBST(ELISP)
AC_SUBST(SHLIB)
AC_SUBST(PICFLAGS)
AC_SUBST(SOLDFLAGS)
+AC_SUBST(SYNLDFLAGS)
+ AC_SUBST(LIBGPM_A)
AC_SUBST(CURSES_OBJS)
AC_SUBST(SHARED_LIBS)
- AC_SUBST(lispdir)
Index: src/Makefile.in
===================================================================
---- src/Makefile.in.orig 2010-09-08 16:06:46.812997967 +0200
-+++ src/Makefile.in 2010-09-08 16:09:40.464506680 +0200
-@@ -82,7 +82,7 @@ prog/%: prog/%.o
- all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG)
-
- gpm: $(GOBJ)
-- $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
-+ $(CC) @LDFLAGS@ @SYNLDFLAGS@ -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
-
- # construct dependings of sourcefiles and link sourcefiles
- $(DEPFILE) dep: prog/gpm-root.c
-@@ -164,7 +164,8 @@ lib/libgpm.a: $(LOBJ)
+--- src/Makefile.in.orig 2013-04-16 12:18:43.719054511 +0200
++++ src/Makefile.in 2013-04-16 12:18:43.762053491 +0200
+@@ -166,7 +166,8 @@ lib/libgpm.a: $(LOBJ)
lib/libgpm.so.@abi_full@: $(PICS)
$(CC) @SOLDFLAGS@libgpm.so.@abi_lev@ \
++++++ gpm-conf.patch ++++++
--- /var/tmp/diff_new_pack.sTZyX4/_old 2013-04-17 17:41:29.000000000 +0200
+++ /var/tmp/diff_new_pack.sTZyX4/_new 2013-04-17 17:41:29.000000000 +0200
@@ -1,8 +1,18 @@
+---
+ README | 2 +-
+ doc/README.synaptics | 4 ++--
+ doc/README.twiddler | 12 ++++++------
+ doc/doc.gpm.in | 6 +++---
+ src/headers/twiddler.h | 4 ++--
+ src/prog/gpm-root.y | 2 +-
+ src/synaptics.c | 4 ++--
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
Index: README
===================================================================
---- README.orig 2009-02-09 10:58:53.000000000 +0100
-+++ README 2010-09-08 13:26:14.060039119 +0200
-@@ -128,7 +128,7 @@ Configuration is optional...
+--- README.orig 2012-10-26 23:21:38.000000000 +0200
++++ README 2013-04-16 11:48:12.185482121 +0200
+@@ -108,7 +108,7 @@ Configuration is optional...
(string-match "con.*" (getenv "TERM"))))
(load-library "t-mouse"))
@@ -11,11 +21,10 @@
directory, test it out and then edit it to suit your feels.
* You'd like to name the gpm info file inside /usr/info/dir. Just insert
-
Index: doc/README.synaptics
===================================================================
---- doc/README.synaptics.orig 2009-02-09 10:58:53.000000000 +0100
-+++ doc/README.synaptics 2010-09-08 13:26:14.108033711 +0200
+--- doc/README.synaptics.orig 2012-10-26 23:21:38.000000000 +0200
++++ doc/README.synaptics 2013-04-16 11:48:12.186482098 +0200
@@ -25,8 +25,8 @@ the buttons, this support currently has
These features can be enabled/disabled and many of them have time and speed
@@ -29,8 +38,8 @@
Index: doc/README.twiddler
===================================================================
---- doc/README.twiddler.orig 2009-02-09 10:58:53.000000000 +0100
-+++ doc/README.twiddler 2010-09-08 13:26:14.128031459 +0200
+--- doc/README.twiddler.orig 2012-10-26 23:21:38.000000000 +0200
++++ doc/README.twiddler 2013-04-16 11:48:12.186482098 +0200
@@ -101,23 +101,23 @@ precompile values because that would mea
file, and provide documentation as well. Using a compulsory
configuration file reliefs my workload :-)
@@ -63,8 +72,8 @@
configuration files: error messages include the file name and the
Index: doc/doc.gpm.in
===================================================================
---- doc/doc.gpm.in.orig 2008-06-16 22:44:05.000000000 +0200
-+++ doc/doc.gpm.in 2010-09-08 13:26:14.128031459 +0200
+--- doc/doc.gpm.in.orig 2012-10-26 23:21:38.000000000 +0200
++++ doc/doc.gpm.in 2013-04-16 11:48:12.187482074 +0200
@@ -1971,7 +1971,7 @@ Available command line options are the f
@item -u
@@ -92,25 +101,10 @@
$(HOME)/.gpm-root The user configuration file.
/dev/vcs* Virtual Console Screens
.fi
-
-Index: doc/gpm.info
-===================================================================
---- doc/gpm.info.orig 2009-02-09 10:59:44.000000000 +0100
-+++ doc/gpm.info 2010-09-08 13:26:14.168026952 +0200
-@@ -1594,7 +1594,7 @@ distribution directory. The tool won't r
-
- `-u'
- Deny using user-specific configuration files. With this option on,
-- only `/etc/gpm-root.conf' will be used as a source of
-+ only `/etc/gpm/root.conf' will be used as a source of
- configuration information. This option is intended for those
- system administrators who fear security could be broken by this
- daemon. Things should be sufficiently secure, but if you find a
-
Index: src/headers/twiddler.h
===================================================================
---- src/headers/twiddler.h.orig 2009-02-09 10:58:53.000000000 +0100
-+++ src/headers/twiddler.h 2010-09-08 13:26:14.284013884 +0200
+--- src/headers/twiddler.h.orig 2012-10-26 23:21:38.000000000 +0200
++++ src/headers/twiddler.h 2013-04-16 11:48:12.188482050 +0200
@@ -46,7 +46,7 @@
#define TW_M_MASK 0x1FF /* mask of movement bits, after shifting */
#define TW_M_BIT 0x100
@@ -123,8 +117,8 @@
Index: src/prog/gpm-root.y
===================================================================
---- src/prog/gpm-root.y.orig 2009-02-09 10:58:53.000000000 +0100
-+++ src/prog/gpm-root.y 2010-09-08 13:26:14.304011630 +0200
+--- src/prog/gpm-root.y.orig 2012-10-26 23:21:38.000000000 +0200
++++ src/prog/gpm-root.y 2013-04-16 11:48:12.203481695 +0200
@@ -77,7 +77,7 @@
#endif
@@ -134,11 +128,10 @@
#define DEFAULT_FORE 7
#define DEFAULT_BACK 0
-
Index: src/synaptics.c
===================================================================
---- src/synaptics.c.orig 2009-02-09 10:58:53.000000000 +0100
-+++ src/synaptics.c 2010-09-08 13:26:14.308011179 +0200
+--- src/synaptics.c.orig 2012-10-26 23:21:38.000000000 +0200
++++ src/synaptics.c 2013-04-16 11:48:12.204481671 +0200
@@ -2064,7 +2064,7 @@ static void tp_process_report (Gpm_Event
** syn_read_config_file
**
++++++ gpm-dependencies.patch ++++++
From: Philipp Thomas