[packages/liboop] - new URLs, updated to 1.0 - updated libwww-fix,link patches - removed obsolete nolibs patch - added
qboosh
qboosh at pld-linux.org
Thu Jul 25 18:17:44 CEST 2013
commit 4f16158f91a262c2205547aa6009171150857818
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jul 25 18:18:02 2013 +0200
- new URLs, updated to 1.0
- updated libwww-fix,link patches
- removed obsolete nolibs patch
- added tcl patch (tcl 8.5 support)
- more fine-grained split, added glib2 binding
liboop-libwww-fix.patch | 11 --
liboop-link.patch | 35 +++--
liboop-nolibs.patch | 14 --
liboop-tcl.patch | 11 ++
liboop.spec | 406 ++++++++++++++++++++++++++++++++++++++----------
5 files changed, 357 insertions(+), 120 deletions(-)
---
diff --git a/liboop.spec b/liboop.spec
index cb8289e..d563946 100644
--- a/liboop.spec
+++ b/liboop.spec
@@ -1,25 +1,32 @@
+#
+# Condional build:
+%bcond_without libwww # W3C libwww binding
+#
Summary: Libraries for low-level event loop management
Summary(pl.UTF-8): Biblioteki do zarządzania niskopoziomowymi pętlami
Name: liboop
-Version: 0.8
-Release: 10
-License: LGPL
+Version: 1.0
+Release: 1
+License: LGPL v2.1+
Group: Libraries
-Source0: http://www.liboop.org/%{name}-%{version}.tar.gz
-# Source0-md5: 903f8d2f9b94e7b0ac73be61d6a5442f
+Source0: http://download.ofb.net/liboop/%{name}-%{version}.tar.bz2
+# Source0-md5: 88fc8decf99fd75d2af40e0a005fa0d3
Patch0: %{name}-libwww-fix.patch
-Patch1: %{name}-nolibs.patch
-Patch2: %{name}-link.patch
-URL: http://www.liboop.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: expat-devel
+Patch1: %{name}-link.patch
+Patch2: %{name}-tcl.patch
+URL: http://liboop.ofb.net/
+BuildRequires: adns-devel
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.7
BuildRequires: glib-devel
-BuildRequires: libtool
+BuildRequires: glib2-devel
+BuildRequires: libtool >= 1.4
BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: tcl-devel >= 8.3.4-10
-BuildRequires: w3c-libwww-devel
+%{?with_libwww:BuildRequires: w3c-libwww-devel}
+Obsoletes: liboop-bindings
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -42,78 +49,224 @@ korzystają z tych mechanizmów przy praktycznie każdej komunikacji z
otoczeniem, można używać liboop jako podstawy dla prawie wszystkich
aplikacji.
-%package bindings
-Summary: liboop bindings for specific libraries
-Summary(pl.UTF-8): Biblioteki wiążące liboop z innymi bibliotekami
+%package devel
+Summary: Header files for liboop
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki liboop
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: liboop-bindings-devel
-%description bindings
-liboop bindings for specific libraries (dns, glib, readline).
+%description devel
+liboop is a low-level event loop management library.
-%description bindings -l pl.UTF-8
-Biblioteki wiążące liboop z innymi bibliotekami (dns, glib, readline).
+This package contains the header files needed to write or compile
+programs that use liboop library.
-%package binding-tcl
-Summary: liboop binding for tcl library
-Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką tcl
+%description devel -l pl.UTF-8
+liboop jest biblioteką do zarządzania niskopoziomowymi pętlami.
+
+Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
+programów używających biblioteki liboop.
+
+%package static
+Summary: Static liboop library
+Summary(pl.UTF-8): Statyczna biblioteka liboop
Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static liboop library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka liboop.
+
+%package binding-adns
+Summary: liboop binding for adns library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką adns
+Group: Libraries
Requires: %{name} = %{version}-%{release}
-%description binding-tcl
-liboop binding for tcl library.
+%description binding-adns
+liboop binding for adns library.
-%description binding-tcl -l pl.UTF-8
-Biblioteka wiążąca liboop z biblioteką tcl.
+%description binding-adns -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką adns.
-%package binding-www
-Summary: liboop binding for w3c-libwww library
-Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką w3c-libwww
+%package binding-adns-devel
+Summary: Header file for liboop adns binding library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki wiążącej liboop z biblioteką adns
+Group: Development/Libraries
+Requires: %{name}-binding-adns = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: adns-devel
+
+%description binding-adns-devel
+liboop is a low-level event loop management library.
+
+This package contains the header file needed to write or compile
+programs that use liboop adns binding library.
+
+%description binding-adns-devel -l pl.UTF-8
+liboop jest biblioteką do zarządzania niskopoziomowymi pętlami.
+
+Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania
+programów używających biblioteki wiążącej liboop z adns.
+
+%package binding-adns-static
+Summary: Static liboop adns binding library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z adns
Group: Development/Libraries
+Requires: %{name}-binding-adns-devel = %{version}-%{release}
+
+%description binding-adns-static
+Static liboop adns binding library.
+
+%description binding-adns-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z adns.
+
+%package binding-glib
+Summary: liboop binding for GLib 1.x library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką GLib 1.x
+Group: Libraries
Requires: %{name} = %{version}-%{release}
-%description binding-www
-liboop binding for w3c-libwww library.
+%description binding-glib
+liboop binding for GLib 1.x library.
-%description binding-www -l pl.UTF-8
-Biblioteka wiążąca liboop z biblioteką w3c-libwww.
+%description binding-glib -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką GLib 1.x.
-%package devel
-Summary: Header files for liboop
-Summary(pl.UTF-8): Pliki nagłówkowe liboop
+%package binding-glib-devel
+Summary: Header file for liboop GLib 1.x binding library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki wiążącej liboop z biblioteką GLib 1.x
+Group: Development/Libraries
+Requires: %{name}-binding-glib = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: glib-devel
+
+%description binding-glib-devel
+liboop is a low-level event loop management library.
+
+This package contains the header file needed to write or compile
+programs that use liboop GLib 1.x binding library.
+
+%description binding-glib-devel -l pl.UTF-8
+liboop jest biblioteką do zarządzania niskopoziomowymi pętlami.
+
+Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania
+programów używających biblioteki wiążącej liboop z GLib 1.x.
+
+%package binding-glib-static
+Summary: Static liboop GLib 1.x binding library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z GLib 1.x
Group: Development/Libraries
+Requires: %{name}-binding-glib-devel = %{version}-%{release}
+
+%description binding-glib-static
+Static liboop GLib 1.x binding library.
+
+%description binding-glib-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z GLib 1.x.
+
+%package binding-glib2
+Summary: liboop binding for GLib 2.x library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką GLib 2.x
+Group: Libraries
Requires: %{name} = %{version}-%{release}
-%description devel
+%description binding-glib2
+liboop binding for GLib 2.x library.
+
+%description binding-glib2 -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką GLib 2.x.
+
+%package binding-glib2-devel
+Summary: Header file for liboop GLib 2.x binding library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki wiążącej liboop z biblioteką GLib 2.x
+Group: Development/Libraries
+Requires: %{name}-binding-glib2 = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: glib2-devel
+
+%description binding-glib2-devel
liboop is a low-level event loop management library.
-This package contains the header files and libraries needed to write
-or compile programs that use liboop.
+This package contains the header file needed to write or compile
+programs that use liboop GLib 2.x binding library.
-%description devel -l pl.UTF-8
+%description binding-glib2-devel -l pl.UTF-8
liboop jest biblioteką do zarządzania niskopoziomowymi pętlami.
-Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
-programów używających liboop.
+Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania
+programów używających biblioteki wiążącej liboop z GLib 2.x.
-%package bindings-devel
-Summary: Header files for liboop binding libraries
-Summary(pl.UTF-8): Pliki nagłówkowe bibliotek wiążących liboop
+%package binding-glib2-static
+Summary: Static liboop GLib 2.x binding library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z GLib 2.x
Group: Development/Libraries
-Requires: %{name}-bindings = %{version}-%{release}
+Requires: %{name}-binding-glib2-devel = %{version}-%{release}
+
+%description binding-glib2-static
+Static liboop GLib 2.x binding library.
+
+%description binding-glib2-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z GLib 2.x.
+
+%package binding-readline
+Summary: liboop binding for readline library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką readline
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description binding-readline
+liboop binding for readline library.
+
+%description binding-readline -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką readline.
+
+%package binding-readline-devel
+Summary: Header file for liboop readline binding library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki wiążącej liboop z biblioteką readline
+Group: Development/Libraries
+Requires: %{name}-binding-readline = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
+Requires: readline-devel
-%description bindings-devel
+%description binding-readline-devel
liboop is a low-level event loop management library.
-This package contains the header files and libraries needed to write
-or compile programs that use liboop binding libraries.
+This package contains the header file needed to write or compile
+programs that use liboop readline binding library.
-%description bindings-devel -l pl.UTF-8
+%description binding-readline-devel -l pl.UTF-8
liboop jest biblioteką do zarządzania niskopoziomowymi pętlami.
-Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
-programów używających bibliotek wiążących liboop.
+Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania
+programów używających biblioteki wiążącej liboop z readline.
+
+%package binding-readline-static
+Summary: Static liboop readline binding library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z readline
+Group: Development/Libraries
+Requires: %{name}-binding-readline-devel = %{version}-%{release}
+
+%description binding-readline-static
+Static liboop readline binding library.
+
+%description binding-readline-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z readline.
+
+%package binding-tcl
+Summary: liboop binding for tcl library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką tcl
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description binding-tcl
+liboop binding for tcl library.
+
+%description binding-tcl -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką tcl.
%package binding-tcl-devel
Summary: Header file for liboop tcl binding library
@@ -131,6 +284,30 @@ programs that use liboop tcl binding library.
Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania programów
używających biblioteki wiążącej liboop z tcl.
+%package binding-tcl-static
+Summary: Static liboop readline tcl library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z tcl
+Group: Development/Libraries
+Requires: %{name}-binding-tcl-devel = %{version}-%{release}
+
+%description binding-tcl-static
+Static liboop tcl binding library.
+
+%description binding-tcl-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z tcl.
+
+%package binding-www
+Summary: liboop binding for w3c-libwww library
+Summary(pl.UTF-8): Biblioteka wiążąca liboop z biblioteką w3c-libwww
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description binding-www
+liboop binding for w3c-libwww library.
+
+%description binding-www -l pl.UTF-8
+Biblioteka wiążąca liboop z biblioteką w3c-libwww.
+
%package binding-www-devel
Summary: Header file for liboop w3c-libwww binding libraries
Summary(pl.UTF-8): Plik nagłówkowy biblioteki wiążącej liboop z w3c-libwww
@@ -147,18 +324,17 @@ programs that use liboop w3c-libwww binding library.
Ten pakiet zawiera plik nagłówkowy potrzebny do kompilowania programów
używających biblioteki wiążącej liboop z w3c-libwww.
-%package static
-Summary: Static liboop libraries
-Summary(pl.UTF-8): Statyczne biblioteki liboop
+%package binding-www-static
+Summary: Static liboop readline w3c-libwww library
+Summary(pl.UTF-8): Statyczna biblioteka wiążąca liboop z w3c-libwww
Group: Development/Libraries
-Requires: %{name}-bindings-devel = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-binding-tcl-devel = %{version}-%{release}
-%description static
-Static liboop libraries.
+%description binding-www-static
+Static liboop w3c-libwww binding library.
-%description static -l pl.UTF-8
-Statyczne biblioteki liboop.
+%description binding-www-static -l pl.UTF-8
+Statyczna biblioteka wiążąca liboop z w3c-libwww.
%prep
%setup -q
@@ -167,13 +343,14 @@ Statyczne biblioteki liboop.
%patch2 -p1
%build
-rm -f missing
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
- LDFLAGS="%{rpmldflags} -L.libs"
+ PROG_LDCONFIG=/bin/true \
+ %{?with_libwww:--with-libwww}
+# LDFLAGS="%{rpmldflags} -L.libs"
%{__make}
%install
@@ -187,8 +364,17 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post bindings -p /sbin/ldconfig
-%postun bindings -p /sbin/ldconfig
+%post binding-adns -p /sbin/ldconfig
+%postun binding-adns -p /sbin/ldconfig
+
+%post binding-glib -p /sbin/ldconfig
+%postun binding-glib -p /sbin/ldconfig
+
+%post binding-glib2 -p /sbin/ldconfig
+%postun binding-glib2 -p /sbin/ldconfig
+
+%post binding-readline -p /sbin/ldconfig
+%postun binding-readline -p /sbin/ldconfig
%post binding-tcl -p /sbin/ldconfig
%postun binding-tcl -p /sbin/ldconfig
@@ -198,7 +384,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liboop.so.*.*
+%attr(755,root,root) %{_libdir}/liboop.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop.so.4
%files devel
%defattr(644,root,root,755)
@@ -206,45 +393,100 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/liboop.la
%{_includedir}/oop.h
%{_includedir}/oop-read.h
+%{_pkgconfigdir}/liboop.pc
-%files bindings
+%files static
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liboop-adns.so.*.*
-%attr(755,root,root) %{_libdir}/liboop-glib.so.*.*
-%attr(755,root,root) %{_libdir}/liboop-rl.so.*.*
+%{_libdir}/liboop.a
-%files binding-tcl
+%files binding-adns
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liboop-tcl.so.*.*
+%attr(755,root,root) %{_libdir}/liboop-adns.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-adns.so.3
-%files binding-www
+%files binding-adns-devel
+%attr(755,root,root) %{_libdir}/liboop-adns.so
+%{_libdir}/liboop-adns.la
+%{_includedir}/oop-adns.h
+
+%files binding-adns-static
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liboop-www.so.*.*
+%{_libdir}/liboop-adns.a
-%files bindings-devel
+%files binding-glib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-glib.so.0
+
+%files binding-glib-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liboop-adns.so
-%{_libdir}/liboop-adns.la
%attr(755,root,root) %{_libdir}/liboop-glib.so
%{_libdir}/liboop-glib.la
+%{_includedir}/oop-glib.h
+
+%files binding-glib-static
+%defattr(644,root,root,755)
+%{_libdir}/liboop-glib.a
+
+%files binding-glib2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-glib2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-glib2.so.0
+
+%files binding-glib2-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-glib2.so
+%{_libdir}/liboop-glib2.la
+%{_includedir}/oop-glib.h
+%{_pkgconfigdir}/liboop-glib2.pc
+
+%files binding-glib2-static
+%defattr(644,root,root,755)
+%{_libdir}/liboop-glib2.a
+
+%files binding-readline
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-rl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-rl.so.0
+
+%files binding-readline-devel
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liboop-rl.so
%{_libdir}/liboop-rl.la
-%{_includedir}/oop-adns.h
-%{_includedir}/oop-glib.h
%{_includedir}/oop-rl.h
+%files binding-readline-static
+%defattr(644,root,root,755)
+%{_libdir}/liboop-rl.a
+
+%files binding-tcl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-tcl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-tcl.so.0
+
%files binding-tcl-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liboop-tcl.so
%{_libdir}/liboop-tcl.la
%{_includedir}/oop-tcl.h
+%files binding-tcl-static
+%defattr(644,root,root,755)
+%{_libdir}/liboop-tcl.a
+
+%if %{with libwww}
+%files binding-www
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liboop-www.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboop-www.so.0
+
%files binding-www-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liboop-www.so
%{_libdir}/liboop-www.la
%{_includedir}/oop-www.h
-%files static
+%files binding-www-static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/liboop-www.a
+%endif
diff --git a/liboop-libwww-fix.patch b/liboop-libwww-fix.patch
index 81d9c6f..32cfe15 100644
--- a/liboop-libwww-fix.patch
+++ b/liboop-libwww-fix.patch
@@ -9,14 +9,3 @@
#endif
#ifdef HAVE_READLINE
---- liboop-0.8/configure.in.orig Sun Mar 2 18:32:31 2003
-+++ liboop-0.8/configure.in Sun Mar 2 18:34:56 2003
-@@ -60,7 +60,7 @@
- WWW_LIBS=" \
- -lwwwapp -lwwwcache -lwwwcore -lwwwdir -lwwwfile -lwwwftp -lwwwgopher \
- -lwwwhtml -lwwwhttp -lwwwinit -lwwwmime -lwwwmux -lwwwnews -lwwwstream \
-- -lwwwtelnet -lwwwtrans -lwwwutils -lwwwxml -lwwwzip -lxmlparse -lxmltok -lmd5"
-+ -lwwwtelnet -lwwwtrans -lwwwutils -lwwwxml -lwwwzip -lmd5"
- WWW_INCLUDES="-I/usr/include/w3c-libwww"
- ],,-lwwwutils)
-
diff --git a/liboop-link.patch b/liboop-link.patch
index ea4a181..29ebf37 100644
--- a/liboop-link.patch
+++ b/liboop-link.patch
@@ -1,31 +1,40 @@
---- liboop-0.8/Makefile.am~ 2001-09-18 22:35:45.000000000 +0200
-+++ liboop-0.8/Makefile.am 2011-01-06 21:44:32.539761952 +0100
-@@ -15,23 +15,23 @@
+--- liboop-1.0/Makefile.am.orig 2013-07-25 17:58:16.266195815 +0200
++++ liboop-1.0/Makefile.am 2013-07-25 17:59:25.029526263 +0200
+@@ -18,31 +18,31 @@
liboop_la_SOURCES = sys.c select.c signal.c alloc.c read.c read-fd.c read-mem.c
- liboop_adns_la_LDFLAGS = -version-info 2:0:0
+ liboop_adns_la_LDFLAGS = -version-info 3:0:0 -rpath '$(libdir)'
-liboop_adns_la_LIBADD = $(ADNS_LIBS)
-+liboop_adns_la_LIBADD = $(ADNS_LIBS) liboop.la
++liboop_adns_la_LIBADD = liboop.la $(ADNS_LIBS)
liboop_adns_la_SOURCES = adns.c
- liboop_glib_la_LDFLAGS = -version-info 1:0:0
+ liboop_glib_la_LDFLAGS = -version-info 1:0:1 -rpath '$(libdir)'
-liboop_glib_la_LIBADD = $(GLIB_LIBS)
-+liboop_glib_la_LIBADD = $(GLIB_LIBS) liboop.la
++liboop_glib_la_LIBADD = liboop.la $(GLIB_LIBS)
+ liboop_glib_la_CFLAGS = $(GLIB_INCLUDES)
liboop_glib_la_SOURCES = glib.c
- liboop_tcl_la_LDFLAGS = -version-info 0:0:0
+ liboop_glib2_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)'
+-liboop_glib2_la_LIBADD = $(GLIB2_LIBS)
++liboop_glib2_la_LIBADD = liboop.la $(GLIB2_LIBS)
+ liboop_glib2_la_CFLAGS = $(GLIB2_CFLAGS)
+ liboop_glib2_la_SOURCES = glib.c
+
+ liboop_tcl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)'
-liboop_tcl_la_LIBADD = $(TCL_LIBS)
-+liboop_tcl_la_LIBADD = $(TCL_LIBS) liboop.la
++liboop_tcl_la_LIBADD = liboop.la $(TCL_LIBS)
+ liboop_tcl_la_CFLAGS = $(TCL_INCLUDES)
liboop_tcl_la_SOURCES = tcl.c
- liboop_www_la_LDFLAGS = -version-info 0:0:0
+ liboop_www_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)'
-liboop_www_la_LIBADD = $(WWW_LIBS)
-+liboop_www_la_LIBADD = $(WWW_LIBS) liboop.la
++liboop_www_la_LIBADD = liboop.la $(WWW_LIBS)
+ liboop_www_la_CFLAGS = $(WWW_INCLUDES)
liboop_www_la_SOURCES = www.c
- liboop_rl_la_LDFLAGS = -version-info 0:0:0
+ liboop_rl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)'
-liboop_rl_la_LIBADD = $(READLINE_LIBS)
-+liboop_rl_la_LIBADD = $(READLINE_LIBS) liboop.la
++liboop_rl_la_LIBADD = liboop.la $(READLINE_LIBS)
liboop_rl_la_SOURCES = readline.c
include_HEADERS = oop.h oop-adns.h oop-glib.h oop-tcl.h oop-www.h oop-rl.h oop-read.h
diff --git a/liboop-nolibs.patch b/liboop-nolibs.patch
deleted file mode 100644
index 9a1a0aa..0000000
--- a/liboop-nolibs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- liboop-0.8/configure.in.orig Thu Sep 20 14:54:39 2001
-+++ liboop-0.8/configure.in Sun Mar 2 18:31:01 2003
-@@ -64,10 +64,8 @@
- WWW_INCLUDES="-I/usr/include/w3c-libwww"
- ],,-lwwwutils)
-
--AC_CHECK_LIB(resolv,res_query)
- if test -z "$no_wacky_libs" ; then
-- AC_CHECK_LIB(nsl,main)
-- AC_CHECK_LIB(socket,socket)
-+ AC_SEARCH_LIBS(socket,socket)
- fi
-
- test yes = "$GCC" &&
diff --git a/liboop-tcl.patch b/liboop-tcl.patch
new file mode 100644
index 0000000..030dfa1
--- /dev/null
+++ b/liboop-tcl.patch
@@ -0,0 +1,11 @@
+--- liboop-1.0/configure.ac.orig 2003-10-26 17:39:21.000000000 +0100
++++ liboop-1.0/configure.ac 2013-07-25 17:54:17.336205842 +0200
+@@ -71,7 +71,7 @@
+ fi
+
+ if test xno != x$with_tcl; then
+- for version in 8.4 8.3 8.2 8.1 8.0 ; do
++ for version in 8.5 8.4 8.3 8.2 8.1 8.0 ; do
+ CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
+ AC_CHECK_LIB(tcl$version,Tcl_Main,[
+ AC_CHECK_HEADER(tcl.h,[
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/liboop.git/commitdiff/4f16158f91a262c2205547aa6009171150857818
More information about the pld-cvs-commit
mailing list