[packages/Xnee] - updated to 3.15 - added link patch (fixes linking when using shared libxnee) - added am patch (fix
qboosh
qboosh at pld-linux.org
Sat Jan 12 11:25:17 CET 2013
commit 558f9496ce88c40791d7c10be1532fcb1af1619d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jan 12 11:25:32 2013 +0100
- updated to 3.15
- added link patch (fixes linking when using shared libxnee)
- added am patch (fixes build with automake 1.13)
Xnee-am.patch | 19 +++++++++++++++++++
Xnee-link.patch | 39 +++++++++++++++++++++++++++++++++++++++
Xnee.spec | 46 ++++++++++++++++++++++++++++++++++++----------
3 files changed, 94 insertions(+), 10 deletions(-)
---
diff --git a/Xnee.spec b/Xnee.spec
index 2b60a54..7093d87 100644
--- a/Xnee.spec
+++ b/Xnee.spec
@@ -9,18 +9,25 @@
Summary: Suite of programs that can record and replay user actions under X11
Summary(pl.UTF-8): Zestaw programów do nagrywania i odtwarzania akcji użytkownika pod X11
Name: Xnee
-Version: 3.01
+Version: 3.15
Release: 0.1
License: GPL v3+
Group: X11/Applications
-Source0: http://ftp.gnu.org/gnu/xnee/%{name}-%{version}.tar.gz
-# Source0-md5: a6e1e797170317a7454723a7cd7b3c58
+Source0: http://ftp.gnu.org/gnu/xnee/xnee-%{version}.tar.gz
+# Source0-md5: 32c8ac9f354741f03d7736383599984e
Patch0: %{name}-info.patch
+Patch1: %{name}-link.patch
+Patch2: %{name}-am.patch
URL: http://www.gnu.org/software/xnee/www/index.html
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: gtk+2-devel >= 1:2.0.0
+BuildRequires: libtool
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: texinfo
BuildRequires: xorg-proto-recordproto-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXtst-devel
%if %{with gnome}
BuildRequires: GConf2-devel >= 2.0
@@ -81,13 +88,25 @@ pnee is the GNOME panel applet for GNU Xnee.
pnee to aplet panelu GNOME dla GNU Xnee.
%prep
-%setup -q
+%setup -q -n xnee-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+# disable static as no API is installed
%configure \
--disable-doc \
- %{!?with_gnome:--disable-gnome-applet} \
+ --disable-static \
+ --disable-static-programs \
+ %{?with_gnome:--enable-gnome-applet} \
+ --enable-gui \
+ --enable-lib \
--enable-xosd
%{__make} \
@@ -102,25 +121,31 @@ rm -rf $RPM_BUILD_ROOT
PANEL_APPLET_DIR=$RPM_BUILD_ROOT%{_bindir} \
PANEL_SERVER_DIR=$RPM_BUILD_ROOT%{_libdir}/bonobo/servers
+# API not installed
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxnee.{so,la}
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/postshell
+%post -p /sbin/postshell
+-/sbin/ldconfig
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun -p /sbin/postshell
+%postun -p /sbin/postshell
+-/sbin/ldconfig
-/usr/sbin/fix-info-dir -c %{_infodir}
%files
%defattr(644,root,root,755)
%doc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
%attr(755,root,root) %{_bindir}/cnee
+%attr(755,root,root) %{_libdir}/libxnee.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxnee.so.0
%dir %{_datadir}/xnee
%{_datadir}/xnee/*.sh
%{_datadir}/xnee/*.xns
-%dir %{_datadir}/xnee/pixmaps
-%{_datadir}/xnee/pixmaps/xnee.png
-%{_datadir}/xnee/pixmaps/xnee.xpm
+%{_pixmapsdir}/xnee.png
+%{_pixmapsdir}/xnee.xpm
%{_mandir}/man1/cnee.1*
%{_mandir}/man1/xnee.1*
%{_infodir}/cnee.info*
@@ -136,6 +161,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pnee
%{_libdir}/bonobo/servers/pnee.server
+%dir %{_datadir}/xnee/pixmaps
%{_datadir}/xnee/pixmaps/pnee-*.png
%{_mandir}/man1/pnee.1*
%endif
diff --git a/Xnee-am.patch b/Xnee-am.patch
new file mode 100644
index 0000000..33c408a
--- /dev/null
+++ b/Xnee-am.patch
@@ -0,0 +1,19 @@
+--- xnee-3.15/configure.in.orig 2012-12-22 17:25:00.000000000 +0100
++++ xnee-3.15/configure.in 2013-01-11 22:41:03.541706749 +0100
+@@ -262,7 +262,7 @@
+
+
+ AM_MAINTAINER_MODE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ CLI_DIR=
+ LIB_DIR=
+@@ -360,7 +360,6 @@
+
+ AC_ISC_POSIX
+ AC_PROG_CC
+- AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PATH_XTRA
+ GTK_ERR=0
diff --git a/Xnee-link.patch b/Xnee-link.patch
new file mode 100644
index 0000000..5d9b927
--- /dev/null
+++ b/Xnee-link.patch
@@ -0,0 +1,39 @@
+--- xnee-3.15/libxnee/src/Makefile.am.orig 2011-02-22 22:04:38.000000000 +0100
++++ xnee-3.15/libxnee/src/Makefile.am 2013-01-11 20:10:22.041895202 +0100
+@@ -75,13 +75,9 @@
+ libxnee_la_SOURCES = $(LIB_XNEE_SOURCE_FILES)
+ EXTRA_LTLIBRARIES = libxnee.la
+ lib_LTLIBRARIES = $(WANTED_LIBXNEE)
+ libxnee_la_LDFLAGS = -rpath '$(libdir)'
+-#dnl libxnee_la_SOURCES = $(LIB_XNEE_SOURCE_FILES)
+-libxnee_a_CFLAGS = $(AM_CFLAGS)
+-
+-#noinst_LIBRARIES = libxnee.a
++libxnee_la_LIBADD = -lXtst -lX11 -ldl
+
+-noinst_LTLIBRARIES = $(WANTED_LIBXNEE)
+
+
+ if VERBOSE
+--- xnee-3.15/libxnee/test/Makefile.am.orig 2009-12-30 17:13:10.000000000 +0100
++++ xnee-3.15/libxnee/test/Makefile.am 2013-01-12 07:42:15.397696600 +0100
+@@ -4,7 +4,7 @@
+ TESTPRINT = testprint
+ TESTDISP = testdisplay
+ TESTCALLBACK = testcallback
+-lib_LTLIBRARIES = libtestcb.la
++noinst_LTLIBRARIES = libtestcb.la
+
+ noinst_PROGRAMS = $(LIBTEST) $(TESTSETGET) $(TESTFEEDBACK) $(TESTPRINT) $(TESTDISP) $(TESTCALLBACK)
+ TEST_WRAPPER=./test-wrapper.sh
+@@ -18,8 +18,8 @@
+ endif
+
+ AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG}
+-AM_LDFLAGS = -L../src/.libs/ -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL} ${GCOV_FLAG} ${GPROF_FLAG} $(STATIC_FLAGS)
+-AM_LDADD = -L../src/.libs/ -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL} ${GCOV_FLAG} ${GPROF_FLAG} $(STATIC_FLAGS)
++AM_LDFLAGS = ${GCOV_FLAG} ${GPROF_FLAG} $(STATIC_FLAGS)
++LDADD = $(top_builddir)/libxnee/src/libxnee.la ${X_LIBS} ${X11_LIBS} ${LIBDL} ${GCOV_FLAG} ${GPROF_FLAG}
+
+
+ libtest_SOURCES = libtest.c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Xnee.git/commitdiff/558f9496ce88c40791d7c10be1532fcb1af1619d
More information about the pld-cvs-commit
mailing list