diff --git a/.gitignore b/.gitignore index a74b422..2c9145f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /lxqt-common-0.9.1.tar.xz /lxqt-theme-fedora.tar.xz /lxqt-common-0.10.0.tar.xz +/lxqt-common-0.11.0.tar.xz diff --git a/lxqt-common-0.10.0-fedora-defaults.patch b/lxqt-common-0.10.0-fedora-defaults.patch deleted file mode 100644 index 169d3a0..0000000 --- a/lxqt-common-0.10.0-fedora-defaults.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up lxqt-common-0.10.0/config/lxqt.conf.fedora_defaults lxqt-common-0.10.0/config/lxqt.conf ---- lxqt-common-0.10.0/config/lxqt.conf.fedora_defaults 2015-10-08 11:38:12.000000000 -0500 -+++ lxqt-common-0.10.0/config/lxqt.conf 2016-04-28 11:23:04.348893500 -0500 -@@ -1,11 +1,15 @@ - [General] --theme=frost -+theme=Fedora - icon_theme=oxygen - single_click_activate=false - tool_button_style=ToolButtonTextBesideIcon - - [Qt] --font="Sans,11,-1,5,50,0,0,0,0,0" -+fixedFont="Monospace,10,-1,5,50,0,0,0,0,0" -+font="Sans,10,-1,5,50,0,0,0,0,0" - doubleClickInterval=400 --style=Fusion -+style=Oxygen - wheelScrollLines=3 -+ -+[Mouse] -+cursor_theme=Oxygen_White -diff -up lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in.fedora_defaults lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in ---- lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in.fedora_defaults 2015-10-08 11:38:12.000000000 -0500 -+++ lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in 2016-04-28 11:21:51.061479776 -0500 -@@ -4,8 +4,8 @@ SuCommand=gksu %s - TerminalCommand= - Archiver=file-roller - SIUnit=false --TerminalDirCommand=xterm --TerminalExecCommand=xterm -e %s -+TerminalDirCommand=qterminal -+TerminalExecCommand=qterminal -e %s - - [Behavior] - BookmarkOpenMethod=0 -@@ -15,7 +15,7 @@ ConfirmDelete=true - - [Desktop] - WallpaperMode=stretch --Wallpaper=@LXQT_SHARE_DIR@/themes/frost/numix.png -+Wallpaper=/usr/share/backgrounds/default.png - BgColor=#000000 - FgColor=#ffffff - ShadowColor=#000000 diff --git a/lxqt-common-0.10.0-menu-redhat.patch b/lxqt-common-0.10.0-menu-redhat.patch deleted file mode 100644 index 6e35401..0000000 --- a/lxqt-common-0.10.0-menu-redhat.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- menu/lxqt-applications.menu.old 2016-01-15 19:49:25.585778613 +0100 -+++ menu/lxqt-applications.menu 2016-01-15 20:02:23.879173610 +0100 -@@ -13,6 +13,26 @@ - - - -+ -+ -+ System Settings -+ SystemConfig.directory -+ -+ -+ System -+ Settings -+ X-Red-Hat-ServerConfig -+ -+ -+ -+ Server -+ ServerConfig.directory -+ -+ X-Red-Hat-ServerConfig -+ -+ -+ -+ - - - Accessories -@@ -138,6 +158,7 @@ - System - Settings - PackageManager -+ X-Red-Hat-ServerConfig - - - diff --git a/lxqt-common-0.10.0-missing-entry.patch b/lxqt-common-0.10.0-missing-entry.patch deleted file mode 100644 index fd2582f..0000000 --- a/lxqt-common-0.10.0-missing-entry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r -u lxqt-common-0.10.0.orig/autostart/lxqt-qlipper-autostart.desktop.in lxqt-common-0.10.0/autostart/lxqt-qlipper-autostart.desktop.in ---- lxqt-common-0.10.0.orig/autostart/lxqt-qlipper-autostart.desktop.in 2015-10-08 13:38:12.000000000 -0300 -+++ lxqt-common-0.10.0/autostart/lxqt-qlipper-autostart.desktop.in 2015-11-02 15:58:12.368021720 -0200 -@@ -1,6 +1,7 @@ - [Desktop Entry] - Type=Application - Name=Qlipper -+Comment=Qlipper - TryExec=qlipper - Exec=qlipper - OnlyShowIn=LXQt; diff --git a/lxqt-common-0.10.0-policykit-libexec.patch b/lxqt-common-0.10.0-policykit-libexec.patch deleted file mode 100644 index 54cdb95..0000000 --- a/lxqt-common-0.10.0-policykit-libexec.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in.orig 2015-11-26 21:13:08.441931310 +0100 -+++ lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in 2015-11-26 21:18:43.136694332 +0100 -@@ -1,8 +1,9 @@ - [Desktop Entry] - Type=Application - Name=PolicyKit Handler --TryExec=lxqt-policykit-agent --Exec=lxqt-policykit-agent -+Comment=PolicyKit Handler -+TryExec=/usr/libexec/lxqt-policykit-agent -+Exec=/usr/libexec/lxqt-policykit-agent - OnlyShowIn=LXQt; - X-LXQt-Module=true - diff --git a/lxqt-common-0.11.0-fedora-defaults.patch b/lxqt-common-0.11.0-fedora-defaults.patch new file mode 100644 index 0000000..8d455ab --- /dev/null +++ b/lxqt-common-0.11.0-fedora-defaults.patch @@ -0,0 +1,44 @@ +diff -up lxqt-common-0.10.0/config/lxqt.conf.fedora_defaults lxqt-common-0.10.0/config/lxqt.conf +--- lxqt-common-0.10.0/config/lxqt.conf.fedora_defaults 2015-10-08 11:38:12.000000000 -0500 ++++ lxqt-common-0.10.0/config/lxqt.conf 2016-04-28 11:23:04.348893500 -0500 +@@ -1,11 +1,15 @@ + [General] +-theme=frost ++theme=Fedora + icon_theme=oxygen + single_click_activate=false + tool_button_style=ToolButtonTextBesideIcon + + [Qt] +-font="Sans,11,-1,5,50,0,0,0,0,0" ++fixedFont="Monospace,10,-1,5,50,0,0,0,0,0" ++font="Sans,10,-1,5,50,0,0,0,0,0" + doubleClickInterval=400 +-style=Fusion ++style=Oxygen + wheelScrollLines=3 ++ ++[Mouse] ++cursor_theme=Oxygen_White +--- lxqt-common-0.11.0/config/pcmanfm-qt/lxqt/settings.conf.in 2016-09-24 00:44:22.000000000 +0200 ++++ lxqt-common-0.11.0/config/pcmanfm-qt/lxqt/settings.conf.in.fedora 2016-09-25 13:23:29.193684572 +0200 +@@ -4,8 +4,8 @@ + TerminalCommand= + Archiver=file-roller + SIUnit=false +-TerminalDirCommand=xterm +-TerminalExecCommand=xterm -e %s ++TerminalDirCommand=qterminal ++TerminalExecCommand=qterminal -e %s + + [Behavior] + BookmarkOpenMethod=0 +@@ -15,7 +15,7 @@ + + [Desktop] + WallpaperMode=stretch +-Wallpaper=@LXQT_SHARE_DIR@/themes/frost/lxqt-origami-light.png ++Wallpaper=/usr/share/backgrounds/default.png + BgColor=#000000 + FgColor=#ffffff + ShadowColor=#000000 diff --git a/lxqt-common-0.11.0-menu-redhat.patch b/lxqt-common-0.11.0-menu-redhat.patch new file mode 100644 index 0000000..ef58693 --- /dev/null +++ b/lxqt-common-0.11.0-menu-redhat.patch @@ -0,0 +1,37 @@ +--- lxqt-common-0.11.0/menu/lxqt-applications.menu.orig 2016-09-24 00:44:22.000000000 +0200 ++++ lxqt-common-0.11.0/menu/lxqt-applications.menu 2016-09-25 15:52:13.745042586 +0200 +@@ -13,6 +13,26 @@ + + + ++ ++ ++ System Settings ++ SystemConfig.directory ++ ++ ++ System ++ Settings ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ Server ++ ServerConfig.directory ++ ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ + + + Accessories +@@ -138,6 +158,7 @@ + System + Settings + PackageManager ++ X-Red-Hat-ServerConfig + X-Leave + Screensaver + lxqt-about.desktop diff --git a/lxqt-common-0.11.0-missing-entry.patch b/lxqt-common-0.11.0-missing-entry.patch new file mode 100644 index 0000000..fd2582f --- /dev/null +++ b/lxqt-common-0.11.0-missing-entry.patch @@ -0,0 +1,11 @@ +diff -r -u lxqt-common-0.10.0.orig/autostart/lxqt-qlipper-autostart.desktop.in lxqt-common-0.10.0/autostart/lxqt-qlipper-autostart.desktop.in +--- lxqt-common-0.10.0.orig/autostart/lxqt-qlipper-autostart.desktop.in 2015-10-08 13:38:12.000000000 -0300 ++++ lxqt-common-0.10.0/autostart/lxqt-qlipper-autostart.desktop.in 2015-11-02 15:58:12.368021720 -0200 +@@ -1,6 +1,7 @@ + [Desktop Entry] + Type=Application + Name=Qlipper ++Comment=Qlipper + TryExec=qlipper + Exec=qlipper + OnlyShowIn=LXQt; diff --git a/lxqt-common-0.11.0-policykit-libexec.patch b/lxqt-common-0.11.0-policykit-libexec.patch new file mode 100644 index 0000000..54cdb95 --- /dev/null +++ b/lxqt-common-0.11.0-policykit-libexec.patch @@ -0,0 +1,14 @@ +--- lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in.orig 2015-11-26 21:13:08.441931310 +0100 ++++ lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in 2015-11-26 21:18:43.136694332 +0100 +@@ -1,8 +1,9 @@ + [Desktop Entry] + Type=Application + Name=PolicyKit Handler +-TryExec=lxqt-policykit-agent +-Exec=lxqt-policykit-agent ++Comment=PolicyKit Handler ++TryExec=/usr/libexec/lxqt-policykit-agent ++Exec=/usr/libexec/lxqt-policykit-agent + OnlyShowIn=LXQt; + X-LXQt-Module=true + diff --git a/lxqt-common.spec b/lxqt-common.spec index c32248e..54e486a 100644 --- a/lxqt-common.spec +++ b/lxqt-common.spec @@ -1,12 +1,12 @@ Name: lxqt-common Summary: Common resources for LXQt desktop suite -Version: 0.10.0 -Release: 12%{?dist} +Version: 0.11.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://lxqt.org/ Source0: http://downloads.lxqt.org/lxqt/%{version}/lxqt-common-%{version}.tar.xz -Source1: lxqt-theme-fedora.tar.xz +Source1: lxqt-theme-fedora.tar.xz Patch0: %{name}-%{version}-fedora-defaults.patch Patch1: %{name}-%{version}-missing-entry.patch @@ -15,13 +15,11 @@ Patch3: %{name}-%{version}-menu-redhat.patch BuildArch: noarch +BuildRequires: liblxqt-devel >= 0.11.0 BuildRequires: pkgconfig(Qt5Xdg) BuildRequires: pkgconfig(Qt5Help) BuildRequires: kf5-kwindowsystem-devel >= 5.5 -# be careful with %%cmake_lxqt available in lxqt-devel release 4 -BuildRequires: liblxqt-devel >= 0.10.0-4 - BuildRequires: desktop-file-utils Requires: oxygen-cursor-themes @@ -58,29 +56,29 @@ Provides: lxqt-theme = %{version} %patch1 -p1 -b .missing %patch2 -p1 -b .policykit %if 0%{?fedora} -%patch3 -p0 -b .menu-redhat +%patch3 -p1 -b .menu-redhat %endif %build mkdir -p %{_target_platform} pushd %{_target_platform} - %{cmake_lxqt} .. + %{cmake_lxqt} .. popd %make_build -C %{_target_platform} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +make install DESTDIR=%{buildroot} -C %{_target_platform} # let desktop-file-validate be happy sed -i -r 's|(XDG_CURRENT_DESKTOP=")(.*)"|\1X-\2"|' %{buildroot}%{_bindir}/startlxqt for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do - echo ${desktop} - desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop} - cat ${desktop} + echo ${desktop} + desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop} + cat ${desktop} done # Fedora theme %if 0%{?fedora} -pushd %{buildroot}/%{_datadir}/lxqt/themes/ - tar xfJ %{SOURCE1} +pushd %{buildroot}/%{_datadir}/lxqt/themes/ + tar xf %{SOURCE1} popd %endif @@ -98,7 +96,7 @@ fi %files -%{_bindir}/startlxqt +%{_bindir}/startlxqt %dir %{_sysconfdir}/xdg/lxqt %{_sysconfdir}/xdg/autostart/lxqt-* %config(noreplace) %{_sysconfdir}/xdg/lxqt/* @@ -108,25 +106,27 @@ fi %dir %{_datadir}/lxqt %{_datadir}/lxqt/themes %{_datadir}/lxqt/graphics -%{_datadir}/lxqt/openbox %{_datadir}/desktop-directories/lxqt-settings.directory %{_sysconfdir}/xdg/menus/lxqt-applications.menu %{_datadir}/desktop-directories/lxqt-leave.directory %{_datadir}/icons/hicolor/*/*/* -%exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop %if 0%{?fedora} %exclude %{_datadir}/lxqt/themes/Fedora %endif %exclude %{_datadir}/kdm/sessions/lxqt.desktop - %if 0%{?fedora} %files -n lxqt-theme-fedora %dir %{_datadir}/lxqt/themes/Fedora %{_datadir}/lxqt/themes/Fedora/* %endif +%{_sysconfdir}/xdg/openbox/lxqt-rc.xml +%{_mandir}//man1/startlxqt.* %changelog +* Sun Sep 25 2016 Helio Chissini de Castro - 0.11.0-1 +- New upstream release 0.11.0 + * Fri Jun 03 2016 Raphael Groner - 0.10.0-12 - fix XDG_CURRENT_DESKTOP for epel7 diff --git a/sources b/sources index 301aba2..ca6789f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6bf2c06e0de15da33a054bb02b681b02 lxqt-common-0.10.0.tar.xz 9fcbac5366dde4ede2e3c567a35a0a14 lxqt-theme-fedora.tar.xz +cd3beb74d1634922f720581a39a3ae84 lxqt-common-0.11.0.tar.xz