From e8c15b5bfc5fd091e623d1dfc582a78065ab4630 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 20 2014 13:15:23 +0000 Subject: import --- diff --git a/.gitignore b/.gitignore index e69de29..fcbb6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/lxqt-common-0.8.0.tar.xz diff --git a/lxqt-common-0.8.0-datadir.patch b/lxqt-common-0.8.0-datadir.patch new file mode 100644 index 0000000..e061ca7 --- /dev/null +++ b/lxqt-common-0.8.0-datadir.patch @@ -0,0 +1,24 @@ +diff -r -u lxqt-common-0.8.0.orig/CMakeLists.txt lxqt-common-0.8.0/CMakeLists.txt +--- lxqt-common-0.8.0.orig/CMakeLists.txt 2014-08-23 06:12:54.000000000 -0300 ++++ lxqt-common-0.8.0/CMakeLists.txt 2014-10-27 20:31:36.016173283 -0200 +@@ -15,7 +15,7 @@ + include(${LXQT_USE_FILE}) + + # graphics +-install(DIRECTORY graphics DESTINATION share/lxqt/) ++install(DIRECTORY graphics DESTINATION ${LXQT_SHARE_DIR}/) + + # startlxqt script + configure_file(startlxqt.in startlxqt @ONLY) +diff -r -u lxqt-common-0.8.0.orig/themes/CMakeLists.txt lxqt-common-0.8.0/themes/CMakeLists.txt +--- lxqt-common-0.8.0.orig/themes/CMakeLists.txt 2014-08-23 06:12:54.000000000 -0300 ++++ lxqt-common-0.8.0/themes/CMakeLists.txt 2014-10-27 20:31:23.881160633 -0200 +@@ -1,3 +1,7 @@ +-install(DIRECTORY . DESTINATION share/lxqt/themes PATTERN "CMake*" EXCLUDE PATTERN "cmake*" EXCLUDE PATTERN "Makefile" EXCLUDE) ++install( DIRECTORY . ++ DESTINATION ${LXQT_SHARE_DIR}/themes ++ PATTERN "CMake*" EXCLUDE ++ PATTERN "cmake*" EXCLUDE ++ PATTERN "Makefile" EXCLUDE) + + diff --git a/lxqt-common-0.8.0-desktop-launch.patch b/lxqt-common-0.8.0-desktop-launch.patch new file mode 100644 index 0000000..bf46c6e --- /dev/null +++ b/lxqt-common-0.8.0-desktop-launch.patch @@ -0,0 +1,13 @@ +--- lxqt-common-0.8.0.orig/xsession/lxqt.desktop.in 2014-08-23 06:12:54.000000000 -0300 ++++ lxqt-common-0.8.0/xsession/lxqt.desktop.in 2014-10-28 09:20:45.608298476 -0200 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application +-Exec=startlxqt ++Exec=/usr/bin/startlxqt ++TryExec=/usr/bin/startlxqt + Name=LXQt Desktop + Comment=Lightweight Qt Desktop +- +-#TRANSLATIONS_DIR=translations ++Icon=lxqt diff --git a/lxqt-common-xdg_data_dir.patch b/lxqt-common-xdg_data_dir.patch new file mode 100644 index 0000000..b9307df --- /dev/null +++ b/lxqt-common-xdg_data_dir.patch @@ -0,0 +1,33 @@ +From c2b1bc7515c00a1bc799e4df136ad0c3617117ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= +Date: Tue, 15 Jul 2014 16:34:01 -0700 +Subject: [PATCH] Defines XDG_DATA_HOME and XDG_DATA_DIRS environment variables + +Implements part of XDG Base Directory Specification: +http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +--- + startlxqt.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/startlxqt.in b/startlxqt.in +index babc330..5ae26fe 100755 +--- a/startlxqt.in ++++ b/startlxqt.in +@@ -1,9 +1,17 @@ + #!/bin/sh + ++if [ -z "$XDG_DATA_HOME" ]; then ++ export XDG_DATA_HOME="$HOME/.local/share" ++fi ++ + if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" + fi + ++if [ -z "$XDG_DATA_DIRS" ]; then ++ export XDG_DATA_DIRS="$XDG_DATA_HOME:/usr/local/share/:/usr/share/" ++fi ++ + # Ensure the existance of the 'Desktop' folder + if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then + . "$XDG_CONFIG_HOME/user-dirs.dirs" diff --git a/lxqt-common.spec b/lxqt-common.spec new file mode 100644 index 0000000..84a2e7e --- /dev/null +++ b/lxqt-common.spec @@ -0,0 +1,87 @@ +%if 0%{?rhel} == 6 +%define cmake_pkg cmake28 +%else +%define cmake_pkg cmake +%endif + +Name: lxqt-common +Summary: Common resources for LXQt desktop suite +Version: 0.8.0 +Release: 6%{?dist} +License: LGPLv2+ +URL: http://lxqt.org/ +Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz +Patch0: lxqt-common-0.8.0-datadir.patch +Patch1: lxqt-common-0.8.0-desktop-launch.patch +# From https://github.com/lxde/lxqt-common/pull/7.patch +Patch2: lxqt-common-xdg_data_dir.patch +BuildArch: noarch + +Requires: oxygen-icon-theme + +BuildRequires: %{cmake_pkg} >= 2.8.9 +BuildRequires: pkgconfig(Qt5Xdg) +BuildRequires: pkgconfig(Qt5Help) +BuildRequires: pkgconfig(lxqt-qt5) +BuildRequires: desktop-file-utils + +%description +%{summary}. + +%prep +%setup -q + +%patch0 -p1 -b .qt5-path +%patch1 -p1 -b .desktop-launch +%patch2 -p1 -b .xdg-data + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=ON .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +desktop-file-validate %{buildroot}/%{_datadir}/xsessions/lxqt.desktop + +for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do + desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop} +done + +%files +%{_bindir}/startlxqt +%dir %{_sysconfdir}/xdg/lxqt +%config(noreplace) %{_sysconfdir}/xdg/autostart/lxqt-* +%config(noreplace) %{_sysconfdir}/xdg/lxqt/* +%{_datadir}/xsessions/lxqt.desktop +%dir %{_sysconfdir}/xdg/pcmanfm-qt +%config(noreplace) %{_sysconfdir}/xdg/pcmanfm-qt/lxqt/settings.conf +%{_datadir}/lxqt-qt5/themes +%{_datadir}/lxqt-qt5/graphics +%{_datadir}/lxqt-qt5/openbox +%exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop + +%changelog +* Mon Nov 10 2014 Helio Chissini de Castro - 0.8.0-6 +- For some reason Xdg went away on buildreqs. + +* Mon Nov 10 2014 Helio Chissini de Castro - 0.8.0-5 +- Validate desktop files adding X- since is not a valif group on freedesktop yet +- Owns xdg/lxqt directory + +* Mon Nov 10 2014 Helio Chissini de Castro - 0.8.0-4 +- Fix review issues on https://bugzilla.redhat.com/show_bug.cgi?id=1158632 +- Moved fedora theme package away as agreed nee to be in a separate package + +* Thu Oct 30 2014 Helio Chissini de Castro - 0.8.0-3 +- Borrowed an upstream patch for XDG. Thanks to Florian Hubbold from Mageia + +* Wed Oct 29 2014 Helio Chissini de Castro - 0.8.0-2 +- Small modification to submit package for review + +* Mon Oct 27 2014 Helio Chissini de Castro - 0.8.0-1 +- First release to LxQt new base diff --git a/sources b/sources index e69de29..3026d09 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b48d6df01f23d56115448076ae875680 lxqt-common-0.8.0.tar.xz