pcpa pushed to libircclient (epel7). "Update to latest upstream release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 20:06:10 UTC 2015
>From c77ad6dab6beb074865e984a2a609a4838019add Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Sun, 12 Apr 2015 18:41:32 -0300
Subject: Update to latest upstream release
diff --git a/.gitignore b/.gitignore
index 8729d72..c5b06f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/libircclient-1.6.tar.gz
+/libircclient-1.8.tar.gz
diff --git a/libircclient-1.6-install.patch b/libircclient-1.6-install.patch
deleted file mode 100644
index 73c410c..0000000
--- a/libircclient-1.6-install.patch
+++ /dev/null
@@ -1,30 +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-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
- shared_mingw: libircclient.dll
-
--install: lib
-- -mkdir -p $(DESTDIR)@prefix@/include
-- -mkdir -p $(DESTDIR)@prefix@/lib
-- 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
-
- libircclient.so: libircclient.o
- $(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
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-rfc.patch b/libircclient-rfc.patch
new file mode 100644
index 0000000..7d6bca6
--- /dev/null
+++ b/libircclient-rfc.patch
@@ -0,0 +1,11 @@
+diff -up libircclient-1.8/include/libircclient.h.orig libircclient-1.8/include/libircclient.h
+--- libircclient-1.8/include/libircclient.h.orig 2015-04-12 17:45:54.288302460 -0300
++++ libircclient-1.8/include/libircclient.h 2015-04-12 17:46:00.701302706 -0300
+@@ -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.spec b/libircclient.spec
index 6322497..f6d4291 100644
--- a/libircclient.spec
+++ b/libircclient.spec
@@ -1,22 +1,20 @@
-%define major 0
+%define major 1
Name: libircclient
Summary: C library to create IRC clients
-Version: 1.6
-Release: 8%{?dist}
+Version: 1.8
+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: doxygen
BuildRequires: openssl-devel
-# Correct install target to use includedir and libdir
-Patch0: libircclient-1.6-install.patch
+BuildRequires: python-sphinx
+BuildRequires: rst2pdf
# 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
+Patch0: libircclient-rfc.patch
%description
libircclient is a small but extremely powerful library which implements
@@ -36,15 +34,16 @@ This package contains development files for libircclient.
%setup -q
rm -rvf cocoa
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
-%configure --enable-shared --enable-openssl --enable-ipv6
+%configure --enable-shared --enable-threads --enable-openssl --enable-ipv6
make %{?_smp_mflags}
+make -C doc html
%install
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_mandir}/man1
+cp -p man/%{name}.1 %{buildroot}%{_mandir}/man1
%post -p /sbin/ldconfig
@@ -52,19 +51,24 @@ make install DESTDIR=${RPM_BUILD_ROOT}
%files
%defattr(-,root,root,-)
+%license LICENSE
%doc Changelog
-%doc LICENSE
%doc THANKS
%{_libdir}/*.so.%{major}
%files devel
%defattr(-,root,root,-)
-%doc doc/html/*
-%doc doc/rfc1459.txt
+%doc doc/_build/html/*
%{_libdir}/libircclient.so
%{_includedir}/libirc*.h
+%{_mandir}/man1/%{name}.1*
%changelog
+Sun Apr 12 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.8-1
+- Update to latest upstream release
+- Remove patches already in upstream
+- Switch to doxygen an python-sphinx documentation build
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@@ -80,7 +84,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at 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 at gmail.com> - 1.6-3
+* Sat May 5 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.6-3
- Add Changelog, LICENSE, and THANKS files to main package.
* Fri May 4 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.6-2
diff --git a/sources b/sources
index 401fd0a..18b0663 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb6a2c4e91862cc10de3b13b198cfa23 libircclient-1.6.tar.gz
+a1b4fd5491a36b8aedf65a6845755800 libircclient-1.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libircclient.git/commit/?h=epel7&id=c77ad6dab6beb074865e984a2a609a4838019add
More information about the scm-commits
mailing list