[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/redhat-artwork/FC-6 redhat-artwork.spec,1.160,1.161



Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20910

Modified Files:
	redhat-artwork.spec 
Log Message:
improve coverage



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/FC-6/redhat-artwork.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- redhat-artwork.spec	27 Sep 2006 16:21:03 -0000	1.160
+++ redhat-artwork.spec	14 Oct 2006 05:55:08 -0000	1.161
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.8
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -29,6 +29,7 @@
 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
@@ -129,7 +130,7 @@
 
 # link upstream icon names to the redhat ones in bluecurve
 pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/
-  for s in 16x16 22x22 32x32 48x48 128x128; do
+  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
@@ -155,6 +156,203 @@
   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/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 
+      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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -162,7 +360,7 @@
 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
+      /usr/bin/gtk-update-icon-cache --quiet "$dir"
     fi
   fi
 done
@@ -185,6 +383,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Sat Oct 14 2006 Matthias Clasen <mclasen redhat com> 5.0.8-2
+- Improve coverage of Bluecurve 
+
 * Wed Sep 27 2006 Matthias Clasen <mclasen redhat com> 5.0.8-1
 - Update FedoraDNA theme description
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]