rpms/redhat-artwork/devel redhat-artwork.spec, 1.198, 1.199 sources, 1.94, 1.95
Ray Strode (rstrode)
fedora-extras-commits at redhat.com
Thu Oct 11 00:51:49 UTC 2007
Author: rstrode
Update of /cvs/pkgs/rpms/redhat-artwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7038
Modified Files:
redhat-artwork.spec sources
Log Message:
- gut package in preparation for its removal
Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- redhat-artwork.spec 9 Oct 2007 02:17:52 -0000 1.198
+++ redhat-artwork.spec 11 Oct 2007 00:51:16 -0000 1.199
@@ -4,21 +4,8 @@
Summary: Artwork for Red Hat default look-and-feel
Name: redhat-artwork
Version: 7.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
URL: http://www.redhat.com
-Source0: %{name}-%{version}.tar.gz
-Source1: post-install-fixup.sh
-Source2: post-install-sources.tar.gz
-Source3: icon-coverage-linker.py
-Source4: coverage-tool-links.xml
-# Add a fedora metatheme
-Source5: index.theme
-Source6: index.theme.icon
-Source7: FedoraFlyingHigh.kcsrc
-Patch0: redhat-artwork-7.0.0-kdm-userlist.patch
-Patch1: redhat-artwork-7.0.0-timed-login.patch
-Patch2: default-theme.patch
-Patch3: redhat-artwork-7.0.0-kwin-bluecurve.patch
Group: User Interface/Desktops
License: GPL+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,38 +15,10 @@
Conflicts: kdebase <= 6:3.0.3-1
Conflicts: gdm <= 2.6.0.8-5
Conflicts: redhat-menus < 5.5.5
-# we don't want to require gtk/qt
-Autoreq: 0
-
-BuildRequires: gtk2-devel >= 2.9.0
-BuildRequires: qt-devel >= 1:3.3.4-10
-BuildRequires: kdebase-devel >= 3.2.0
-BuildRequires: xorg-x11-apps
-BuildRequires: icon-slicer >= 0.3-6
-BuildRequires: netpbm-progs
-# for intltool to work
-BuildRequires: perl-XML-Parser
-# for translations to work
-BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: intltool
-BuildRequires: python
-
-# for splash screens, and a logo in gdm theme
-Requires: gtk2-engines >= 2.9.4-2
-Requires: system-logos
-# for the Mist inheritance in the Fedora icon theme
-Requires: gnome-themes
-# for the Nodoka theme
-Requires: nodoka-theme-gnome
Conflicts: fedora-logos < 6.0.2
Conflicts: redhat-logos < 4.9.3
-# for gtk-update-icon-cache
-Requires(post): gtk2 >= 2.9.0
-# Add some Provides to ease transition to split up
+# Change previously added Provides to Requires now that they've landed
Provides: bluecurve-classic-metacity-theme
Provides: bluecurve-gdm-theme
Provides: bluecurve-gnome-theme
@@ -73,409 +32,42 @@
Provides: fedorainfinity-gdm-theme
Provides: fedora-gnome-theme
Provides: fedora-icon-theme
-Provides: gtk-bluecurve-engine
%description
-redhat-artwork contains the themes and icons that make up the Red Hat default
-look and feel.
+redhat-artwork is an obsolete package that should be removed from the repo.
%package kde
Summary: Artwork specific to KDE
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
-Provides: bluecurve-kde-theme
-Provides: bluecurve-kdm-theme
-Provides: bluecurve-kwin-theme
-Provides: bluecurve-qt-engine
-Provides: fedoradna-kdm-theme
-Provides: fedoraflyinghigh-kdm-theme
+Requires: bluecurve-kde-theme
+Requires: bluecurve-kdm-theme
+Requires: bluecurve-kwin-theme
+Requires: fedoradna-kdm-theme
+Requires: fedoraflyinghigh-kdm-theme
%description kde
-redhat-artwork-kde contains artwork specific to KDE
+redhat-artwork-kde is an obsolete package that should be removed from the repo.
%prep
-%setup -q
-%patch0 -p1 -b .kdm-userlist
-%patch1 -p1 -b .timed-login
-%patch2 -p1 -b .default-theme
-%patch3 -p1 -b .kwin-bluecurve
-
-mkdir post-install
-(cd post-install; tar xzvf %{SOURCE2})
%build
-## this is apparently how Qt finds itself.
-## they need pkg-config gospel.
-unset QTDIR
-echo "Trying to source qt.sh"
-. /etc/profile.d/qt.sh
-echo "QTDIR is $QTDIR"
-export QTDIR
-
-export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
-%configure
-
-export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
-make
-
%install
-rm -rf $RPM_BUILD_ROOT
-export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
-%makeinstall
-
-# Run post-install fixup script
-DATADIR=$RPM_BUILD_ROOT%{_datadir} %{SOURCE1}
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk/themes/engines/*.la
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
-install -m 0644 gtkrc2-default $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtkrc
-
-%find_lang %{po_package}
-
-%{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve %{SOURCE4}
-
-# add a Fedora metatheme
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/Fedora
-cp %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/themes/Fedora/index.theme
-
-# add a Fedora icon theme
-for i in 16 24 32 36 48 96; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
-done
-cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/index.theme
-
-# we want to own the icon caches
-touch $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/icon-theme.cache
-touch $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/icon-theme.cache
-
-# start-here.png gets provided by fedora-logos
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/*/mimetypes/start-here.png
-
-#symlink some icons so we can handle some of the new added icons
-#this should be added to our upstream sources
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/apps
-
-# link upstream icon names to the redhat ones in bluecurve
-# FIXME: the ones with -sf need to be removed upstream
-for d in 48x48 32x32 24x24 16x16; do
- pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$d/apps
- ln -s icon-db-user.png openofficeorg-base.png
- ln -s redhat-spreadsheet.png openofficeorg-calc.png
- ln -s icon-vector-editor.png openofficeorg-draw.png
- ln -s redhat-presentations.png openofficeorg-impress.png
- ln -s icon-calculator.png openofficeorg-math.png
- ln -s redhat-word-processor.png openofficeorg-writer.png
- ln -s redhat-accessories.png gnome-util.png
- ln -sf redhat-programming.png gnome-devel.png
- ln -sf redhat-games.png gnome-joystick.png
- ln -s redhat-graphics.png gnome-graphics.png
- ln -sf redhat-internet.png gnome-globe.png
- ln -sf redhat-sound_video.png gnome-multimedia.png
- ln -sf redhat-office.png gnome-applications.png
- ln -sf redhat-preferences.png gnome-settings.png
- ln -sf redhat-system_settings.png gnome-system.png
- popd
-done
-popd
-
-# We need the Openoffice icons for the menus
-for d in 48x48 32x32 24x24 16x16; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/$d/apps
- srcdir=$RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$d/apps
- destdir=$RPM_BUILD_ROOT%{_datadir}/icons/Fedora/$d/apps
- cp ${srcdir}/openofficeorg-base.png ${destdir}
- cp ${srcdir}/openofficeorg-calc.png ${destdir}
- cp ${srcdir}/openofficeorg-draw.png ${destdir}
- cp ${srcdir}/openofficeorg-impress.png ${destdir}
- cp ${srcdir}/openofficeorg-math.png ${destdir}
- cp ${srcdir}/openofficeorg-writer.png ${destdir}
-done
-
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems
-ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png
-popd
-
-# link upstream icon names to the redhat ones in bluecurve
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/
- for s in 16x16 20x20 24x24 32x32 36x36 48x48 64x64 96x96; do
- pushd $s/apps/ 2> /dev/null || continue
- ln -sf redhat-office.png package_wordprocessing.png
- ln -sf redhat-internet.png package_network.png
- ln -sf redhat-accessories.png package_applications.png
- ln -sf redhat-graphics.png package_graphics.png
- ln -sf redhat-games.png package_games.png
- ln -sf redhat-sound_video.png multimedia.png
- ln -sf redhat-preferences.png package_settings.png
- ln -sf redhat-programming.png package_development.png
- ln -sf redhat-system_tools.png package_utilities.png
- ln -sf redhat-system_settings.png package_system.png
- ln -sf redhat-tools.png package_utilities.png
- # app icons
- ln -sf redhat-email.png kmail.png
- ln -sf redhat-web-browser.png konqueror.png
- ln -sf redhat-filemanager.png kfm.png
- ln -sf redhat-home.png kfm_home.png
- ln -sf redhat-logviewer.png kviewshell.png
- ln -sf system-logviewer.png logviewer.png
- # system settings
- ln -sf system-config-soundcard.png multimedia.png
- popd
- done
-popd
-
-function flip_icon () {
- pngtopnm $1.png > $1.rgb
- pngtopnm -alpha $1.png > $1.alpha
- pamstack $1.rgb $1.alpha > $1.pam
- pamflip -lr $1.pam > $2.pam
- pamrgbatopng $2.pam > $2.png
- rm -f $1.rgb $1.alpha $1.pam $2.pam
-}
-
-function ln_icon () {
- if [ -f $1.png ]; then
- ln -s $1.png $2.png
- fi
- if [ -f $1.icon ]; then
- ln -s $1.icon $2.icon
- fi
- if [ -f $1.svg ]; then
- ln -s $1.svg $2.svg
- fi
-}
-
-# link gtk stock icon names to bluecurve ones
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/
- for s in 16x16 24x24 36x36 48x48; do
- if pushd $s/filesystems/ >&/dev/null; then
- ln_icon gnome-fs-directory gtk-directory
- ln_icon gnome-fs-network gtk-network
- popd
- fi
- if pushd $s/mimetypes/ >&/dev/null; then
- ln_icon file-container gtk-file
- ln_icon harddrive gtk-harddisk
- popd
- fi
- if pushd $s/stock/ >&/dev/null; then
- ln_icon stock-about gtk-about
- ln_icon stock-connect gtk-connect
- ln_icon stock-disconnect gtk-disconnect
- ln_icon stock-edit gtk-edit
- ln_icon stock-media-ffwd gtk-media-forward-ltr
- ln_icon stock-media-rewind gtk-media-forward-rtl
- ln_icon stock-media-next gtk-media-next-ltr
- ln_icon stock-media-prev gtk-media-next-rtl
- ln_icon stock-media-pause gtk-media-pause
- ln_icon stock-media-play gtk-media-play-ltr
- ln_icon stock-media-prev gtk-media-previous-ltr
- ln_icon stock-media-next gtk-media-previous-rtl
- ln_icon stock-media-rec gtk-media-record
- ln_icon stock-media-rewind gtk-media-rewind-ltr
- ln_icon stock-media-ffwd gtk-media-rewind-rtl
- ln_icon stock-media-stop gtk-media-stop
- ln_icon stock-undo gtk-undo-ltr
- ln_icon stock-redo gtk-redo-ltr
- ln_icon stock-font gtk-select-font
- flip_icon stock-media-play gtk-media-play-rtl
- flip_icon stock-undo gtk-undo-rtl
- flip_icon stock-redo gtk-redo-rtl
- popd
- fi
- done
- pushd 48x48/stock/ >&/dev/null || continue
- ln_icon stock-lockscreen gtk-dialog-authentication
- popd
-popd
-
-
-# link icon-naming spec names to bluecurve ones
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/
- for s in 16x16 20x20 24x24 32x32 36x36 48x48 64x64 96x96; do
- if pushd $s/filesystems/ >&/dev/null; then
- ln_icon gnome-fs-trash-empty user-trash
- ln_icon gnome-fs-trash-full user-trash-full
- popd
- fi
- if pushd $s/stock/ >&/dev/null; then
- ln_icon stock-properties document-properties
- ln_icon stock-find-and-replace edit-find-and-replace
- ln_icon stock-undo edit-undo
- ln_icon stock-justify-center format-justify-center
- ln_icon stock-justify-fill format-justify-fill
- ln_icon stock-justify-left format-justify-left
- ln_icon stock-justify-right format-justify-right
- ln_icon stock-strikethrough format-text-strikethrough
- ln_icon stock-underline format-text-underline
- ln_icon stock-goto-bottom go-bottom
- ln_icon stock-go-down go-down
- ln_icon stock-goto-first go-first
- ln_icon stock-goto-last go-last
- ln_icon stock-jump-to go-jump
- ln_icon stock-go-forward go-next
- ln_icon stock-go-back go-previous
- ln_icon stock-go-up go-up
- ln_icon stock-goto-top go-top
- ln_icon stock-zoom-fit zoom-best-fit
- ln_icon stock-quit system-log-out
- ln_icon stock-quit application-exit
- ln_icon stock-apply dialog-ok
- ln_icon stock-close dialog-close
- ln_icon stock-cancel dialog-cancel
- ln_icon stock-bookmark-page bookmark-new
- ln_icon stock-new document-new
- ln_icon stock-open document-open
- ln_icon stock-open document-open-recent
- ln_icon stock-print document-print
- ln_icon stock-print-preview document-print-preview
- ln_icon stock-save document-save
- ln_icon stock-save-as document-save-as
- ln_icon stock-copy edit-copy
- ln_icon stock-cut edit-cut
- ln_icon stock-delete edit-delete
- ln_icon stock-paste edit-paste
- ln_icon stock-bold format-text-bold
- ln_icon stock-italic format-text-italic
- ln_icon stock-mic audio-input-microphone
- ln_icon stock-about help-about
- ln_icon stock-book help-contents
- ln_icon stock-missing-image image-missing
- ln_icon stock-media-pause media-playback-pause
- ln_icon stock-media-play media-playback-start
- ln_icon stock-media-stop media-playback-stop
- ln_icon stock-media-rec media-record
- ln_icon stock-media-rewind media-seek-backward
- ln_icon stock-media-ffwd media-seek-forward
- ln_icon stock-media-prev media-skip-backward
- ln_icon stock-media-next media-skip-forward
- popd
- fi
- if pushd $s/mimetypes/ >&/dev/null; then
- ln_icon harddrive drive-harddisk
- ln_icon cd drive-removable-media
- ln_icon cd drive-optical
- ln_icon floppy media-floppy
- ln_icon cd media-optical
- ln_icon dvd media-flash
- ln_icon folder-home user-home
- ln_icon file-font font-x-generic
- ln_icon file-gfx image-x-generic
- ln_icon file-video video-x-generic
- ln_icon file text-x-generic
- ln_icon file text-x-generic-template
- ln_icon file-executable text-x-script
- ln_icon file-launcher application-x-executable
- ln_icon file-wordprocessor x-office-document
- ln_icon file-presentation x-office-presentation
- ln_icon file-spreadsheet x-office-spreadsheet
- # FIXME
- ln_icon file-wordprocessor x-office-calendar
- ln_icon file-wordprocessor x-office-address-book
- popd
- fi
- if pushd $s/apps/ >&/dev/null; then
- ln_icon icon-calculator accessories-calculator
- ln_icon icon-character-map accessories-character-map
- ln_icon icon-documentation accessories-dictionary
- ln_icon icon-notepad accessories-text-editor
- ln_icon icon-accessories applications-accessories
- ln_icon icon-development applications-development
- ln_icon icon-games applications-games
- ln_icon icon-help help-browser
- ln_icon icon-help system-help
- ln_icon icon-gfx applications-graphics
- ln_icon icon-network applications-internet
- ln_icon icon-media applications-multimedia
- ln_icon icon-office applications-office
- ln_icon icon-system-configuration applications-system
- ln_icon icon-computer computer
- ln_icon icon-system-settings preferences-desktop
- ln_icon icon-accessibility preferences-desktop-accessibility
- ln_icon icon-fonts preferences-desktop-font
- ln_icon icon-keyboard preferences-desktop-keyboard
- ln_icon icon-languages preferences-desktop-locale
- ln_icon icon-sound preferences-desktop-multimedia
- # preferences-desktop-peripherals
- ln_icon icon-user preferences-desktop-personal
- # preferences-desktop-screensaver
- ln_icon icon-themes preferences-desktop-theme
- ln_icon icon-background-picture preferences-desktop-wallpaper
- ln_icon icon-system-configuration preferences-system
- ln_icon icon-network preferences-system-network
- ln_icon gpm-primary-80 battery
- ln_icon gpm-primary-20 battery-caution
- ln_icon gpm-primary-10 battery-low
- ln_icon camera camera-photo
- ln_icon icon-games input-gaming
- ln_icon icon-keyboard input-keyboard
- ln_icon icon-mouse input-mouse
- ln_icon icon-systemhealth utilities-system-monitor
- popd
- fi
- if pushd $s/mimetypes/ >&/dev/null; then
- ln_icon stock_insert_image insert-image
- ln_icon stock_insert_url insert-link
- ln_icon stock_insert_ole-object insert-object
- popd
- fi
- done
- # some 48 only icons
- if pushd 48x48/stock/ >&/dev/null; then
- ln_icon stock-lockscreen dialog-password
- ln_icon dialog-info dialog-information
- fi
-popd
-
-# save some space
-pushd $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/FedoraFlyingHigh
- rm -f background.jpg
- ln -s ../../../../gdm/themes/FedoraFlyingHigh/background.jpg .
-popd
-
-# color scheme for FedoraFlyingHigh
-install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/apps/kdisplay/color-schemes/
%clean
rm -rf $RPM_BUILD_ROOT
%post
-for dir in /usr/share/icons/*; do
- if test -d "$dir"; then
- if test -f "$dir/index.theme"; then
- /usr/bin/gtk-update-icon-cache --quiet "$dir"
- fi
- fi
-done
-
-%files -f %{po_package}.lang
-%defattr(-,root,root)
-%doc NEWS ChangeLog README COPYING
-
-%{_datadir}/themes/*
-%{_datadir}/gdm/themes/*
-%{_datadir}/icons/*
-%ghost %{_datadir}/icons/Fedora/icon-theme.cache
-%ghost %{_datadir}/icons/Bluecurve/icon-theme.cache
-%{_datadir}/pixmaps/*
-%{_datadir}/xmms
-%{_libdir}/gtk-2.0/2.10.0/engines/*
-%config %{_sysconfdir}/gtk-2.0/gtkrc
+
+%files
%files kde
-%defattr(-,root,root)
-%{_libdir}/kde3
-%{_libdir}/%{qtdir}
-%{_datadir}/apps/kdisplay/color-schemes/Bluecurve.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/FedoraFlyingHigh.kcsrc
-%{_datadir}/apps/kdm/themes/Bluecurve
-%{_datadir}/apps/kdm/themes/Fedora*
-%{_datadir}/apps/kstyle/themes/Bluecurve.themerc
-%{_datadir}/apps/kwin/bluecurve.desktop
%changelog
+* Wed Oct 10 2007 Ray Strode <rstrode at redhat.com> - 7.0.0-15
+- gut package in preparation for its removal
+
* Mon Oct 8 2007 Matthias Clasen <mclasen at redhat.com> - 7.0.0-14
- Make the defaul theme not show up as "Custom"
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources 8 May 2007 19:58:49 -0000 1.94
+++ sources 11 Oct 2007 00:51:16 -0000 1.95
@@ -1,3 +1 @@
-cd630f83371dd14cf01a3767caa24da0 RHEL-gdm-theme-0.2.tar.gz
-7822151af66b493e76dda4f6c4afbe33 post-install-sources.tar.gz
-c36f016518d0b81338486bc5d28d097e redhat-artwork-7.0.0.tar.gz
+
More information about the fedora-extras-commits
mailing list