[packages/rudiments] - updated to 1.3.0 (new soname) - added pc patch

[qboosh]

commit 36949989bceca3a6a8c22c905f14ec26e6b36f01
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 5 20:06:21 2020 +0200

    - updated to 1.3.0 (new soname)
    - added pc patch

 rudiments-pc.patch | 11 +++++++++++
 rudiments.spec     | 40 ++++++++++++++++++++++++++++++++++------
 2 files changed, 45 insertions(+), 6 deletions(-)
---
diff --git a/rudiments.spec b/rudiments.spec
index 85d7235..79a4e75 100644
--- a/rudiments.spec
+++ b/rudiments.spec
@@ -1,17 +1,31 @@
+#
+# Conditional build:
+%bcond_with	apache	# Apache 2 support (too messy for now, adds flags to librudiments)
+
 Summary:	C++ class library for daemons, clients and servers
 Summary(pl.UTF-8):	Biblioteka klas C++ dla demonów, klientów i serwerów
 Name:		rudiments
-Version:	1.1.0
-Release:	6
+Version:	1.3.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/rudiments/%{name}-%{version}.tar.gz
-# Source0-md5:	0666bb3c3335551d10cdbe0dd6b61ce7
+# Source0-md5:	06e5e81901f8bd6d2a9f0b2b1a4f9993
+Patch0:		%{name}-pc.patch
 URL:		http://rudiments.sourceforge.net/
 BuildRequires:	automake
+BuildRequires:	curl-devel >= 7.15.2
+BuildRequires:	heimdal-devel
+BuildRequires:	libedit-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
+%if %{with apache}
+BuildRequires:	apache-devel >= 2
+BuildRequires:	apr-devel
+BuildRequires:	apr-util-devel
+%endif
+Requires:	curl-libs >= 7.15.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,6 +45,9 @@ Summary:	Header files for rudiments library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki rudiments
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	curl-devel >= 7.15.2
+Requires:	heimdal-devel
+Requires:	libedit-devel
 Requires:	libstdc++-devel
 Requires:	openssl-devel
 Requires:	pcre-devel
@@ -66,10 +83,12 @@ Dokumentacja dla biblioteki rudiments.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
-%configure
+%configure \
+	%{!?with_apache:--disable-apache2}
 %{__make}
 
 %install
@@ -78,6 +97,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/rudiments.conf <<EOF
+d /var/run/rudiments 1777 root root -
+EOF
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librudiments.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,13 +115,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
 %attr(755,root,root) %{_libdir}/librudiments.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librudiments.so.5
+%attr(755,root,root) %ghost %{_libdir}/librudiments.so.7
+%attr(1777,root,root) %dir /var/run/rudiments
+%{systemdtmpfilesdir}/rudiments.conf
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rudiments-config
 %attr(755,root,root) %{_libdir}/librudiments.so
-%{_libdir}/librudiments.la
 %{_includedir}/rudiments
 %{_pkgconfigdir}/rudiments.pc
 %{_mandir}/man1/rudiments-config.1*
diff --git a/rudiments-pc.patch b/rudiments-pc.patch
new file mode 100644
index 0000000..965b9d2
--- /dev/null
+++ b/rudiments-pc.patch
@@ -0,0 +1,11 @@
+--- rudiments-1.3.0/rudiments.pc.in.orig	2020-08-26 06:29:49.000000000 +0200
++++ rudiments-1.3.0/rudiments.pc.in	2020-09-05 19:16:13.037367142 +0200
+@@ -8,6 +8,6 @@
+ Description: A C++ foundation class library.
+ Version: @RUDIMENTS_VERSION@
+ Requires:
+-Libs: -L at libdir@ -lrudiments @SOCKETLIBS@ @PTHREADLIB@ @LIBEDITLIBS@ @SSLLIBS@ @GSSLIBS@ @PCRELIBS@ @LIBCURLLIBS@ @NANOSLEEPLIB@ @CLOCKNANOSLEEPLIB@ @CRYPTLIB@ @INETATONLIB@ @NETAPI32LIB@ @BELIB@ @GNULIB@ @CRTLIB@ @DLLIB@ @GETPGIDLIB@ 
+-Cflags: -I at includedir@/rudiments @PTHREADINCLUDES@ @LIBEDITINCLUDES@ @SSLINCLUDES@ @GSSINCLUDES@ @PCREINCLUDES@ @LIBCURLINCLUDES@ @APACHEINCLUDES@
++Libs: -L${libdir} -lrudiments @SOCKETLIBS@ @PTHREADLIB@ @LIBEDITLIBS@ @SSLLIBS@ @GSSLIBS@ @PCRELIBS@ @LIBCURLLIBS@ @NANOSLEEPLIB@ @CLOCKNANOSLEEPLIB@ @CRYPTLIB@ @INETATONLIB@ @NETAPI32LIB@ @BELIB@ @GNULIB@ @CRTLIB@ @DLLIB@ @GETPGIDLIB@ 
++Cflags: -I${includedir}/rudiments @PTHREADINCLUDES@ @LIBEDITINCLUDES@ @SSLINCLUDES@ @GSSINCLUDES@ @PCREINCLUDES@ @LIBCURLINCLUDES@ @APACHEINCLUDES@
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rudiments.git/commitdiff/36949989bceca3a6a8c22c905f14ec26e6b36f01