[liblxqt/f21] - Updated with new upstream release 0.9.0

Helio Chissini de Castro heliocastro at fedoraproject.org
Sun Feb 8 12:36:39 UTC 2015


commit 2424c47d887de050c2a42b04f931bf304defcfe4
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Sun Feb 8 10:36:00 2015 -0200

    - Updated with new upstream release 0.9.0

 .gitignore                       |    1 +
 liblxqt-0.8.0-cmake_libdir.patch |   36 ------------------------------------
 liblxqt.spec                     |   34 +++++++++++++++-------------------
 sources                          |    2 +-
 4 files changed, 17 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 078ccb9..7f74137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /liblxqt-0.8.0.tar.xz
+/liblxqt-0.9.0.tar.xz
diff --git a/liblxqt.spec b/liblxqt.spec
index 64ec0ee..6bf0c2a 100644
--- a/liblxqt.spec
+++ b/liblxqt.spec
@@ -1,18 +1,12 @@
-%if 0%{?rhel} == 6
-%define cmake_pkg cmake28
-%else
-%define cmake_pkg cmake
-%endif
-
 Name:		liblxqt
-Version:	0.8.0
-Release:	10%{?dist}
+Version:	0.9.0
+Release:	1%{?dist}
 License:	LGPLv2
 Summary:	Core shared library for LXQt desktop suite
 Url:		http://www.lxde.org
 Source0:	http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
 
-BuildRequires:  %{cmake_pkg} >= 2.8.9
+BuildRequires: cmake >= 2.8.9
 BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Widgets)
@@ -21,9 +15,7 @@ BuildRequires: pkgconfig(Qt5Xml)
 BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
 BuildRequires: pkgconfig(Qt5Help)
-
-# upstreamable, move .cmake files to libdir (avoids multilib conflicts)
-Patch0: liblxqt-0.8.0-cmake_libdir.patch
+BuildRequires: kf5-kwindowsystem-devel >= 5.5
 
 Requires: xdg-utils >= 1.1.0
 
@@ -40,21 +32,19 @@ LXQt libraries for development.
 %prep
 %setup
 
-%patch0 -p1 -b .cmake_libdir
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=ON ..
+	%cmake ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%if 0%{?rhel} == 6
-rm -f %{buildroot}/%{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr at latin.qm
-%endif
+#%if 0%{?rhel} == 6
+#rm -f %{buildroot}/%{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr at latin.qm
+#%endif
 
 %find_lang %{name} --with-qt --without-mo
 
@@ -71,10 +61,16 @@ rm -f %{buildroot}/%{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr at latin.qm
 %files devel
 %{_libdir}/liblxqt.so
 %{_includedir}/lxqt/
-%{_libdir}/cmake/lxqt/
+%{_datadir}/cmake/lxqt/
 %{_libdir}/pkgconfig/lxqt.pc
 
 %changelog
+* Sun Feb 08 2015 Helio Chissini de Castro <hcastro at redhat.com> - 0.9.0-1
+- Official new upstream release
+
+* Mon Feb 02 2015 Helio Chissini de Castro <hcastro at redhat.com> - 0.9.0-0.1
+- Prepare for 0.9.0
+
 * Mon Dec 29 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-10
 - Rebuild against new Qt 5.4.0
 
diff --git a/sources b/sources
index 5eeff71..e399e06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7159035b93fc585b173f41c96b44a523  liblxqt-0.8.0.tar.xz
+b027c6114d543e24a35846d37d374009  liblxqt-0.9.0.tar.xz


More information about the scm-commits mailing list