]> git.pld-linux.org Git - packages/control-center.git/blobdiff - control-center.spec
- tadaaaam... DPI autodetection can be disabled
[packages/control-center.git] / control-center.spec
index 14d21417c1546596e828e2c7f4178141b421f1e5..d6edab7903213388c4ff2d8eef176dd9f054872f 100644 (file)
@@ -5,18 +5,28 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.3.2
-Release:       1
+Version:       2.4.0
+Release:       9
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 44115d3174d2f603f34a336ada562bae
 Patch0:                %{name}-fontconfig.patch
 Patch1:                %{name}-am17.patch
+Patch2:                %{name}-link.patch
+Patch3:                %{name}-randr.patch
+Patch4:                %{name}-def-apps-capplet.patch
+Patch5:                %{name}-wm_properties-dir.patch
+Patch6:                %{name}-additional-metacity-keybinding.patch
+Patch7:                %{name}-pixmaps-dirs.patch
+Patch8:                %{name}-capplets-dir.patch
+Patch9:                %{name}-themus-glade.patch
+Patch10:       %{name}-font-capplet-disable-dpi.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
-BuildRequires: GConf2-devel >= 2.3.2
-BuildRequires: ORBit2-devel >= 2.7.1
+BuildRequires: GConf2-devel >= 2.3.3
+BuildRequires: ORBit2-devel >= 2.8.0
 BuildRequires: audiofile >= 0.2.3-3
 BuildRequires: autoconf
 BuildRequires: automake
@@ -25,28 +35,30 @@ BuildRequires:      flex
 BuildRequires: esound-devel
 BuildRequires: findutils
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.3.2
-BuildRequires: gnome-vfs2-devel >= 2.3.2
-BuildRequires: gtk+2-devel >= 2.2.1
+BuildRequires: gnome-desktop-devel >= 2.3.90
+BuildRequires: gnome-vfs2-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.3
 BuildRequires: intltool >= 0.25
-BuildRequires: libbonobo-devel >= 2.2.1
-BuildRequires: libbonoboui-devel >= 2.2.2
+BuildRequires: libbonobo-devel >= 2.4.0
+BuildRequires: libbonoboui-devel >= 2.4.0
 BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnome-devel >= 2.3.0
-BuildRequires: libgnomeui-devel >= 2.3.0
-BuildRequires: libxml2-devel >= 2.5.7
+BuildRequires: libgnome-devel >= 2.4.0
+BuildRequires: libgnomeui-devel >= 2.4.0
+BuildRequires: libxml2-devel >= 2.5.10
 BuildRequires: libtool
+BuildRequires: metacity-devel >= 2.5.1
+BuildRequires: nautilus-devel >= 2.3.90
 BuildRequires: scrollkeeper >= 0.3.12
 BuildRequires: startup-notification-devel
-BuildRequires: metacity-devel >= 2.5.1
 BuildRequires: xft-devel >= 2.1.1
-Requires:      gnome-vfs2 >= 2.3.2
-PreReq:                scrollkeeper
 PreReq:                /sbin/ldconfig
-Obsoletes:     themus
+PreReq:                scrollkeeper
+Requires(post):        GConf2
+Requires:      gnome-vfs2 >= 2.4.0
 Obsoletes:     fontilus
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gnome
+Obsoletes:     themus
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A Configuration tool for easily setting up your GNOME environment.
@@ -86,10 +98,10 @@ GNOME 
 ãÅÊ ÐÁËÅÔ ÐÏÔÒ¦ÂÎÉÊ, ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ ÓÅÒÅÄÏ×ÉÝÅ GNOME.
 
 %package devel
-Summary:       GNOME Control-Center includes
+Summary:       GNOME Control-Center header files
 Summary(pl):   Pliki nag³ówkowe bibliotek GNOME Control-Center
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description devel
 GNOME Control-Center header files.
@@ -100,19 +112,28 @@ Pliki nag
 %package static
 Summary:       GNOME Control-Center static libraries
 Summary(pl):   Statyczne biblioteki GNOME Control-Center
-Group:          X11/Development/Libraries                                       
-Requires:       %{name} = %{version}  
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}
 
-%description static                                                             
-GNOME Control-Centerp static libraries.                                                
-                                                                                
-%description static -l pl                                                       
-Statyczne biblioteki GNOME Control-Center.   
+%description static
+GNOME Control-Center static libraries.
+
+%description static -l pl
+Statyczne biblioteki GNOME Control-Center.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 glib-gettextize --copy --force
@@ -122,7 +143,9 @@ intltoolize --copy --force
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure --disable-schemas-install
+%configure \
+       --disable-schemas-install \
+       X_EXTRA_LIBS="-lXext"
 
 %{__make}
 
@@ -130,7 +153,7 @@ intltoolize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$RPM_BUILD_ROOT
 
 # no static modules - shut up check-files
 rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
@@ -146,8 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 %gconf_schema_install
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -160,31 +182,27 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
 %attr(755,root,root) %{_libdir}/window-manager-settings/*.so
-%dir %{_datadir}/control-center-2.0
-%dir %{_datadir}/control-center-2.0/capplets
+%dir %{_libdir}/window-manager-settings
 %{_libdir}/bonobo/servers/*
-%{_datadir}/applications/*
 %{_datadir}/application-registry/*
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/control-center-2.0/icons
-%{_datadir}/control-center-2.0/interfaces
-%{_datadir}/control-center-2.0/pixmaps
-%{_datadir}/control-center-2.0/xrdb
+%{_datadir}/control-center-2.0
 %{_datadir}/gnome/cursor-fonts
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome/capplets
 %{_datadir}/idl/*
 %{_datadir}/mime-info/*
 %{_pixmapsdir}/gnomecc-2
 %{_pixmapsdir}/*.png
+%{_desktopdir}/*
 
 %files devel
-%defattr(644,root,root,755)                                                     
-%{_includedir}/gnome-window-settings-2.0
-%{_libdir}/lib*.la
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_includedir}/gnome-window-settings-2.0
 %{_pkgconfigdir}/*.pc
 
-%files static                                                                   
-%defattr(644,root,root,755)                                                     
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/*.a
This page took 2.470056 seconds and 4 git commands to generate.