- release 2,

[packages/control-center.git] / control-center.spec

diff --git a/control-center.spec b/control-center.spec
index 48f04a473ad7695f72767332416753b47ec2c3c1..50357b1a64779de114355856d804e3b54e1b0be4 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,52 +1,47 @@
 Summary:       GNOME control center
 Summary(pl):   Centrum kontroli GNOME
 Name:          control-center
-Version:       1.0.51
+Version:       1.2.0
 Release:       2
 License:       GPL
 Group:         X11/GNOME
 Group(pl):     X11/GNOME
-Source:                ftp://ftp.gnome.org/pub/GNOME/source/control-center/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/sources/control-center/%{name}-%{version}.tar.gz
 Patch0:                control-center-nosound.patch
 Patch1:                control-center-esdrelease.patch
 Patch2:                control-center-bgcolor1.patch
 Patch3:                control-center-fsbgpath.patch
 Patch4:                control-center-dontstartesd.patch
 Patch5:                control-center-limitedbgs.patch
-Patch6:                control-center-smfixtry.patch
-Patch7:                control-center-numwallpapers.patch
-Patch8:                control-center-automake.patch
-Patch9:                control-center-applnk.patch
+Patch6:                control-center-numwallpapers.patch
+Patch7:                control-center-applnk.patch
 Icon:          control-center.gif
 Requires:      xscreensaver >= 2.34
-BuildRequires: gtk+-devel >= 1.1.16
+BuildRequires: ORBit-devel
+BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.5
-BuildRequires: imlib-devel >= 1.8.2
 BuildRequires: gnome-libs-devel
-BuildRequires: ORBit-devel
-BuildRequires: XFree86-devel
+BuildRequires: gtk+-devel >= 1.1.16
+BuildRequires: imlib-devel >= 1.8.2
 BuildRequires: zlib-devel
-BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
 %define                _prefix         /usr/X11R6
 %define                _sysconfdir     /etc/X11/GNOME
-%define                _applnkdir      %{_datadir}/applnk
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
-
-GNOME is the GNU Network Object Model Environment. That's a fancy name but
-really GNOME is a nice GUI desktop environment. It makes using your computer
-easy, powerful, and easy to configure.
+GNOME is the GNU Network Object Model Environment. That's a fancy name
+but really GNOME is a nice GUI desktop environment. It makes using
+your computer easy, powerful, and easy to configure.
 
 %description -l pl
-Narzêdzie do ³atwej konfiguracji twojego ¶rodowiska GNOME.
-
-GNOME to Obiektowe ¦rodowisko Sieciowe na licencji GNU (GNU Network Object
-Model Environment). Nazwa jest do¶æ dziwaczna, ale w rzeczywisto¶ci jest to
-mi³e ¶rodowisko pracy. Powoduje, ¿e u¿ywanie komputera jest proste, wydajne
-i ³atwe w konfiguracji.
+Narzêdzie do ³atwej konfiguracji twojego ¶rodowiska GNOME. GNOME to
+Obiektowe ¦rodowisko Sieciowe na licencji GNU (GNU Network Object
+Model Environment). Nazwa jest do¶æ dziwaczna, ale w rzeczywisto¶ci
+jest to mi³e ¶rodowisko pracy. Powoduje, ¿e u¿ywanie komputera jest
+proste, wydajne i ³atwe w konfiguracji.
 
 %package devel
 Summary:       GNOME control-center includes
@@ -72,7 +67,7 @@ Requires:     %{name}-devel = %{version}
 GNOME control-center static libraries.
 
 %description -l pl
-Statyczne biblioteki dla centrum kontroli GNOME
+Statyczne biblioteki dla centrum kontroli GNOME.
 
 %prep
 %setup -q
@@ -84,8 +79,6 @@ Statyczne biblioteki dla centrum kontroli GNOME
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 gettextize --force --copy
@@ -100,11 +93,14 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/control-center/Desktop/screensaver-properties.desktop \
+       $RPM_BUILD_ROOT%{_applnkdir}/Settings/Desktop/screensaver-properties.desktop
+
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
 gzip -9nf AUTHORS ChangeLog NEWS README
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,4 +129,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %files static
-%attr(644,root,root) %{_libdir}/lib*.a
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a