diff --git a/.gitignore b/.gitignore index 45d0354..a74b422 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /lxqt-common-0.9.0.0ad2b72.tar.xz /lxqt-common-0.9.1.tar.xz /lxqt-theme-fedora.tar.xz +/lxqt-common-0.10.0.tar.xz diff --git a/lxqt-common-0.10.0-fedora-defaults.patch b/lxqt-common-0.10.0-fedora-defaults.patch new file mode 100644 index 0000000..f562a4e --- /dev/null +++ b/lxqt-common-0.10.0-fedora-defaults.patch @@ -0,0 +1,56 @@ +diff -u -r lxqt-common-0.10.0.orig/config/lxqt.conf lxqt-common-0.10.0/config/lxqt.conf +--- lxqt-common-0.10.0.orig/config/lxqt.conf 2015-10-08 13:38:12.000000000 -0300 ++++ lxqt-common-0.10.0/config/lxqt.conf 2015-11-02 15:28:46.736988441 -0200 +@@ -1,11 +1,14 @@ + [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" ++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 -u -r lxqt-common-0.10.0.orig/config/pcmanfm-qt/lxqt/settings.conf.in lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in +--- lxqt-common-0.10.0.orig/config/pcmanfm-qt/lxqt/settings.conf.in 2015-10-08 13:38:12.000000000 -0300 ++++ lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in 2015-11-02 15:30:10.999418858 -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/numix.png ++Wallpaper=/usr/share/backgrounds/default.png + BgColor=#000000 + FgColor=#ffffff + ShadowColor=#000000 +diff -u -r lxqt-common-0.10.0.orig/startlxqt.in lxqt-common-0.10.0/startlxqt.in +--- lxqt-common-0.10.0.orig/startlxqt.in 2015-10-08 13:38:12.000000000 -0300 ++++ lxqt-common-0.10.0/startlxqt.in 2015-11-02 15:30:40.954571905 -0200 +@@ -62,7 +62,7 @@ + # use lxqt-applications.menu for main app menu + export XDG_MENU_PREFIX="lxqt-" + +-export XDG_CURRENT_DESKTOP="LXQt" ++export XDG_CURRENT_DESKTOP="X-LXQt" + + # Start the LXQt session + exec lxqt-session diff --git a/lxqt-common-0.10.0-missing-entry.patch b/lxqt-common-0.10.0-missing-entry.patch new file mode 100644 index 0000000..76a9bae --- /dev/null +++ b/lxqt-common-0.10.0-missing-entry.patch @@ -0,0 +1,22 @@ +diff -r -u lxqt-common-0.10.0.orig/autostart/lxqt-policykit-agent.desktop.in lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in +--- lxqt-common-0.10.0.orig/autostart/lxqt-policykit-agent.desktop.in 2015-10-08 13:38:12.000000000 -0300 ++++ lxqt-common-0.10.0/autostart/lxqt-policykit-agent.desktop.in 2015-11-02 15:56:15.525422740 -0200 +@@ -1,6 +1,7 @@ + [Desktop Entry] + Type=Application + Name=PolicyKit Handler ++Comment=PolicyKit Handler + TryExec=lxqt-policykit-agent + Exec=lxqt-policykit-agent + OnlyShowIn=LXQt; +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.9.1-fedora-defaults.patch b/lxqt-common-0.9.1-fedora-defaults.patch deleted file mode 100644 index f302a99..0000000 --- a/lxqt-common-0.9.1-fedora-defaults.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -r -u lxqt-common-0.9.1-orig/config/lxqt.conf lxqt-common-0.9.1/config/lxqt.conf ---- lxqt-common-0.9.1-orig/config/lxqt.conf 2015-02-14 11:42:58.000000000 -0200 -+++ lxqt-common-0.9.1/config/lxqt.conf 2015-02-28 14:29:56.461533354 -0300 -@@ -1,11 +1,14 @@ - [General] --theme=frost -+theme=Fedora - icon_theme=oxygen - single_click_activate=false - tool_button_style=ToolButtonTextBesideIcon - -+[Mouse] -+cursor_theme=Oxygen_White -+ - [Qt] --font="Sans,11,-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 -diff -r -u lxqt-common-0.9.1-orig/config/pcmanfm-qt/lxqt/settings.conf.in lxqt-common-0.9.1/config/pcmanfm-qt/lxqt/settings.conf.in ---- lxqt-common-0.9.1-orig/config/pcmanfm-qt/lxqt/settings.conf.in 2015-02-14 11:42:58.000000000 -0200 -+++ lxqt-common-0.9.1/config/pcmanfm-qt/lxqt/settings.conf.in 2015-02-28 14:34:50.558345252 -0300 -@@ -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/light/simple_blue_widescreen.png -+Wallpaper=/usr/share/backgrounds/default.png - BgColor=#000000 - FgColor=#ffffff - ShadowColor=#000000 -diff -r -u lxqt-common-0.9.1-orig/startlxqt.in lxqt-common-0.9.1/startlxqt.in ---- lxqt-common-0.9.1-orig/startlxqt.in 2015-02-14 11:42:58.000000000 -0200 -+++ lxqt-common-0.9.1/startlxqt.in 2015-02-28 14:28:04.237223539 -0300 -@@ -40,7 +40,7 @@ - # use lxqt-applications.menu for main app menu - export XDG_MENU_PREFIX="lxqt-" - --export XDG_CURRENT_DESKTOP="LXQt" -+export XDG_CURRENT_DESKTOP="X-LXQt" - - # Start the LXQt session - exec lxqt-session diff --git a/lxqt-common-0.9.1-tryexec.patch b/lxqt-common-0.9.1-tryexec.patch deleted file mode 100644 index fe6940a..0000000 --- a/lxqt-common-0.9.1-tryexec.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lxqt-common/xsession/lxqt.desktop.in.orig 2015-06-12 15:32:52.144690793 -0300 -+++ lxqt-common/xsession/lxqt.desktop.in 2015-06-12 15:33:05.537775690 -0300 -@@ -1,6 +1,7 @@ - [Desktop Entry] - Type=Application - Exec=startlxqt -+TryExec=lxqt-session - Name=LXQt Desktop - Comment=Lightweight Qt Desktop - diff --git a/lxqt-common.spec b/lxqt-common.spec index 8c0a028..2f02eda 100644 --- a/lxqt-common.spec +++ b/lxqt-common.spec @@ -1,13 +1,13 @@ Name: lxqt-common Summary: Common resources for LXQt desktop suite -Version: 0.9.1 -Release: 5%{?dist} +Version: 0.10.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://lxqt.org/ -Source0: http://downloads.lxqt.org/lxqt/0.9.0/lxqt-common-%{version}.tar.xz +Source0: http://downloads.lxqt.org/lxqt/%{version}/lxqt-common-%{version}.tar.xz Source1: lxqt-theme-fedora.tar.xz -Patch0: lxqt-common-0.9.1-fedora-defaults.patch -Patch1: lxqt-common-0.9.1-tryexec.patch +Patch0: lxqt-common-0.10.0-fedora-defaults.patch +Patch1: lxqt-common-0.10.0-missing-entry.patch BuildArch: noarch Requires: oxygen-cursor-themes @@ -37,7 +37,7 @@ Provides: lxqt-theme = %{version} %prep %setup -q %patch0 -p1 -b .fedora_defaults -%patch1 -p1 -b .tryexec +%patch1 -p1 -b .missing %build mkdir -p %{_target_platform} @@ -94,6 +94,9 @@ fi %{_datadir}/lxqt/themes/Fedora/* %changelog +* Mon Nov 02 2015 Helio Chissini de Castro - 0.10.1-1 +- New upstream release + * Wed Jun 17 2015 Fedora Release Engineering - 0.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 725c7b7..b3fbe12 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -7db547d46c4e4e5efb6b3ee8e4a90ad9 lxqt-common-0.9.1.tar.xz -9fcbac5366dde4ede2e3c567a35a0a14 lxqt-theme-fedora.tar.xz +6bf2c06e0de15da33a054bb02b681b02 lxqt-common-0.10.0.tar.xz