OBS User unknown 2008-08-28 15:19:30 +00:00 committed by Git OBS Bridge
parent a3e82c0987
commit 4b622db7bb
2 changed files with 24 additions and 7 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 28 14:27:42 CEST 2008 - ro@suse.de
- fix build: sound settings are not being built at the moment
(configure does not find CANBERRA)
skip the update-desktop-file if it is not being installed
- vfs-methods have been removed, remove in filelist as well
-------------------------------------------------------------------
Wed Aug 20 14:13:32 CEST 2008 - sbrabec@suse.cz

View File

@ -26,7 +26,7 @@ Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.23.6
Release: 4
Release: 5
Summary: The GNOME Control Center
Source: gnome-%{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
@ -143,7 +143,9 @@ cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
### % # suse $ _update_desktop_file font-properties X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-passwd X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
if test -f $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-settings-sound.desktop ; then
%suse_update_desktop_file gnome-settings-sound X-SuSE-ControlCenter-System
fi
%suse_update_desktop_file gnome-network-preferences X-SuSE-ControlCenter-System
%suse_update_desktop_file gnome-appearance-properties X-SuSE-ControlCenter-LookAndFeel
### % # suse $ _update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties X-SuSE-ControlCenter-LookAndFeel
@ -151,7 +153,7 @@ cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
%suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal
%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel
rm $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
#mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/display-capplet.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
cp control-center-art/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
%if %suse_version <= 1020
@ -161,7 +163,7 @@ cp -a ../permissions/* $RPM_BUILD_ROOT/etc/permissions.d
%find_lang gnome-%{_name}-2.0
%find_gconf_schemas
cat %{name}.schemas_list >gnome-%{name}.lst
rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
rm -f $RPM_BUILD_ROOT%{_libdir}/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%fdupes $RPM_BUILD_ROOT
%clean
@ -198,7 +200,8 @@ fi
%dir %{_datadir}/gnome/help/control-center
%dir %{_datadir}/gnome/help/control-center/*
%{_datadir}/gnome/help/control-center/*/*.xml
%{_datadir}/gnome-control-center/gnome-default-applications.xml
%dir %{_datadir}/gnome-control-center/default-apps
%{_datadir}/gnome-control-center/default-apps/gnome-default-applications.xml
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%dir %{_datadir}/gnome-control-center/keybindings
@ -211,12 +214,12 @@ fi
%dir %{_datadir}/gnome-control-center/pixmaps
%{_datadir}/gnome-control-center/pixmaps/*.png
%{_libdir}/*.so.*
%{_libdir}/gnome-vfs-2.0/modules/*.so
%{_libdir}/nautilus/extensions-2.0/*.so
#%{_libdir}/gnome-vfs-2.0/modules/*.so
#%{_libdir}/nautilus/extensions-2.0/*.so
%dir %{_libdir}/window-manager-settings
%{_libdir}/window-manager-settings/*.so
%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd
%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
#%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
%{_sysconfdir}/xdg/menus/gnomecc.menu
%{_sysconfdir}/pam.d/gnome-passwd
%if %suse_version <= 1020
@ -232,8 +235,14 @@ fi
%{_libdir}/lib*.so
%{_libdir}/lib*.*a
%{_libdir}/pkgconfig/*.pc
%{_datadir}/pkgconfig/*.pc
%changelog
* Thu Aug 28 2008 ro@suse.de
- fix build: sound settings are not being built at the moment
(configure does not find CANBERRA)
skip the update-desktop-file if it is not being installed
- vfs-methods have been removed, remove in filelist as well
* Wed Aug 20 2008 sbrabec@suse.cz
- Require gnome-menus - gnome-control-center binary requires
/etc/xdg/menus/preferences.menu.