diff --git a/libqt5xdg.changes b/libqt5xdg.changes index 25784d6..9cc9f14 100644 --- a/libqt5xdg.changes +++ b/libqt5xdg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 25 19:07:55 UTC 2015 - sfalken@opensuse.org + +- Added conditionals to build for Fedora (Only needed for F20) + ------------------------------------------------------------------- Tue Oct 28 15:19:02 UTC 2014 - andrea@opensuse.org diff --git a/libqt5xdg.spec b/libqt5xdg.spec index 3b98668..55e09a5 100644 --- a/libqt5xdg.spec +++ b/libqt5xdg.spec @@ -1,7 +1,7 @@ # -# spec file for package libqtxdg +# spec file for package libqt5xdg # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,10 +28,9 @@ BuildRequires: cmake BuildRequires: fdupes BuildRequires: file-devel BuildRequires: gcc-c++ +BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) -#BuildRequires: pkgconfig(Qt5LinguistTools) -BuildRequires: libqt5-linguist-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,8 +48,8 @@ qtxdg libraries for development Summary: Devel files for libqtxdg Group: Development/Libraries/C and C++ Requires: libQt5Xdg1 = %{version} -Requires: libqt5-linguist-devel Requires: pkg-config +Requires: pkgconfig(Qt5UiTools) %description devel qtxdg libraries for development @@ -59,11 +58,19 @@ qtxdg libraries for development %setup -q -n libqtxdg-%{version} %build -%cmake -DUSE_QT5=ON +mkdir build +pushd build +cmake \ + -DUSE_QT5=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + .. %__make %{?_smp_mflags} +popd %install -%cmake_install +pushd build +make DESTDIR=$RPM_BUILD_ROOT install +popd %fdupes -s %{buildroot}/%{_datadir}/locale %post -n libQt5Xdg1 -p /sbin/ldconfig