Accepting request 1148314 from KDE:Qt5
- Switch to %autosetup - Drop obsolete patch: * full_include_dir.patch OBS-URL: https://build.opensuse.org/request/show/1148314 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbusmenu-qt5?expand=0&rev=10
This commit is contained in:
commit
412fbaf442
@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index 980e872..fbcd0b1 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -95,7 +95,7 @@ endif()
|
|
||||||
|
|
||||||
# Make sure linking to the target adds dbusmenu-qt install directory
|
|
||||||
target_include_directories(dbusmenu-${QT_SUFFIX}
|
|
||||||
- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
|
|
||||||
+ INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}>")
|
|
||||||
|
|
||||||
install(TARGETS dbusmenu-${QT_SUFFIX}
|
|
||||||
EXPORT dbusmenu-${QT_SUFFIX}-targets
|
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 20 17:48:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Switch to %autosetup
|
||||||
|
- Drop obsolete patch:
|
||||||
|
* full_include_dir.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 9 06:29:29 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
|
Wed Sep 9 06:29:29 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
@ -30,11 +30,9 @@ Source: https://github.com/unity8-team/%{rname}/archive/%{version}-0ubun
|
|||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
|
# PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
|
||||||
# which are useless, and annoy users, so this patch just disables them in release mode
|
# which are useless, and annoy users, so this patch just disables them in release mode
|
||||||
Patch1: noqDebug-qWarnings.patch
|
Patch0: noqDebug-qWarnings.patch
|
||||||
# PATCH-FIX-UPSTREAM full_include_dir.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy
|
|
||||||
Patch2: full_include_dir.patch
|
|
||||||
#Needed for DISABLE_FIND_PACKAGE
|
#Needed for DISABLE_FIND_PACKAGE
|
||||||
BuildRequires: cmake >= 2.8.6
|
BuildRequires: cmake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -70,11 +68,7 @@ Requires: pkgconfig(Qt5Core)
|
|||||||
This package contains development files for libdbusmenu-qt5.
|
This package contains development files for libdbusmenu-qt5.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{rname}-%{version_}-0ubuntu1
|
%autosetup -p1 -n %{rname}-%{version_}-0ubuntu1
|
||||||
%patch1 -p1
|
|
||||||
%if 0%{?suse_version} <= 1310
|
|
||||||
%patch2 -p1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Remove build time references so build-compare can do its work
|
# Remove build time references so build-compare can do its work
|
||||||
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in
|
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in
|
||||||
@ -105,9 +99,8 @@ install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/libdbusmenu-qt5-deve
|
|||||||
|
|
||||||
%fdupes -s %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
|
%fdupes -s %{buildroot}%{_docdir}/libdbusmenu-qt5-devel/
|
||||||
|
|
||||||
%post -n libdbusmenu-qt5-2 -p /sbin/ldconfig
|
%ldconfig_scriptlets -n libdbusmenu-qt5-2
|
||||||
|
|
||||||
%postun -n libdbusmenu-qt5-2 -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files -n libdbusmenu-qt5-2
|
%files -n libdbusmenu-qt5-2
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
Loading…
Reference in New Issue
Block a user