Accepting request 171122 from Base:System
Update to 1.20.7 OBS-URL: https://build.opensuse.org/request/show/171122 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpm?expand=0&rev=38
This commit is contained in:
commit
dc4a23b52e
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad1c1a23324e626a532c76e5870aa36357f0df798960c53fc208fdfbdf8a5151
|
||||
size 312560
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0795792f1e4f300f8f2d4474db04baba1ef99dc0017fec0057fcb6ee59eb8745
|
||||
size 998443
|
BIN
gpm-1.20.7.tar.lzma
(Stored with Git LFS)
Normal file
BIN
gpm-1.20.7.tar.lzma
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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 @@ Index: Makefile.in
|
||||
### 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 @@ Index: Makefile.include.in
|
||||
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 @@ Index: doc/Makefile.in
|
||||
# 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 @@ Index: src/Makefile.in
|
||||
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 @@ Index: src/Makefile.in
|
||||
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
|
||||
|
@ -2,11 +2,16 @@ Note that GCC 4.0 will optimize ceil (constant), we therefore
|
||||
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 @@ Index: configure.ac
|
||||
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@ \
|
||||
|
@ -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 @@ Index: README
|
||||
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.synaptics
|
||||
|
||||
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 @@ Index: doc/README.twiddler
|
||||
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 @@ Index: doc/doc.gpm.in
|
||||
$(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/headers/twiddler.h
|
||||
|
||||
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 @@ Index: src/prog/gpm-root.y
|
||||
|
||||
#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
|
||||
**
|
||||
|
26
gpm-dependencies.patch
Normal file
26
gpm-dependencies.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From: Philipp Thomas <pth@suse.de>
|
||||
Date: 2013-04-16 13:06:54+02:00
|
||||
Subject: pass directory for gpm.h
|
||||
|
||||
The directory containing gpm.h wasn't passed to the compiler when
|
||||
generating dependencies.
|
||||
|
||||
---
|
||||
src/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
signed-off-by: Philipp Thomas <pth@suse.de>
|
||||
|
||||
Index: src/Makefile.in
|
||||
===================================================================
|
||||
--- src/Makefile.in.orig 2012-10-26 23:21:38.000000000 +0200
|
||||
+++ src/Makefile.in 2013-04-16 13:06:07.913236362 +0200
|
||||
@@ -96,7 +96,7 @@ $(DEPFILE) dep: prog/gpm-root.c
|
||||
|
||||
# create dependencies
|
||||
for DEPS in `echo *.c */*.c`; do \
|
||||
- $(CC) -I. -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
|
||||
+ $(CC) -I. -I $(srcdir) -I $(srcdir)/headers -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
|
||||
$(SED) 's/^\(.*\)\.o\([ :]+\)/\1.o \1.lo\2/g' >> $(DEPFILE) ; done
|
||||
|
||||
### INSTALL
|
46
gpm-do_create_symlink.patch
Normal file
46
gpm-do_create_symlink.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From: Philipp Thomas <pth@suse.de>
|
||||
Date: 2013-04-16 13:20:48+02:00
|
||||
Subject: Do create the symlink libgpm.so
|
||||
|
||||
---
|
||||
src/Makefile.in | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
signed-off-by: Philipp Thomas <pth@suse.de>
|
||||
|
||||
Index: src/Makefile.in
|
||||
===================================================================
|
||||
--- src/Makefile.in.orig 2013-04-16 13:16:45.723219315 +0200
|
||||
+++ src/Makefile.in 2013-04-16 13:29:52.385720884 +0200
|
||||
@@ -79,7 +79,7 @@ prog/%: prog/%.o
|
||||
# | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
|
||||
|
||||
# Do it all!
|
||||
-all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
|
||||
+all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
|
||||
|
||||
gpm: $(GOBJ)
|
||||
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
|
||||
@@ -114,7 +114,8 @@ install: check
|
||||
# headache in cases like this
|
||||
if test "x@SHLIB@" != "x" ; then \
|
||||
$(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@ ; \
|
||||
+ cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ && \
|
||||
+ $(LN_S) -f libgpm.so.@abi_lev@ libgpm.so ; \
|
||||
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" ; \
|
||||
@@ -170,9 +171,9 @@ lib/libgpm.so.@abi_full@: $(PICS)
|
||||
|
||||
lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@
|
||||
$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
|
||||
-# unneeded, isn't it?
|
||||
-#lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
-# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
+
|
||||
+lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
+ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
|
||||
include $(DEPFILE)
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- src/daemon/open_console.c.gcc4.3 2008-05-28 11:12:34.000000000 +0200
|
||||
+++ src/daemon/open_console.c 2008-05-28 11:12:40.000000000 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include <fcntl.h> /* open and co. */
|
||||
#include <sys/stat.h> /* stat() */
|
||||
-#include <stropts.h> /* ioctl */
|
||||
|
||||
/* Linux specific (to be outsourced in gpm2 */
|
||||
#include <linux/serial.h> /* for serial console check */
|
@ -1,11 +0,0 @@
|
||||
--- configure.ac.libtool 2009-02-11 08:12:00.000000000 +0100
|
||||
+++ configure.ac 2009-02-11 08:12:08.000000000 +0100
|
||||
@@ -42,7 +42,7 @@ release="`cat $srcdir/.gitversion`"
|
||||
#
|
||||
|
||||
AC_PROG_CC
|
||||
-AC_PROG_RANLIB
|
||||
+AC_PROG_LIBTOOL
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_YACC
|
||||
AC_PROG_LN_S
|
@ -1,5 +1,25 @@
|
||||
--- src/lib/libcurses.c.weak-wgetch 2002-12-24 17:57:16.000000000 -0500
|
||||
+++ src/lib/libcurses.c 2004-03-22 15:51:24.000000000 -0500
|
||||
---
|
||||
configure.ac.footer | 2 +-
|
||||
src/lib/libcurses.c | 7 ++++++-
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: configure.ac.footer
|
||||
===================================================================
|
||||
--- configure.ac.footer.orig 2013-04-16 12:26:55.701393713 +0200
|
||||
+++ configure.ac.footer 2013-04-16 12:29:05.441356326 +0200
|
||||
@@ -148,7 +148,7 @@ No|no|N|n) SHARED_LIBS=-lc ;;
|
||||
AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
|
||||
else :; fi
|
||||
done
|
||||
- SHARED_LIBS="$LIBS $TERMLIBS -lc"
|
||||
+ SHARED_LIBS="-lc"
|
||||
LIBS=$SAVELIBS ;;
|
||||
esac
|
||||
|
||||
Index: src/lib/libcurses.c
|
||||
===================================================================
|
||||
--- src/lib/libcurses.c.orig 2012-10-26 23:21:38.000000000 +0200
|
||||
+++ src/lib/libcurses.c 2013-04-16 12:26:55.834390599 +0200
|
||||
@@ -41,7 +41,12 @@
|
||||
#endif /* HAVE_NCURSES_CURSES_H */
|
||||
#endif /* HAVE_NCURSES_H */
|
||||
@ -14,13 +34,3 @@
|
||||
|
||||
int Gpm_Wgetch(WINDOW *win)
|
||||
{
|
||||
--- configure.ac.weak-wgetch 2004-03-22 15:49:51.000000000 -0500
|
||||
+++ configure.ac 2004-03-22 15:51:24.000000000 -0500
|
||||
@@ -115,7 +115,7 @@
|
||||
AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
|
||||
else :; fi
|
||||
done
|
||||
- SHARED_LIBS="$LIBS $TERMLIBS -lc"
|
||||
+ SHARED_LIBS="-lc"
|
||||
LIBS=$SAVELIBS ;;
|
||||
esac
|
||||
|
21
gpm.changes
21
gpm.changes
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 12 07:56:47 UTC 2013 - schwab@suse.de
|
||||
|
||||
|
27
gpm.spec
27
gpm.spec
@ -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 @@ Patch18: gpm-glibc210.patch
|
||||
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 @@ Development files for the gpm (general purpose mouse) package.
|
||||
%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 @@ touch %{buildroot}%{_localstatedir}/run/gpm.pid
|
||||
|
||||
%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 @@ touch %{buildroot}%{_localstatedir}/run/gpm.pid
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/*.h
|
||||
%{_includedir}/gpm.h
|
||||
%{_libdir}/libgpm.so
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user