X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=control-center.spec;h=8f7b921032c4368a08e5aaa850dd35f25534ed0b;hb=8f9218f346c1b2785ff3e72a733e7137465904b9;hp=f9f4afd0d3e93a7d7f2f12540e896dfe464b6aed;hpb=9b497643df244255a231dbc45ca1779b41886877;p=packages%2Fcontrol-center.git diff --git a/control-center.spec b/control-center.spec index f9f4afd..8f7b921 100644 --- a/control-center.spec +++ b/control-center.spec @@ -5,20 +5,29 @@ Summary(pt_BR): O Centro de Controle do GNOME Summary(uk): ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME Summary(ru): ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME Name: control-center -Version: 2.3.3 -Release: 1 +Version: 2.8.0 +Release: 2.6 Epoch: 1 License: GPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2 -# Source0-md5: b4e0cf31aaf6f755f82b8548bbda9cc3 +Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2 +# Source0-md5: 300fb361af4645dd9b0154ecd18b2256 Patch0: %{name}-fontconfig.patch -Patch1: %{name}-am17.patch +Patch1: %{name}-randr.patch +#Patch2: %{name}-def-apps-capplet.patch +Patch3: %{name}-wm_properties-dir.patch +Patch4: %{name}-additional-metacity-keybinding.patch +Patch5: %{name}-capplets-dir.patch +Patch6: %{name}-dpi.patch +Patch7: %{name}-reduced_resources.patch +Patch8: %{name}-def-apps-capplet-browsers.patch +Patch9: %{name}-evolution.patch +Patch10: %{name}-capplet.patch URL: http://www.gnome.org/ Icon: control-center.gif -BuildRequires: GConf2-devel >= 2.3.2 -BuildRequires: ORBit2-devel >= 2.7.1 -BuildRequires: audiofile >= 0.2.3-3 +BuildRequires: GConf2-devel >= 2.8.0 +BuildRequires: ORBit2-devel >= 1:2.12.0 +BuildRequires: audiofile >= 1:0.2.6 BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -26,29 +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: intltool >= 0.25 -BuildRequires: libbonobo-devel >= 2.2.1 -BuildRequires: libbonoboui-devel >= 2.2.2 -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: gnome-desktop-devel >= 2.8.0 +BuildRequires: gnome-vfs2-devel >= 2.8.0 +BuildRequires: gstreamer-plugins-devel >= 0.8.4 +BuildRequires: gtk+2-devel >= 2:2.4.4 +BuildRequires: intltool >= 0.30 +BuildRequires: libglade2-devel >= 1:2.4.0 +BuildRequires: libgnomeui-devel >= 2.8.0 +BuildRequires: libxml2-devel >= 2.6.13 +BuildRequires: libxklavier-devel >= 1.03 BuildRequires: libtool -BuildRequires: nautilus-devel >= 2.3.5 +BuildRequires: metacity-devel >= 2:2.8.5 +BuildRequires: nautilus-devel >= 2.8.0 BuildRequires: scrollkeeper >= 0.3.12 -BuildRequires: startup-notification-devel -BuildRequires: metacity-devel >= 2.5.1 +BuildRequires: startup-notification-devel >= 0.7 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.8.0 +Obsoletes: acme 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. @@ -88,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} = %{epoch}:%{version} +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel GNOME Control-Center header files. @@ -102,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}-devel = %{epoch}:%{version} +Group: X11/Development/Libraries +Requires: %{name}-devel = %{epoch}:%{version}-%{release} + +%description static +GNOME Control-Center static libraries. -%description static -GNOME Control-Centerp static libraries. - -%description static -l pl -Statyczne biblioteki GNOME Control-Center. +%description static -l pl +Statyczne biblioteki GNOME Control-Center. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .wiget %patch1 -p1 +##%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p0 +%patch9 -p1 +%patch10 -p1 %build glib-gettextize --copy --force @@ -124,7 +143,10 @@ intltoolize --copy --force %{__autoheader} %{__autoconf} %{__automake} -%configure --disable-schemas-install +%configure \ + --disable-schemas-install \ + --enable-gstreamer \ + X_EXTRA_LIBS="-lXext" %{__make} @@ -132,13 +154,15 @@ 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} rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.{a,la} rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{a,la} +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no + %find_lang %{name} --with-gnome --all-name %clean @@ -148,8 +172,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) @@ -158,35 +181,33 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gnome-vfs-2.0/modules/* %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/fontilus-context-menu +%attr(755,root,root) %{_libdir}/gnome-settings-daemon %attr(755,root,root) %{_libdir}/lib*.so.*.* %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/* +%{_iconsdir}/* %{_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