- removed libwrap-devel from Requires rules (this is now in ORBit-devel rules).

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

diff --git a/control-center.spec b/control-center.spec
index 0e5ca6abfd2ec40f89aeb91e291a934398ae6574..28496e2206cc4606bd301d650dc32ed0da1c7d93 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,34 +1,47 @@
 Summary:       GNOME control center
 Summary(pl):   Centrum kontroli GNOME
 Name:          control-center
-Version:       1.2.4
-Release:       1
+Version:       1.4.0.1
+Release:       5
 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}-applnk.patch
+Patch0:                %{name}-macros.patch
+Patch1:                %{name}-applnk.patch
+Patch2:                %{name}-gettext.patch
+Patch3:                %{name}-wm-properties_path.patch
+Patch4:                %{name}-esdrelease.patch
+Patch5:                %{name}-pldrelease.patch
+URL:           http://www.gnome.org/
 Icon:          control-center.gif
-Requires:      xscreensaver >= 2.34
+BuildRequires: GConf-devel
 BuildRequires: ORBit-devel
 BuildRequires: autoconf
+BuildRequires: bison
+BuildRequires: flex
 BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.5
+BuildRequires: findutils
 BuildRequires: gdk-pixbuf-devel >= 0.7.0
-BuildRequires: gnome-libs-devel
+BuildRequires: gettext-devel
+BuildRequires: gnome-libs-devel >= 1.2.12-3
+BuildRequires: gnome-vfs-devel >= 0.9
 BuildRequires: gtk+-devel >= 1.1.16
 BuildRequires: imlib-devel >= 1.8.2
+BuildRequires: xml-i18n-tools
+BuildRequires: oaf-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
 
 %define                _prefix         /usr/X11R6
+%define                _bindir         %{_prefix}/bin
+%define                _datadir        %{_prefix}/share
+%define                _includedir     %{_prefix}/include
+%define                _libdir         %{_prefix}/lib
 %define                _sysconfdir     /etc/X11/GNOME
 
 %description
@@ -79,9 +92,14 @@ Statyczne biblioteki dla centrum kontroli GNOME.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %build
-gettextize --force --copy
+rm -f missing
+xml-i18n-toolize --copy --force
+libtoolize --copy --force
+gettextize --copy --force
+rm -f macros/xml-i18n-tools.m4 # have it in xml-i18n-tools
 aclocal -I macros
 autoconf
 automake -a -c
@@ -95,10 +113,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
        
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
-mv -f $RPM_BUILD_ROOT%{_applnkdir}/Settings/{[!G]*,GNOME}
+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
 
@@ -128,6 +151,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