1.4.0.1

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

diff --git a/control-center.spec b/control-center.spec
index d95d6cd5df65e762e02a01eb7977f137bebe095b..a41c53f2f72d3e35f9c264b2985d793ad92a1461 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,30 +1,29 @@
 Summary:       GNOME control center
 Summary(pl):   Centrum kontroli GNOME
 Name:          control-center
-Version:       1.2.2
-Release:       6
+Version:       1.4.0.1
+Release:       1
+Epoch:         1
 License:       GPL
 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:                %{name}-nosound.patch
-Patch1:                %{name}-esdrelease.patch
-Patch2:                %{name}-bgcolor1.patch
-Patch3:                %{name}-fsbgpath.patch
-Patch4:                %{name}-dontstartesd.patch
-Patch5:                %{name}-limitedbgs.patch
-Patch6:                %{name}-applnk.patch
+Patch0:                %{name}-macros.patch
+Patch1:                %{name}-applnk.patch
 Icon:          control-center.gif
-Requires:      xscreensaver >= 2.34
 BuildRequires: ORBit-devel
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.5
-BuildRequires: gnome-libs-devel
+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: zlib-devel
-BuildRequires: gdk-pixbuf-devel
+BuildRequires: gettext-devel
+BuildRequires: xml-i18n-tools
+BuildRequires: findutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
@@ -76,15 +75,14 @@ Statyczne biblioteki dla centrum kontroli GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
 
 %build
-gettextize --force --copy
-automake
+rm missing
+gettextize --copy --force
+xml-i18n-toolize --copy --force
+automake -a -c
+aclocal -I macros
+autoconf
 %configure 
 
 %{__make}
@@ -95,7 +93,15 @@ 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
+       $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
+
+find $RPM_BUILD_ROOT%{_applnkdir} -name .directory | xargs | rm -f
 
 gzip -9nf AUTHORS ChangeLog NEWS README
 
@@ -114,9 +120,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)
@@ -125,6 +131,7 @@ 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