[packages/miniupnpc] - updated to 2.2.8 (new soname); use just upstream library versioning
qboosh
qboosh at pld-linux.org
Sun Sep 22 11:27:52 CEST 2024
commit 26f15c4992f4741c8561dc55e0546b930ab57332
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 22 11:30:44 2024 +0200
- updated to 2.2.8 (new soname); use just upstream library versioning
miniupnpc-make.patch | 31 -------------------------------
miniupnpc.spec | 14 ++++----------
2 files changed, 4 insertions(+), 41 deletions(-)
---
diff --git a/miniupnpc.spec b/miniupnpc.spec
index 274cb46..4b04e49 100644
--- a/miniupnpc.spec
+++ b/miniupnpc.spec
@@ -6,13 +6,12 @@
Summary: MiniUPnP client and a library
Summary(pl.UTF-8): Program i biblioteka kliencka MiniUPnP
Name: miniupnpc
-Version: 2.2.3
+Version: 2.2.8
Release: 1
License: BSD
Group: Libraries
Source0: http://miniupnp.tuxfamily.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 4a037c6f22861d58e037fcb0bdc5922e
-Patch0: %{name}-make.patch
+# Source0-md5: e0ef02aecfa0de558c6f4579b6c5205c
URL: http://miniupnp.tuxfamily.org/
%if %{with python2}
BuildRequires: python-devel >= 1:2.5
@@ -85,7 +84,6 @@ Wiązanie Pythona 3 do biblioteki miniupnpc.
%prep
%setup -q
-%patch0 -p1
%build
# there is also cmake support, but also not up to date (see cmake patch in Fedora)'
@@ -111,10 +109,6 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
LIBDIR=%{_lib}
-# let SONAME be the symlink
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/libminiupnpc.so.{17,17.0.0}
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-
%if %{with python2}
%py_install
%endif
@@ -133,9 +127,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc Changelog.txt LICENSE README apiversions.txt
%attr(755,root,root) %{_bindir}/external-ip
+%attr(755,root,root) %{_bindir}/upnp-listdevices
%attr(755,root,root) %{_bindir}/upnpc
-%attr(755,root,root) %{_libdir}/libminiupnpc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libminiupnpc.so.17
+%attr(755,root,root) %{_libdir}/libminiupnpc.so.18
%files devel
%defattr(644,root,root,755)
diff --git a/miniupnpc-make.patch b/miniupnpc-make.patch
deleted file mode 100644
index 9e7875a..0000000
--- a/miniupnpc-make.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- miniupnpc-2.2.3/Makefile.orig 2021-09-28 23:11:31.000000000 +0200
-+++ miniupnpc-2.2.3/Makefile 2022-07-10 11:34:53.380100847 +0200
-@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfi
-
- FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
- ifeq (, $(findstring amiga, $(OS)))
--FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
-+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
- endif
-
-
-@@ -251,15 +251,15 @@ ifeq (, $(findstring amiga, $(OS)))
- $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
- ifeq (, $(findstring amiga, $(OS)))
- $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
-- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
-+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
- $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
-- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
-+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
- endif
- $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
- ifneq (, $(findstring amiga, $(OS)))
-- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
-+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
- else
-- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
-+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
- endif
- $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
- ifeq (, $(findstring amiga, $(OS)))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/miniupnpc.git/commitdiff/26f15c4992f4741c8561dc55e0546b930ab57332
More information about the pld-cvs-commit
mailing list