heliocastro pushed to libqtxdg (f20). "- New upstream release Qt5 only"

[notifications at fedoraproject.org]

>From 92ff0ae6940ff5579d48619ad2703117a62e36f3 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Mon, 9 Feb 2015 12:10:16 -0200
Subject: - New upstream release Qt5 only


diff --git a/.gitignore b/.gitignore
index 146aa3e..6c9d6ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libqtxdg-0.5.3.tar.xz
 /libqtxdg-1.0.0.tar.xz
+/libqtxdg-1.1.0.tar.xz
diff --git a/libqtxdg.spec b/libqtxdg.spec
index 384e201..bcd85f3 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -1,144 +1,66 @@
-# qt4 bits needed by (at least) lxqt/razorqt
-%bcond_without qt4
-%bcond_without qt5
-
-%if 0%{?rhel} == 6
-%define cmake_pkg cmake28
-%else
-%define cmake_pkg cmake
-%endif
-
 Name:           libqtxdg
-Summary:        Qt4 implementation of desktop specifications
-Version:        1.0.0
+Summary:        Qt5Xdg, a Qt5 implementation of XDG standards
+Version:        1.1.0
 Release:        1%{?dist}
 Group:          Applications/System
 License:        LGPLv2+
 URL:            https://github.com/lxde/libqtxdg
-Source0:        http://lxqt.org/downloads/%{name}/%{version}/%{name}-%{version}.tar.xz
-
-BuildRequires:  %{cmake_pkg} >= 2.8.3
-BuildRequires:  file-devel
-%if %with qt4
-BuildRequires:  pkgconfig(QtCore)
-BuildRequires:  pkgconfig(QtGui)
-BuildRequires:  pkgconfig(QtXml)
-%endif
-%if %with qt5
+Source0:        http://downloads.lxqt.org/%{name}/%{version}/%{name}-%{version}.tar.xz
+
+BuildRequires:  cmake >= 2.8.3
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
-BuildRequires:  qt5-linguist
-%endif
+BuildRequires:  pkgconfig(Qt5Help)
 
-# upgrade path for libqtxdg-qt4 name
-Obsoletes:      libqtxdg-qt4 < 0.5.3-4
-Provides:       libqtxdg-qt4 = %{version}-%{release}
-Provides:       libqtxdg-qt4%{?_isa} = %{version}-%{release}
+Obsoletes:      libqtxdg-qt4 <= 1.1.0
+Obsoletes:      libqtxdg-qt5 <= 1.1.0
 
 %description
-Implementations of freedesktop.org XDG specifications from LXDE project for use 
-with Qt4 library.
+%{summary}.
 
 %package devel
-Summary:        Qt4 - development files for qtxdg
-# upgrade path for libqtxdg-qt4 name
-Obsoletes:      libqtxdg-qt4-devel < 0.5.3-4
-Provides:       libqtxdg-qt4-devel = %{version}-%{release}
-Provides:       libqtxdg-qt4-devel%{?_isa} = %{version}-%{release}
+Summary:        Qt - development files for qtxdg
+Obsoletes:      libqtxdg-qt4-devel <= 1.1.0
+Obsoletes:      libqtxdg-qt5-devel <= 1.1.0
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Files used for developing and building software that uses qtxdg.
 
-%package qt5
-Summary:        Qt5 implementation of desktop specifications
-%description qt5
-Implementations of freedesktop.org XDG specifications from LXDE project for use 
-with Qt5 library.
-
-%package qt5-devel
-Summary:        Development files for Qt5Xdg
-Requires:       %{name}-qt5%{?_isa} = %{version}-%{release}
-%description qt5-devel
-Files used for developing and building software that uses Qt5Xdg.
-
-
 %prep
-%setup -q -n libqtxdg
-
+%setup -q 
 
 %build
-%if %with qt4
-mkdir build-qt4
-cd build-qt4
-%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QTMIMETYPES:BOOL=OFF ..
-make %{?_smp_mflags}
-cd ..
-%endif
-
-%if %with qt5
-mkdir build-qt5
-cd build-qt5
-%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5:BOOL=ON ..
-make %{?_smp_mflags}
-cd ..
-%endif
-
-
-%install
-%if %with qt4
-make -C build-qt4 install DESTDIR=%{buildroot}
-%endif
-
-%if %with qt5
-make -C build-qt5 install DESTDIR=%{buildroot}
-%endif
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+	%cmake ..
+popd
 
-%find_lang libqtxdg --with-qt
+make %{?_smp_mflags} -C %{_target_platform}
 
-mv libqtxdg.lang libqtxdg-all.lang
-grep "%{_datadir}/libqtxdg/"  libqtxdg-all.lang > libqtxdg.lang
-%if %with qt5
-grep "%{_datadir}/libqt5xdg/" libqtxdg-all.lang > libqtxdg-qt5.lang
-%endif
 
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if %with qt4
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f libqtxdg.lang
-%{_libdir}/libqtxdg.so.1*
-%dir %{_datadir}/libqtxdg/
+%files 
 %doc COPYING AUTHORS
-
-%files devel
-%{_libdir}/libqtxdg.so
-%{_libdir}/pkgconfig/qtxdg.pc
-%{_includedir}/qtxdg/
-%dir %{_datadir}/cmake/
-%{_datadir}/cmake/qtxdg/
-%endif
-
-%if %with qt5
-%post qt5 -p /sbin/ldconfig
-%postun qt5 -p /sbin/ldconfig
-
-%files qt5 -f libqtxdg-qt5.lang
 %{_libdir}/libQt5Xdg.so.1*
-%dir %{_datadir}/libqt5xdg/
-%doc COPYING AUTHORS
 
-%files qt5-devel
+%files devel
 %{_libdir}/libQt5Xdg.so
 %{_libdir}/pkgconfig/Qt5Xdg.pc
 %{_includedir}/qt5xdg/
-%dir %{_datadir}/cmake/
-%{_datadir}/cmake/qt5xdg/
-%endif
-
+%dir %{_datadir}/cmake/qt5xdg
+%{_datadir}/cmake/qt5xdg/*
 
 %changelog
+* Mon Feb 09 2015 Helio Chissini de Castro <helio at kde.org> - 1.1.0-1
+- New upstream version 1.1.0
+- Only Qt5 now
+
 * Thu Oct 16 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
 - libqtxdg-1.0.0, soname bump (#1147204)
 
diff --git a/sources b/sources
index 2ea5c51..e482e28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-394b6cedec6d580d387a73842343f53e  libqtxdg-1.0.0.tar.xz
+17f43c91a72b44804dd519246be6e03a  libqtxdg-1.1.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libqtxdg.git/commit/?h=f20&id=92ff0ae6940ff5579d48619ad2703117a62e36f3