diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | libircclient-1.6-rfc.patch | 11 | ||||
| -rw-r--r-- | libircclient-1.6-shared.patch | 55 | ||||
| -rw-r--r-- | libircclient-1.7-install.patch (renamed from libircclient-1.6-install.patch) | 31 | ||||
| -rw-r--r-- | libircclient-1.7-rfc.patch | 11 | ||||
| -rw-r--r-- | libircclient-1.7-soname.patch | 21 | ||||
| -rw-r--r-- | libircclient.spec | 46 |
7 files changed, 78 insertions, 101 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/libircclient-1.6-rfc.patch b/libircclient-1.6-rfc.patch deleted file mode 100644 index 3bd6022..0000000 --- a/libircclient-1.6-rfc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libircclient-1.6/include/libircclient.h.orig libircclient-1.6/include/libircclient.h ---- libircclient-1.6/include/libircclient.h.orig 2012-04-28 17:28:29.352267217 -0300 -+++ libircclient-1.6/include/libircclient.h 2012-04-28 17:28:50.662268034 -0300 -@@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_ - #include "libirc_errors.h" - #include "libirc_events.h" - #include "libirc_options.h" -+#include "libirc_rfcnumeric.h" - #undef IN_INCLUDE_LIBIRC_H - - diff --git a/libircclient-1.6-shared.patch b/libircclient-1.6-shared.patch deleted file mode 100644 index 15d1e39..0000000 --- a/libircclient-1.6-shared.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up libircclient-1.6/src/Makefile.in.orig libircclient-1.6/src/Makefile.in ---- libircclient-1.6/src/Makefile.in.orig 2012-05-01 16:29:17.976661058 -0300 -+++ libircclient-1.6/src/Makefile.in 2012-05-01 16:30:00.726662877 -0300 -@@ -5,13 +5,14 @@ AR=@AR@ cr - RANLIB=@RANLIB@ - INCLUDES=-I../include - DESTDIR= -+MAJOR=0 - - OBJS = libircclient.o - - all: @TARGET@ - - static: libircclient.a --shared: libircclient.so -+shared: libircclient.so.$(MAJOR) - shared_mingw: libircclient.dll - - install: @TARGET@ -@@ -22,11 +23,21 @@ install: @TARGET@ - cp ../include/libirc_events.h $(DESTDIR)@includedir@/libirc_events.h - cp ../include/libirc_options.h $(DESTDIR)@includedir@/libirc_options.h - cp ../include/libirc_rfcnumeric.h $(DESTDIR)@includedir@/libirc_rfcnumeric.h -- if [ -f libircclient.so ]; then cp libircclient.so $(DESTDIR)@libdir@; else :; fi -- if [ -f libircclient.a ]; then cp libircclient.a $(DESTDIR)@libdir@; else :; fi -- --libircclient.so: libircclient.o -- $(CC) -shared -s -o libircclient.so libircclient.o @LIBS@ -+ if [ -f libircclient.so.$(MAJOR) ]; then \ -+ cp libircclient.so.$(MAJOR) $(DESTDIR)@libdir@; \ -+ ln -s libircclient.so.$(MAJOR) $(DESTDIR)@libdir@/libircclient.so; \ -+ else \ -+ :; \ -+ fi -+ if [ -f libircclient.a ]; then \ -+ cp libircclient.a $(DESTDIR)@libdir@; \ -+ else \ -+ :; \ -+ fi -+ -+libircclient.so.$(MAJOR): libircclient.o -+ $(CC) -shared -o libircclient.so.$(MAJOR) -Wl,-soname=libircclient.so.$(MAJOR) libircclient.o @LIBS@ -+ ln -s libircclient.so.$(MAJOR) libircclient.so - - libircclient.dll: libircclient.o - $(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@ -@@ -36,7 +47,7 @@ libircclient.a: libircclient.o - $(RANLIB) libircclient.a - - clean: -- rm -f libircclient.a libircclient.o -+ rm -f libircclient.so* libircclient.a libircclient.o - - distclean: clean - -rm -f Makefile diff --git a/libircclient-1.6-install.patch b/libircclient-1.7-install.patch index 73c410c..130663a 100644 --- a/libircclient-1.6-install.patch +++ b/libircclient-1.7-install.patch @@ -1,30 +1,23 @@ -diff -up libircclient-1.6/src/Makefile.in.orig libircclient-1.6/src/Makefile.in ---- libircclient-1.6/src/Makefile.in.orig 2012-04-28 16:32:56.176139347 -0300 -+++ libircclient-1.6/src/Makefile.in 2012-04-28 16:36:10.406147192 -0300 -@@ -14,16 +14,16 @@ static: libircclient.a - shared: libircclient.so +diff -up libircclient-1.7/src/Makefile.in.inst libircclient-1.7/src/Makefile.in +--- libircclient-1.7/src/Makefile.in.inst 2014-01-10 14:50:43.343991872 +0100 ++++ libircclient-1.7/src/Makefile.in 2014-01-10 14:53:09.735435692 +0100 +@@ -16,13 +16,13 @@ shared: libircclient.so shared_mingw: libircclient.dll --install: lib + install: - -mkdir -p $(DESTDIR)@prefix@/include -- -mkdir -p $(DESTDIR)@prefix@/lib ++ -mkdir -p $(DESTDIR)@includedir@ + -mkdir -p $(DESTDIR)@libdir@ - cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h - cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h - cp ../include/libirc_events.h $(DESTDIR)@prefix@/include/libirc_events.h - cp ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h - cp ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h -- cp libircclient.so $(DESTDIR)@prefix@/lib/ -- cp libircclient.a $(DESTDIR)@prefix@/lib/ -+install: @TARGET@ -+ -mkdir -p $(DESTDIR)@includedir@ -+ -mkdir -p $(DESTDIR)@libdir@ + cp ../include/libircclient.h $(DESTDIR)@includedir@/libircclient.h + cp ../include/libirc_errors.h $(DESTDIR)@includedir@/libirc_errors.h -+ cp ../include/libirc_events.h $(DESTDIR)@includedir@/libirc_events.h -+ cp ../include/libirc_options.h $(DESTDIR)@includedir@/libirc_options.h -+ cp ../include/libirc_rfcnumeric.h $(DESTDIR)@includedir@/libirc_rfcnumeric.h -+ if [ -f libircclient.so ]; then cp libircclient.so $(DESTDIR)@libdir@; else :; fi -+ if [ -f libircclient.a ]; then cp libircclient.a $(DESTDIR)@libdir@; else :; fi ++ cp ../include/libirc_events.h $(DESTDIR)@includedir@/libirc_events.h ++ cp ../include/libirc_options.h $(DESTDIR)@includedir@/libirc_options.h ++ cp ../include/libirc_rfcnumeric.h $(DESTDIR)@includedir@/libirc_rfcnumeric.h + cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION) + ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so - libircclient.so: libircclient.o - $(CC) -shared -s -o libircclient.so libircclient.o @LIBS@ diff --git a/libircclient-1.7-rfc.patch b/libircclient-1.7-rfc.patch new file mode 100644 index 0000000..4981c72 --- /dev/null +++ b/libircclient-1.7-rfc.patch @@ -0,0 +1,11 @@ +diff -up libircclient-1.7/include/libircclient.h.rfc libircclient-1.7/include/libircclient.h +--- libircclient-1.7/include/libircclient.h.rfc 2012-02-13 04:11:55.374552000 +0100 ++++ libircclient-1.7/include/libircclient.h 2014-01-10 14:54:01.880594092 +0100 +@@ -133,6 +133,7 @@ typedef void (*irc_dcc_callback_t) (irc_ + #include "libirc_errors.h" + #include "libirc_events.h" + #include "libirc_options.h" ++#include "libirc_rfcnumeric.h" + #undef IN_INCLUDE_LIBIRC_H + + diff --git a/libircclient-1.7-soname.patch b/libircclient-1.7-soname.patch new file mode 100644 index 0000000..b520c89 --- /dev/null +++ b/libircclient-1.7-soname.patch @@ -0,0 +1,21 @@ +diff -up libircclient-1.7/src/Makefile.in.shared libircclient-1.7/src/Makefile.in +--- libircclient-1.7/src/Makefile.in.shared 2014-01-10 14:55:27.440854147 +0100 ++++ libircclient-1.7/src/Makefile.in 2014-01-10 14:58:53.885481145 +0100 +@@ -5,7 +5,7 @@ AR=@AR@ cr + RANLIB=@RANLIB@ + INCLUDES=-I../include + DESTDIR= +-APIVERSION = 1 ++APIVERSION = 0 + + OBJS = libircclient.o + +@@ -37,7 +37,7 @@ libircclient.a: libircclient.o + $(RANLIB) libircclient.a + + clean: +- rm -f libircclient.a libircclient.o ++ rm -f libircclient.so* libircclient.a libircclient.o + + distclean: clean + -rm -f Makefile diff --git a/libircclient.spec b/libircclient.spec index 8427ab6..73a09f9 100644 --- a/libircclient.spec +++ b/libircclient.spec @@ -2,21 +2,22 @@ Name: libircclient Summary: C library to create IRC clients -Version: 1.6 -Release: 6%{?dist} +Version: 1.7 +Release: 1%{?dist} License: LGPLv3+ Group: Development/Libraries URL: http://www.ulduzsoft.com/libircclient/ Source0: http://downloads.sourceforge.net/libircclient/%{name}-%{version}.tar.gz BuildRequires: openssl-devel # Correct install target to use includedir and libdir -Patch0: libircclient-1.6-install.patch +Patch0: libircclient-1.7-install.patch # Add rfc include to main header to avoid build failures of packages using it # example: error: 'LIBIRC_RFC_RPL_ENDOFNAMES' was not declared in this scope -Patch1: libircclient-1.6-rfc.patch -# Create a dynamic library by default. Upstream report about patches: -# https://sourceforge.net/tracker/?func=detail&aid=3522604&group_id=118640&atid=681658 -Patch2: libircclient-1.6-shared.patch +Patch1: libircclient-1.7-rfc.patch +# According to http://upstream-tracker.org/versions/libircclient.html +# no ABI change between 1.6 and 1.7 +# so keep APIVERSION=0 as in our previous build of 1.6 +Patch2: libircclient-1.7-soname.patch %description libircclient is a small but extremely powerful library which implements @@ -35,17 +36,28 @@ This package contains development files for libircclient. %prep %setup -q rm -rvf cocoa -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 -b .inst +%patch1 -p1 -b .rfc +%patch2 -p1 -b .shared %build %configure --enable-shared --enable-openssl --enable-ipv6 make %{?_smp_mflags} +# TODO make documentation and man page + + %install make install DESTDIR=${RPM_BUILD_ROOT} +# this header is not supposed to be installed +# but it is used by pecl/ircclient +install -pm 644 src/params.h ${RPM_BUILD_ROOT}%{_includedir}/libirc_params.h + +# Man page +install -Dpm 644 man/%{name}.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/%{name}.1 + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -55,16 +67,18 @@ make install DESTDIR=${RPM_BUILD_ROOT} %doc Changelog %doc LICENSE %doc THANKS -%{_libdir}/*.so.%{major} +%{_libdir}/%{name}.so.%{major} %files devel %defattr(-,root,root,-) -%doc doc/html/* -%doc doc/rfc1459.txt -%{_libdir}/libircclient.so +%{_libdir}/%{name}.so %{_includedir}/libirc*.h +%{_mandir}/man1/%{name}.* %changelog +* Fri Jan 10 2014 Remi Collet <remi.fedoraproject.org> - 1.7-1 +- update to 1.7, no ABI change + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -74,10 +88,10 @@ make install DESTDIR=${RPM_BUILD_ROOT} * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Fri May 5 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.6-3 +* Sat May 5 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.6-3 - Add Changelog, LICENSE, and THANKS files to main package. -* Fri May 4 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.6-2 +* Fri May 4 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.6-2 - Add patch to create a shared library. - Add documentation to devel package. |