heliocastro pushed to libqtxdg (f20). "- Renable selective package qt4 tonot break razorqt on support life only in Qt4"

[notifications at fedoraproject.org]

>From 1be0f6aec6f006bd0eb46014610a9c8296c409ae Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Sun, 15 Feb 2015 11:00:21 -0200
Subject: - Renable selective package qt4 tonot break razorqt on support life
 only in Qt4


diff --git a/libqtxdg-1.1.0-qt4-source-typo.patch b/libqtxdg-1.1.0-qt4-source-typo.patch
new file mode 100644
index 0000000..419bdd7
--- /dev/null
+++ b/libqtxdg-1.1.0-qt4-source-typo.patch
@@ -0,0 +1,11 @@
+--- libqtxdg-1.1.0-otig/xdgmime.h	2015-02-07 15:23:22.000000000 -0200
++++ libqtxdg-1.1.0/xdgmime.h	2015-02-15 10:52:04.926369338 -0200
+@@ -39,7 +39,7 @@
+ 
+ /*! @brief The XdgMimeInfo class provides mime information about file.
+  */
+-class QTXDG_DEPRECATED QTXQD_API XdgMimeInfo
++class QTXDG_DEPRECATED QTXDG_API XdgMimeInfo
+ {
+ public:
+     /// Constructs a XdgMimeInfo with the mimeType type.
diff --git a/libqtxdg.spec b/libqtxdg.spec
index a70cfcd..d3cf7fd 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -1,11 +1,12 @@
 Name:           libqtxdg
-Summary:        Qt5Xdg, a Qt5 implementation of XDG standards
+Summary:        QtXdg, a Qt5 implementation of XDG standards
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          Applications/System
 License:        LGPLv2+
 URL:            https://github.com/lxde/libqtxdg
 Source0:        http://downloads.lxqt.org/%{name}/%{version}/%{name}-%{version}.tar.xz
+Patch0:			libqtxdg-1.1.0-qt4-source-typo.patch
 # Upstream
 Patch100:		libqtxdg-1.1.0-qiconfix-loader.patch
 
@@ -13,45 +14,73 @@ BuildRequires:  cmake >= 2.8.3
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5Help)
-
-Obsoletes:      libqtxdg-qt4 <= 1.1.0
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtXml)
+BuildRequires:  file-devel
 Obsoletes:      libqtxdg-qt5 <= 1.1.0
 
 %description
 %{summary}.
 
+%package qt4
+Summary:		QtXdg, a Qt4 implementation of XDG standards
+
+%description qt4
+%{summary}
+
 %package devel
 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 qt4-devel
+Summary:        Qt4 - development files for qtxdg
+Requires:       %{name}-qt4%{?_isa} = %{version}-%{release}
+
+%description qt4-devel
+Files used for developing and building software that uses Qt4 qtxdg.
+
+
 %prep
-%setup -q 
-%patch100 -p1
+%setup -q
+%patch0 -p1 -b .source_typo
+%patch100 -p1 -b .iconfix
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
+mkdir -p %{_target_platform}-qt5
+pushd %{_target_platform}-qt5
 	%cmake ..
 popd
+make %{?_smp_mflags} -C %{_target_platform}-qt5
 
-make %{?_smp_mflags} -C %{_target_platform}
-
+mkdir -p %{_target_platform}-qt4
+pushd %{_target_platform}-qt4
+	%cmake -DUSE_QT4=BOOL:TRUE -DUSE_QTMIMETYPES=OFF ..
+popd
+make %{?_smp_mflags} -C %{_target_platform}-qt4
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt4
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post qt4 -p /sbin/ldconfig
+%postun qt4 -p /sbin/ldconfig
+
 %files 
 %doc COPYING AUTHORS
 %{_libdir}/libQt5Xdg.so.1*
 
+%files qt4
+%doc COPYING AUTHORS
+%{_libdir}/libqtxdg.so.1*
+
 %files devel
 %{_libdir}/libQt5Xdg.so
 %{_libdir}/pkgconfig/Qt5Xdg.pc
@@ -59,7 +88,17 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %dir %{_datadir}/cmake/qt5xdg
 %{_datadir}/cmake/qt5xdg/*
 
+%files qt4-devel
+%{_libdir}/libqtxdg.so
+%{_libdir}/pkgconfig/qtxdg.pc
+%{_includedir}/qtxdg/
+%dir %{_datadir}/cmake/qtxdg
+%{_datadir}/cmake/qtxdg/*
+
 %changelog
+* Thu Feb 12 2015 Helio Chissini de Castro <helio at kde.org> - 1.1.0-3
+- Restore Qt4 due to maintenance of RazorQt
+
 * Wed Feb 11 2015 Helio Chissini de Castro <helio at kde.org> - 1.1.0-2
 - Upstream patch for qiconfix
 
-- 
cgit v0.10.2


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