[xfdesktop] Update latest stable release 4.12.0

nonamedotc nonamedotc at fedoraproject.org
Sun Mar 1 01:41:29 UTC 2015


commit 4065126027d5a2e17798abe22a42059428daedff
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date:   Sat Feb 28 19:41:27 2015 -0600

    Update latest stable release 4.12.0
    
    - spec cleanup
    - changed default background patch to sed
    - removed change backdrop patch (testing)

 .gitignore     |  1 +
 sources        |  2 +-
 xfdesktop.spec | 31 +++++++++++++------------------
 3 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c9f56b..81d0cb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ xfdesktop-4.6.2.tar.bz2
 /xfdesktop-4.10.1.tar.bz2
 /xfdesktop-4.10.2.tar.bz2
 /xfdesktop-4.10.3.tar.bz2
+/xfdesktop-4.12.0.tar.bz2
diff --git a/sources b/sources
index efa1ef4..1a07c6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11c9601f99080b47ee92b2ea30d30355  xfdesktop-4.10.3.tar.bz2
+d14545baf39678d3b1c7280f71e9d160  xfdesktop-4.12.0.tar.bz2
diff --git a/xfdesktop.spec b/xfdesktop.spec
index 3327e12..289f71f 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -1,8 +1,8 @@
-%global xfceversion 4.10
+%global xfceversion 4.12
 
 Name:           xfdesktop
-Version:        4.10.3
-Release:        4%{?dist}
+Version:        4.12.0
+Release:        1%{?dist}
 Summary:        Desktop manager for the Xfce Desktop Environment
 
 Group:          User Interface/Desktops
@@ -10,13 +10,9 @@ License:        GPLv2+
 URL:            http://www.xfce.org/
 #VCS: git:git://git.xfce.org/xfce/xfdesktop
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-## Downstream patches
-# Change default background for Fedora
-Patch10:        xfdesktop-4.9.3-backdrop-image.patch
 # Fix crashes with desktop backdrop change. 
 # https://bugzilla.xfce.org/show_bug.cgi?id=11346
-Patch1:         xfdesktop-4.10.3-backdrop-change-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch1:         xfdesktop-4.10.3-backdrop-change-fix.patch
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
 BuildRequires:  gettext
@@ -49,9 +45,9 @@ This package includes a desktop manager for the Xfce Desktop Environment.
 %prep
 %setup -q
 
-%patch1 -p1
-%patch10 -p1 -b .backdrop
-
+## patch1 -p1
+# change default background for Fedora
+sed -i 's/\/backgrounds\/xfce\/xfce-teal.jpg/\/backgrounds\/images\/default.png/g' common/xfdesktop-common.h
 
 %build
 %configure
@@ -59,7 +55,6 @@ This package includes a desktop manager for the Xfce Desktop Environment.
 make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
@@ -70,14 +65,9 @@ desktop-file-validate \
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -90,7 +80,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -101,6 +90,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Feb 28 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 4.12.0-1
+- Update latest stable release 4.12.0
+- spec cleanup
+- changed default background patch to sed
+- removed change backdrop patch (testing)
+
 * Sat Feb 21 2015 Till Maas <opensource at till.name> - 4.10.3-4
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code


More information about the scm-commits mailing list