[packages/xfdesktop] - package fa locale under supported name - updated dependencies

[qboosh]

commit 54994498611b5d744b94b87fc92820e469dcee1e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Aug 24 17:47:41 2014 +0200

    - package fa locale under supported name
    - updated dependencies

 xfdesktop.spec | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/xfdesktop.spec b/xfdesktop.spec
index 7235fd8..e3583c2 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -3,34 +3,45 @@ Summary(pl.UTF-8):	Zarządca pulpitu dla środowiska Xfce
 Name:		xfdesktop
 Version:	4.11.7
 Release:	2
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/xfce/xfdesktop/4.11/%{name}-%{version}.tar.bz2
 # Source0-md5:	c504d7208b6ddcb6e616780ef27bbb46
 URL:		http://www.xfce.org/projects/xfdesktop
 BuildRequires:	Thunar-devel >= 1.6.0
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.8
+BuildRequires:	dbus-glib-devel >= 0.84
 BuildRequires:	exo-devel >= 0.8.0
 BuildRequires:	garcon-devel >= 0.3.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	glib2-devel >= 1:2.30.0
+BuildRequires:	gtk+2-devel >= 2:2.24.0
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libnotify-devel >= 0.4.0
-BuildRequires:	libtool
-BuildRequires:	libwnck2-devel >= 2.22.0
-BuildRequires:	libxfce4ui-devel >= 4.11.0
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	libwnck2-devel >= 2.30.0
+BuildRequires:	libxfce4ui-devel >= 4.11.1
 BuildRequires:	libxfce4util-devel >= 4.11.0
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	xfce4-dev-tools >= 4.11.0
 BuildRequires:	xfconf-devel >= 4.10.0
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+Requires:	Thunar-libs >= 1.6.0
+Requires:	dbus-glib >= 0.84
+Requires:	exo >= 0.8.0
 Requires:	garcon >= 0.3.0
+Requires:	glib2 >= 1:2.30.0
+Requires:	gtk+2 >= 2:2.24.0
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
+Requires:	libwnck2 >= 2.30.0
+Requires:	libxfce4ui >= 4.11.1
+Requires:	libxfce4util >= 4.11.0
 Requires:	xfce4-dirs >= 4.6
+Requires:	xfconf >= 4.10.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,7 +58,6 @@ xfdesktop zawiera zarządcę pulpitu dla środowiska Xfce.
 	--disable-silent-rules \
 	--enable-desktop-icons \
 	--enable-desktop-menu \
-	--enable-exo \
 	--enable-file-icons \
 	--enable-thunarx
 
@@ -59,7 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{ur_PK,fa_IR}
+# unify dir name (verify first that target doesn't exist)
+[ ! -e $RPM_BUILD_ROOT%{_datadir}/locale/fa ] || exit 1
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
+# just a copy of ur (.po files differ only by trailing junk)
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
 
@@ -77,9 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/xfdesktop
 %attr(755,root,root) %{_bindir}/xfdesktop-settings
-%{_mandir}/man1/*.1*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
-%{_iconsdir}/hicolor/*/apps/*
+%{_mandir}/man1/xfdesktop.1*
+%{_desktopdir}/xfce-backdrop-settings.desktop
+%{_pixmapsdir}/xfce4_xicon*.png
+%{_pixmapsdir}/xfdesktop
+%{_iconsdir}/hicolor/*/apps/xfce4-backdrop.*
+%{_iconsdir}/hicolor/*/apps/xfce4-menueditor.*
 %dir %{_datadir}/backgrounds/xfce
 %{_datadir}/backgrounds/xfce/xfce-blue.jpg
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfdesktop.git/commitdiff/54994498611b5d744b94b87fc92820e469dcee1e