commit ed44e24d6c6371b8877aded6142416159a5c4cda
Author: Jakub Bogusz <[email protected]>
Date: Thu Apr 25 15:44:48 2019 +0200
- updated to 0.6.8
- lib64,libx32 patches partly obsolete, remaining part replaced by sed call
to avoid conditional patching
- added pc patch to fill .private dependencies, drop .la file
pxlib-lib64.patch | 28 ----------------------------
pxlib-libx32.patch | 28 ----------------------------
pxlib-pc.patch | 13 +++++++++++++
pxlib.spec | 39 ++++++++++++++++++++-------------------
4 files changed, 33 insertions(+), 75 deletions(-)
---
diff --git a/pxlib.spec b/pxlib.spec
index 1dbe1c4..ec877b5 100644
--- a/pxlib.spec
+++ b/pxlib.spec
@@ -1,30 +1,31 @@
#
# Conditional build:
-%bcond_without static_libs # don't build static libraries
+%bcond_without static_libs # static library
#
Summary: A library to read Paradox DB files
Summary(pl.UTF-8): Biblioteka do odczytu plików baz danych Paradox DB
Name: pxlib
-Version: 0.6.3
-Release: 4
+Version: 0.6.8
+Release: 1
Epoch: 0
License: GPL v2
Group: Libraries
-Source0: http://dl.sourceforge.net/pxlib/%{name}-%{version}.tar.gz
-# Source0-md5: 0742020854496fa757d7acbe6a895224
+Source0: http://downloads.sourceforge.net/pxlib/%{name}-%{version}.tar.gz
+# Source0-md5: 220578ab27348613a35a55902c3999f3
Patch0: %{name}-stderr.patch
-Patch1: %{name}-lib64.patch
-Patch2: %{name}-libx32.patch
+Patch1: %{name}-pc.patch
URL: http://pxlib.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: docbook-to-man
BuildRequires: docbook-utils
BuildRequires: gettext-tools
+BuildRequires: intltool
BuildRequires: libgsf-devel >= 1.14.1
BuildRequires: libtool
BuildRequires: perl-XML-Parser
BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -67,23 +68,21 @@ Statyczna biblioteka pxlib.
%prep
%setup -q
%patch0 -p1
-%if "%{_lib}" == "lib64"
%patch1 -p1
-%endif
-%if "%{_lib}" == "libx32"
-%patch2 -p1
-%endif
+
+%{__sed} -i -e '/RECODE_LIBDIR=/ s,/lib$,/%{_lib},' configure.ac
%build
-cp -f /usr/share/gettext/config.rpath .
+#{__gettextize}
+%{__intltoolize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --with-gsf \
- --enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
+ %{!?with_static_libs:--disable-static} \
+ --with-gsf
%{__make}
%install
@@ -92,13 +91,16 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpx.la
+
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
@@ -109,7 +111,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpx.so
-%{_libdir}/libpx.la
%{_includedir}/paradox*.h
%{_includedir}/pxversion.h
%{_pkgconfigdir}/pxlib.pc
diff --git a/pxlib-lib64.patch b/pxlib-lib64.patch
deleted file mode 100644
index 736e6d9..0000000
--- a/pxlib-lib64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- pxlib-0.6.3/configure.in.orig 2007-12-22 23:23:19.000000000 +0000
-+++ pxlib-0.6.3/configure.in 2007-12-22 23:27:33.000000000 +0000
-@@ -85,7 +85,7 @@
- if test "$am_cv_func_iconv" != "yes" ; then
- AC_ARG_WITH(recode, [ --with-recode=DIR Path to recode library
(/usr)])
- if test -r ${withval}/include/recode.h ; then
-- RECODE_LIBDIR=-L${withval}/lib
-+ RECODE_LIBDIR=-L${withval}/lib64
- RECODE_INCLUDEDIR=-I${withval}/include
- else
- RECODE_LIBDIR=-L/usr
-@@ -116,13 +116,13 @@
- PX_HAVE_GSF=0
- else
- if test -r ${withval}/include/libgsf-1/gsf/gsf-input.h ; then
-- GSF_LIBDIR=-L${withval}/lib
-- GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include"
-+ GSF_LIBDIR=-L${withval}/lib64
-+ GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/lib64/glib-2.0/include"
- try_gsf=true
- else
- if test -r /usr/include/libgsf-1/gsf/gsf-input.h ; then
- GSF_LIBDIR=-L/usr
-- GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
-+ GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include"
- try_gsf=true
- else
- try_gsf=false
diff --git a/pxlib-libx32.patch b/pxlib-libx32.patch
deleted file mode 100644
index 06b2dc5..0000000
--- a/pxlib-libx32.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- pxlib-0.6.3/configure.in.orig 2007-12-22 23:23:19.000000000 +0000
-+++ pxlib-0.6.3/configure.in 2007-12-22 23:27:33.000000000 +0000
-@@ -85,7 +85,7 @@
- if test "$am_cv_func_iconv" != "yes" ; then
- AC_ARG_WITH(recode, [ --with-recode=DIR Path to recode library
(/usr)])
- if test -r ${withval}/include/recode.h ; then
-- RECODE_LIBDIR=-L${withval}/lib
-+ RECODE_LIBDIR=-L${withval}/libx32
- RECODE_INCLUDEDIR=-I${withval}/include
- else
- RECODE_LIBDIR=-L/usr
-@@ -116,13 +116,13 @@
- PX_HAVE_GSF=0
- else
- if test -r ${withval}/include/libgsf-1/gsf/gsf-input.h ; then
-- GSF_LIBDIR=-L${withval}/lib
-- GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/lib/glib-2.0/include"
-+ GSF_LIBDIR=-L${withval}/libx32
-+ GSF_INCLUDEDIR="-I${withval}/include/libgsf-1
-I${withval}/include/glib-2.0 -I${withval}/libx32/glib-2.0/include"
- try_gsf=true
- else
- if test -r /usr/include/libgsf-1/gsf/gsf-input.h ; then
- GSF_LIBDIR=-L/usr
-- GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
-+ GSF_INCLUDEDIR="-I/usr/include/libgsf-1
-I/usr/include/glib-2.0 -I/usr/libx32/glib-2.0/include"
- try_gsf=true
- else
- try_gsf=false
diff --git a/pxlib-pc.patch b/pxlib-pc.patch
new file mode 100644
index 0000000..83661ce
--- /dev/null
+++ b/pxlib-pc.patch
@@ -0,0 +1,13 @@
+--- pxlib-0.6.8/pxlib.pc.in.orig 2016-07-26 13:45:18.000000000 +0200
++++ pxlib-0.6.8/pxlib.pc.in 2019-04-25 05:51:26.779454208 +0200
+@@ -6,7 +6,8 @@
+ Name: libpx
+ Description: A library for reading Paradox files
+ Version: @VERSION@
+-Requires:
+-Libs: -L${libdir} -lpx @RECODE_LIBDIR@ @RECODE_LIBS@
++Requires.private: libgsf-1
++Libs: -L${libdir} -lpx
++Libs.private: @RECODE_LIBDIR@ @RECODE_LIBS@
+ Cflags:
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pxlib.git/commitdiff/ed44e24d6c6371b8877aded6142416159a5c4cda
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
