[packages/libircclient] - up to 1.10

Sat Oct 16 23:43:42 CEST 2021

commit 09ad87b560c498b82ecc2c0ea378870e74f8febf
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 16 23:43:12 2021 +0200

    - up to 1.10

 install.patch                  |  2 +-
 libircclient-openssl-1.1.patch | 11 -----------
 libircclient.spec              | 13 ++++---------
 soname.patch                   | 14 +++++++-------
 4 files changed, 12 insertions(+), 28 deletions(-)
---

diff --git a/libircclient.spec b/libircclient.spec
index 6ccfeb4..28a8a7f 100644
--- a/libircclient.spec
+++ b/libircclient.spec
@@ -1,15 +1,14 @@
 Summary:	Small but extremely powerful library which implements the IRC protocol
 Name:		libircclient
-Version:	1.6
-Release:	6
+Version:	1.10
+Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/libircclient/%{name}-%{version}.tar.gz
-# Source0-md5:	eb6a2c4e91862cc10de3b13b198cfa23
+# Source0-md5:	7dec70a16abbaf5147d21729b325b180
 Patch0:		opt.patch
 Patch1:		soname.patch
 Patch2:		install.patch
-Patch3:		%{name}-openssl-1.1.patch
 URL:		http://www.ulduzsoft.com/libircclient/
 BuildRequires:	openssl-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,10 +49,10 @@ Statyczna biblioteka %{name}.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__autoconf}
+cp /usr/share/automake/config.* .
 %configure \
 	--enable-shared \
 	--enable-threads \
@@ -70,8 +69,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man3
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,10 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html doc/rfc1459.txt
 %attr(755,root,root) %{_libdir}/%{name}.so
 %{_includedir}/%{name}
-%{_mandir}/man3/*.3*
 
 %files static
 %defattr(644,root,root,755)
diff --git a/install.patch b/install.patch
index 2aa1fdd..5d1b42b 100644
--- a/install.patch
+++ b/install.patch
@@ -11,7 +11,7 @@
  shared: $(SOLIB)
  shared_mingw: libircclient.dll
  
--install: lib
+-install:
 +install: all
  	-mkdir -p $(DESTDIR)@includedir@/libircclient
  	-mkdir -p $(DESTDIR)@libdir@
diff --git a/libircclient-openssl-1.1.patch b/libircclient-openssl-1.1.patch
deleted file mode 100644
index 6f8c347..0000000
--- a/libircclient-openssl-1.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libircclient-1.6/configure.in~	2018-09-25 00:24:26.957726909 +0200
-+++ libircclient-1.6/configure.in	2018-09-25 00:30:27.513160280 +0200
-@@ -101,7 +101,7 @@
- 
- if test "$use_openssl" = "yes"; then
- 	AC_CHECK_LIB(crypto, [CRYPTO_new_ex_data], [], [AC_MSG_ERROR([OpenSSL not found])])
--	AC_CHECK_LIB(ssl,    [SSL_library_init], [], [AC_MSG_ERROR([OpenSSL not found])])
-+	AC_CHECK_LIB(ssl,    [SSL_CTX_new], [], [AC_MSG_ERROR([OpenSSL not found])])
- 	AC_CHECK_HEADER([openssl/ssl.h], [], [AC_MSG_ERROR([OpenSSL headers not found; did you install the -dev package?])])
- 	CFLAGS="$CFLAGS -DENABLE_SSL"
- fi
diff --git a/soname.patch b/soname.patch
index f58b3c8..32f0723 100644
--- a/soname.patch
+++ b/soname.patch
@@ -2,8 +2,8 @@ diff -ur libircclient-1.6/src/Makefile.in libircclient-1.6.soname/src/Makefile.i
 --- libircclient-1.6/src/Makefile.in	2012-01-22 23:13:17.000000000 +0100
 +++ libircclient-1.6.soname/src/Makefile.in	2012-07-12 21:53:47.000000000 +0200
 @@ -6,27 +6,34 @@
- INCLUDES=-I../include
  DESTDIR=
+ APIVERSION = 1
  
 +VERSION_MAJOR=$(shell sed -n 's/^\#define\s\+LIBIRC_VERSION_HIGH\s\+\([0-9]\+\)/\1/p' params.h)
 +VERSION_MINOR=$(shell sed -n 's/^\#define\s\+LIBIRC_VERSION_LOW\s\+\([0-9]\+\)/\1/p' params.h)
@@ -19,16 +19,16 @@ diff -ur libircclient-1.6/src/Makefile.in libircclient-1.6.soname/src/Makefile.i
 +shared: $(SOLIB)
  shared_mingw: libircclient.dll
  
- install: lib
+ install:
 -	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@prefix@/lib
+-	-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/
+-	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+-	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
 +	-mkdir -p $(DESTDIR)@includedir@/libircclient
 +	-mkdir -p $(DESTDIR)@libdir@
 +	cp ../include/libircclient.h $(DESTDIR)@includedir@/libircclient/libircclient.h
@@ -40,9 +40,9 @@ diff -ur libircclient-1.6/src/Makefile.in libircclient-1.6.soname/src/Makefile.i
 +	cp -a libircclient.a $(DESTDIR)@libdir@
  
 -libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
+-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
 +$(SOLIB): libircclient.o
-+	$(CC) -shared -Wl,-soname,$(SONAME) $(LDFLAGS) -s -o $(SOLIB) libircclient.o @LIBS@
++	$(CC) -shared -Wl,-soname,$(SONAME) $(LDFLAGS) -o $(SOLIB) libircclient.o @LIBS@
 +	ln -s $(SOLIB) libircclient.so
 +	/sbin/ldconfig -n .
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libircclient.git/commitdiff/09ad87b560c498b82ecc2c0ea378870e74f8febf

