- change path to wm-properties files from $(datadir)/gnome/wm-properties to

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

diff --git a/control-center.spec b/control-center.spec
index be7f80a0322928ea7e6d02978a69276a01512875..d0198d92495f30257dedc658490ad88778a361bb 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,29 +1,33 @@
 Summary:       GNOME control center
 Summary(pl):   Centrum kontroli GNOME
 Name:          control-center
-Version:       1.0.53
+Version:       1.4.0.1
 Release:       1
+Epoch:         1
 License:       GPL
-Group:         X11/GNOME
-Group(pl):     X11/GNOME
+Group:         X11/Applications
+Group(de):     X11/Applikationen
+Group(pl):     X11/Aplikacje
 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-numwallpapers.patch
-Patch7:                control-center-applnk.patch
+Patch0:                %{name}-macros.patch
+Patch1:                %{name}-applnk.patch
+Patch2:                %{name}-gettext.patch
+URL:           http://www.gnome.org/
 Icon:          control-center.gif
-Requires:      xscreensaver >= 2.34
-BuildRequires: gtk+-devel >= 1.1.16
+BuildRequires: ORBit-devel
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.5
+BuildRequires: gdk-pixbuf-devel >= 0.7.0
+BuildRequires: gnome-libs-devel >= 1.2.12-3
+BuildRequires: gtk+-devel >= 1.1.16
 BuildRequires: imlib-devel >= 1.8.2
-BuildRequires: gnome-libs-devel
-BuildRequires: ORBit-devel
-BuildRequires: XFree86-devel
 BuildRequires: zlib-devel
+BuildRequires: gettext-devel
+BuildRequires: xml-i18n-tools
+BuildRequires: findutils
+BuildRequires: flex
+BuildRequires: bison
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
@@ -31,22 +35,23 @@ Obsoletes:  gnome
 %define                _sysconfdir     /etc/X11/GNOME
 
 %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.
+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.
 
 %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.
+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
 Summary(pl):   Pliki nag³ówkowe centrum kontroli GNOME
 Group:         X11/Development/Libraries
+Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name} = %{version}
 
@@ -60,6 +65,7 @@ Rzeczy potrzebne do kompilacji.
 Summary:       GNOME control-center static libraries
 Summary(pl):   Statyczne biblioteki dla centrum kontroli GNOME
 Group:         X11/Development/Libraries
+Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name}-devel = %{version}
 
@@ -67,37 +73,44 @@ 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
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
-gettextize --force --copy
-automake
-LDFLAGS="-s"; export LDFLAGS 
+rm missing
+xml-i18n-toolize --copy --force
+gettextize --copy --force
+automake -a -c
+aclocal -I macros
+autoconf
 %configure 
 
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__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 \
+       $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME/Desktop/screensaver-properties.desktop
+       
+mv -f $RPM_BUILD_ROOT%{_applnkdir}/Settings/*.desktop \
+      $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
+cp    $RPM_BUILD_ROOT%{_applnkdir}/Settings/Desktop/*.desktop \
+      $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME/Desktop
 
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
+find $RPM_BUILD_ROOT%{_applnkdir} -name .directory | xargs | rm -f
 
 gzip -9nf AUTHORS ChangeLog NEWS README
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,9 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %{_datadir}/control-center
-%{_applnkdir}/Settings
+%{_applnkdir}/Settings/GNOME
 %dir %{_datadir}/gnome/wm-properties
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -123,7 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/*.sh
 %{_datadir}/idl/*
+%{_datadir}/omf/*
 %{_includedir}/*
 
 %files static
-%attr(644,root,root) %{_libdir}/lib*.a
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a