[libqtxdg] 0.5.3-4

[Rex Dieter]

commit 303d214d67a88f4f89e55008601fbed00f1f3970
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 2 11:17:54 2014 -0500

    0.5.3-4
    
    - Provide qt4 support (#1147204)
    - rename libqtxdg-qt4 -> libqtxdg, libqtxdg-qt4-devel -> libqtxdg to ease/simplify upgrade path
    - use %find_lang for translations
    - -devel: drop cmake dep

 .gitignore    |    1 -
 libqtxdg.spec |   93 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 48 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1e17d8..bce8140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/libqtxdg.tar.gz
 /libqtxdg-0.5.3.tar.xz
diff --git a/libqtxdg.spec b/libqtxdg.spec
index df2a1c9..ada4ed7 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -1,13 +1,11 @@
-# Disabled, so that it does not conflict with Razor-Qt, which includes
-# an older "pre-merge" version of this.
-# See https://github.com/Razor-qt/razor-qt/wiki/Merge-LXDE-and-Razor-qt
-%bcond_with qt4
+# qt4 bits needed by (at least) lxqt/razorqt
+%bcond_without qt4
 %bcond_without qt5
 
 Name:           libqtxdg
-Summary:        Qt implementation of desktop specifications
+Summary:        Qt4 implementation of desktop specifications
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          Applications/System
 License:        LGPLv2+
 URL:            https://github.com/lxde/libqtxdg
@@ -26,43 +24,35 @@ BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  qt5-linguist
 %endif
 
-%description
-Implementations of freedesktop.org XDG specifications from LXDE project for use 
-with Qt library.
-
+# upgrade path for libqtxdg-qt4 name
+Obsoletes:      libqtxdg-qt4 < 0.5.3-4
+Provides:       libqtxdg-qt4 = %{version}-%{release}
+Provides:       libqtxdg-qt4%{?_isa} = %{version}-%{release}
 
-%package qt4
-Summary:        Qt4 - implementation of desktop specifications
-
-%description qt4
+%description
 Implementations of freedesktop.org XDG specifications from LXDE project for use 
 with Qt4 library.
 
-
-%package qt4-devel
+%package devel
 Summary:        Qt4 - development files for qtxdg
-Requires:       cmake
-Requires:       pkgconfig
-Requires:       %{name}-qt4%{?_isa} = %{version}-%{release}
+# 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}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description qt4-devel
+%description devel
 Files used for developing and building software that uses qtxdg.
 
-
 %package qt5
-Summary:        Qt5 - implementation of desktop specifications
-
+Summary:        Qt5 implementation of desktop specifications
 %description qt5
 Implementations of freedesktop.org XDG specifications from LXDE project for use 
-with Qt4 library.
-
+with Qt5 library.
 
 %package qt5-devel
-Summary:        Qt5 - development files for Qt5Xdg
-Requires:       cmake
-Requires:       pkgconfig
+Summary:        Development files for Qt5Xdg
 Requires:       %{name}-qt5%{?_isa} = %{version}-%{release}
-
 %description qt5-devel
 Files used for developing and building software that uses Qt5Xdg.
 
@@ -98,42 +88,55 @@ make -C build-qt4 install DESTDIR=%{buildroot}
 make -C build-qt5 install DESTDIR=%{buildroot}
 %endif
 
+%find_lang libqtxdg --with-qt
 
-%post qt4 -p /sbin/ldconfig
-%postun qt4 -p /sbin/ldconfig
-%post qt5 -p /sbin/ldconfig
-%postun qt5 -p /sbin/ldconfig
+mv libqtxdg.lang libqtxdg-all.lang
+grep "%{_datadir}/libqtxdg/"  libqtxdg-all.lang > libqtxdg.lang
+grep "%{_datadir}/libqt5xdg/" libqtxdg-all.lang > libqtxdg-qt5.lang
 
 
 %if %with qt4
-%files qt4
-%{_libdir}/libqtxdg.so.*
-%{_datadir}/libqtxdg
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f libqtxdg.lang
+%{_libdir}/libqtxdg.so.0*
+%dir %{_datadir}/libqtxdg/
 %doc COPYING AUTHORS
 
-%files qt4-devel
+%files devel
 %{_libdir}/libqtxdg.so
 %{_libdir}/pkgconfig/qtxdg.pc
-%{_includedir}/qtxdg
-%{_datadir}/cmake/qtxdg
+%{_includedir}/qtxdg/
+%dir %{_datadir}/cmake/
+%{_datadir}/cmake/qtxdg/
 %endif
 
-
 %if %with qt5
-%files qt5
-%{_libdir}/libQt5Xdg.so.*
-%{_datadir}/libqt5xdg
+%post qt5 -p /sbin/ldconfig
+%postun qt5 -p /sbin/ldconfig
+
+%files qt5 -f libqtxdg-qt5.lang
+%{_libdir}/libQt5Xdg.so.0*
+%dir %{_datadir}/libqt5xdg/
 %doc COPYING AUTHORS
 
 %files qt5-devel
 %{_libdir}/libQt5Xdg.so
 %{_libdir}/pkgconfig/Qt5Xdg.pc
-%{_includedir}/qt5xdg
-%{_datadir}/cmake/qt5xdg
+%{_includedir}/qt5xdg/
+%dir %{_datadir}/cmake/
+%{_datadir}/cmake/qt5xdg/
 %endif
 
 
 %changelog
+* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-4
+- Provide qt4 support (#1147204)
+- rename libqtxdg-qt4 -> libqtxdg, libqtxdg-qt4-devel -> libqtxdg to ease/simplify upgrade path
+- use %%find_lang for translations
+- -devel: drop cmake dep
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild