From 6547f3ff8b9f396b822685b510fc1d5b0df41374 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 29 Aug 2024 12:45:07 +0200 Subject: [PATCH] install headers at %_includedir/mygpo-qt5 [release 1.1.0-3mamba;Wed Aug 28 2024] --- libmygpo-qt-1.0.8-pkgconfig.patch | 8 -------- libmygpo-qt.spec | 26 ++++++++++++-------------- 2 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 libmygpo-qt-1.0.8-pkgconfig.patch diff --git a/libmygpo-qt-1.0.8-pkgconfig.patch b/libmygpo-qt-1.0.8-pkgconfig.patch deleted file mode 100644 index 9e2bd9d..0000000 --- a/libmygpo-qt-1.0.8-pkgconfig.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- libmygpo-qt.1.0.8/libmygpo-qt.pc.in.orig 2014-05-04 01:28:05.000000000 +0200 -+++ libmygpo-qt.1.0.8/libmygpo-qt.pc.in 2014-08-31 15:33:52.812984229 +0200 -@@ -10,4 +10,4 @@ - Requires: Qt@MYGPO_QT_MAJOR_VERSION@Core Qt@MYGPO_QT_MAJOR_VERSION@Network - @MYGPO_QT4_QJSON_DEP@ - Libs: -L${libdir} -lmygpo-qt@MYGPO_QT_VERSION_SUFFIX@ --Cflags: -I${includedir} -+Cflags: -I${includedir}/mygpo-qt diff --git a/libmygpo-qt.spec b/libmygpo-qt.spec index f3610cd..8a25a64 100644 --- a/libmygpo-qt.spec +++ b/libmygpo-qt.spec @@ -1,24 +1,21 @@ Name: libmygpo-qt Version: 1.1.0 -Release: 2mamba +Release: 3mamba Summary: A library supporting gpodder.net Podcast Directory Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://wiki.gpodder.org/wiki/Libmygpo-qt +URL: https://github.com/gpodder/libmygpo-qt Source: http://stefan.derkits.at/files/libmygpo-qt/libmygpo-qt.%{version}.tar.gz -Patch0: libmygpo-qt-1.0.8-pkgconfig.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libgcc -BuildRequires: libqt5-devel BuildRequires: libstdc++6-devel +BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END -Provides: libmyqpo-qt -Obsoletes: libmyqpo-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: libmyqpo-qt < 1.1.0-2mamba %description A library supporting gpodder.net Podcast Directory. @@ -27,22 +24,20 @@ A library supporting gpodder.net Podcast Directory. Group: Development/Libraries Summary: Static libraries and headers for %{name} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Provides: libmyqpo-qt-devel -Obsoletes: libmyqpo-qt-devel +Obsoletes: libmyqpo-qt-devel < 1.1.0-2mamba %description devel A library supporting gpodder.net Podcast Directory. -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. %debug_package %prep %setup -q -n %{name}.%{version} -#%patch0 -p1 %build %cmake -d build \ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/mygpo-qt + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/mygpo-qt5 %make @@ -63,8 +58,8 @@ This package contains static libraries and header files need for development. %files devel %defattr(-,root,root) -%dir %{_includedir}/mygpo-qt -%{_includedir}/mygpo-qt/*.h +%dir %{_includedir}/mygpo-qt5 +%{_includedir}/mygpo-qt5/*.h %{_libdir}/libmygpo-qt5.so %{_libdir}/pkgconfig/libmygpo-qt5.pc %dir %{_libdir}/cmake/mygpo-qt5 @@ -72,6 +67,9 @@ This package contains static libraries and header files need for development. %doc README %changelog +* Wed Aug 28 2024 Silvan Calarco 1.1.0-3mamba +- install headers at %_includedir/mygpo-qt5 + * Fri Nov 22 2019 Silvan Calarco 1.1.0-2mamba - remove past patch to fix pkgconfig