commit 82c450a6d0ecf9bd848cc2163ef4a0fedf5b715d
Author: nonamedotc <nonamedotc(a)fedoraproject.org>
Date: Sat Feb 28 19:03:53 2015 -0600
Update to stable release 4.12.0
- spec clean up
- built with GTK3 support
.gitignore | 1 +
sources | 2 +-
xfce4-settings-4.12-fedora.patch | 25 +++++++++++++++++++++++++
xfce4-settings.spec | 31 ++++++++++++++++---------------
4 files changed, 43 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2380fb..e2cb61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xfce4-settings-4.6.5.tar.bz2
/xfce4-settings-4.9.5.tar.bz2
/xfce4-settings-4.10.0.tar.bz2
/xfce4-settings-4.10.1.tar.bz2
+/xfce4-settings-4.12.0.tar.bz2
diff --git a/sources b/sources
index 0348c94..7be92cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaa86dd86ef0dad9cf7af1ee2c831972 xfce4-settings-4.10.1.tar.bz2
+3eb9ff3862d773287f56f142ab7ec361 xfce4-settings-4.12.0.tar.bz2
diff --git a/xfce4-settings-4.12-fedora.patch b/xfce4-settings-4.12-fedora.patch
new file mode 100644
index 0000000..b5337d3
--- /dev/null
+++ b/xfce4-settings-4.12-fedora.patch
@@ -0,0 +1,25 @@
+--- xfsettingsd/xsettings.xml.orig 2015-02-23 19:33:11.000000000 -0600
++++ xfsettingsd/xsettings.xml 2015-02-28 18:30:51.863719465 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+ <property name="Net" type="empty">
+- <property name="ThemeName" type="empty"/>
+- <property name="IconThemeName" type="empty"/>
++ <property name="ThemeName" type="string"
value="Adwaita"/>
++ <property name="IconThemeName" type="string"
value="Fedora"/>
+ <property name="DoubleClickTime" type="int"
value="400"/>
+ <property name="DoubleClickDistance" type="int"
value="5"/>
+ <property name="DndDragThreshold" type="int"
value="8"/>
+@@ -19,9 +19,9 @@
+ </property>
+ <property name="Xft" type="empty">
+ <property name="DPI" type="empty"/>
+- <property name="Antialias" type="int"
value="-1"/>
++ <property name="Antialias" type="int"
value="1"/>
+ <property name="Hinting" type="int"
value="-1"/>
+- <property name="HintStyle" type="string"
value="hintnone"/>
++ <property name="HintStyle" type="string"
value="hintfull"/>
+ <property name="RGBA" type="string"
value="none"/>
+ <!-- <property name="Lcdfilter" type="string"
value="none"/> -->
+ </property>
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index 0aee02b..f3c4f0c 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -1,8 +1,8 @@
-%global xfceversion 4.10
+%global xfceversion 4.12
Name: xfce4-settings
-Version: 4.10.1
-Release: 6%{?dist}
+Version: 4.12.0
+Release: 1%{?dist}
Summary: Settings Manager for Xfce
Group: User Interface/Desktops
@@ -11,11 +11,10 @@ URL:
http://www.xfce.org/
#VCS
git:git://git.xfce.org/xfce/xfce4-settings
Source0:
http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version...
## Downstream patches
-Patch1: xfce4-settings-4.8.3-monitor-position.patch
+# temporarily disabled this patch
+#Patch1: xfce4-settings-4.8.3-monitor-position.patch
# Use Fedora theme and font settings
-Patch10: xfce4-settings-4.9.4-fedora.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch10: xfce4-settings-4.12-fedora.patch
BuildRequires: gettext
BuildRequires: intltool
@@ -26,6 +25,7 @@ BuildRequires: xfconf-devel >= %{xfceversion}
BuildRequires: libglade2-devel
BuildRequires: libwnck-devel
BuildRequires: desktop-file-utils >= 0.7
+BuildRequires: gtk3-devel
BuildRequires: libnotify-devel
BuildRequires: libcanberra-devel
BuildRequires: libxklavier-devel
@@ -47,17 +47,16 @@ This package includes the settings manager applications for the Xfce
desktop.
%prep
%setup -q
-%patch1 -p1
-%patch10 -p1 -b .fedora
+## patch1 -p1
+%patch10
%build
-%configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode
+%configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode
--enable-gtk3
make %{?_smp_mflags} V=1
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
for file in %{buildroot}%{_datadir}/applications/*.desktop ; do
@@ -72,11 +71,7 @@ done
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS TODO COPYING
%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
%config(noreplace) %{_sysconfdir}/xdg/autostart/xfsettingsd.desktop
@@ -87,8 +82,14 @@ rm -rf %{buildroot}
%{_bindir}/xfsettingsd
%{_datadir}/applications/xfce*.desktop
%{_libdir}/xfce4/settings
+%{_datadir}/icons/hicolor/128x128/devices/xfce-*.png
%changelog
+* Sat Feb 28 2015 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 4.12.0-1
+- Update to stable release 4.12.0
+- spec clean up
+- built with GTK3 support
+
* Sat Feb 21 2015 Till Maas <opensource(a)till.name> - 4.10.1-6
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-...