rpms/fedora-logos/devel fedora-logos-8.99.2-ksplash_FedoraWaves.patch, NONE, 1.1 fedora-logos.spec, 1.102, 1.103
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Apr 10 14:04:12 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157
Modified Files:
fedora-logos.spec
Added Files:
fedora-logos-8.99.2-ksplash_FedoraWaves.patch
Log Message:
* Thu Apr 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 8.99.2-2
- kde-splash: rename to FedoraWaves, fixup animation
- include start-here icons for Fedora-KDE icon theme
fedora-logos-8.99.2-ksplash_FedoraWaves.patch:
--- NEW FILE fedora-logos-8.99.2-ksplash_FedoraWaves.patch ---
diff -up fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt.FedoraWaves fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt
--- fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt.FedoraWaves 2008-04-02 10:13:27.000000000 -0500
+++ fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt 2008-04-09 13:55:07.000000000 -0500
@@ -2,19 +2,19 @@ SCALE OFF
GEOMETRY_REL CC 0 0 CC 490 278
IMAGE 0 0 background.png
-WAIT_STATE kded
ANIM 1 193 215 11 kded.png 25 1
+WAIT_STATE kded
-WAIT_STATE confupdate
ANIM 2 218 215 11 confupdate.png 25 1
+WAIT_STATE confupdate
-WAIT_STATE kcminit
ANIM 3 243 215 11 kcminit.png 25 1
+WAIT_STATE kcminit
+ANIM 4 268 215 11 ksmserver.png 25 1
WAIT_STATE ksmserver
-ANIM 3 268 215 11 ksmserver.png 25 1
+ANIM 5 293 215 11 wm.png 25 1
WAIT_STATE wm
-ANIM 3 293 215 11 wm.png 25 1
-WAIT_STATE desktop
\ No newline at end of file
+WAIT_STATE desktop
diff -up fedora-logos-8.99.2/Makefile.FedoraWaves fedora-logos-8.99.2/Makefile
--- fedora-logos-8.99.2/Makefile.FedoraWaves 2008-04-02 10:13:27.000000000 -0500
+++ fedora-logos-8.99.2/Makefile 2008-04-10 08:41:13.000000000 -0500
@@ -22,7 +22,7 @@ archive:
mkdir -p $$DISTDIR/firstboot ; \
mkdir -p $$DISTDIR/rhgb ; \
mkdir -p $$DISTDIR/gnome-splash ; \
- mkdir -p $$DISTDIR/kde-splash/Waves/1600x1200 ; \
+ mkdir -p $$DISTDIR/kde-splash/FedoraWaves/1600x1200 ; \
mkdir -p $$DISTDIR/pixmaps ; \
mkdir -p $$DISTDIR/gdm ; \
mkdir -p $$DISTDIR/anaconda ; \
@@ -44,8 +44,8 @@ archive:
cp -f $$SRCDIR/firstboot/*.png firstboot ; \
cp -f $$SRCDIR/rhgb/*.png rhgb ; \
cp -f $$SRCDIR/gnome-splash/*.png gnome-splash ; \
- cp -f $$SRCDIR/kde-splash/Waves/* kde-splash/Waves/ ; \
- cp -f $$SRCDIR/kde-splash/Waves/1600x1200/* kde-splash/Waves/1600x1200; \
+ cp -f $$SRCDIR/kde-splash/FedoraWaves/* kde-splash/FedoraWaves/ ; \
+ cp -f $$SRCDIR/kde-splash/FedoraWaves/1600x1200/* kde-splash/FedoraWaves/1600x1200; \
cp -f $$SRCDIR/pixmaps/*.{png,svg} pixmaps ; \
cp -af $$SRCDIR/gdm/* gdm; \
cp -f $$SRCDIR/anaconda/* anaconda ; \
Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fedora-logos.spec 2 Apr 2008 15:18:18 -0000 1.102
+++ fedora-logos.spec 10 Apr 2008 14:03:03 -0000 1.103
@@ -1,9 +1,10 @@
Name: fedora-logos
Summary: Fedora-related icons and pictures
Version: 8.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Base
Source0: fedora-logos-%{version}.tar.bz2
+Patch1: fedora-logos-8.99.2-ksplash_FedoraWaves.patch
# The trademarks contained in this file are the property of Red Hat, Inc. No
# license to these trademarks is provided or is necessary if you merely
@@ -35,6 +36,9 @@
%prep
%setup -q
+mv kde-splash/Waves kde-splash/FedoraWaves
+%patch1 -p1 -b .ksplash_FedoraWaves
+
%build
%install
@@ -42,7 +46,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
for i in redhat-pixmaps/*; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
done
(cd $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat; \
for i in *-mini.xpm; do \
@@ -52,62 +56,62 @@
# should be ifarch i386
mkdir -p $RPM_BUILD_ROOT/boot/grub
-install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
+install -p -m 644 -D bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
# end i386 bits
mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-waves
for i in firstboot/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-waves
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-waves
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/rhgb
for i in rhgb/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/rhgb
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/rhgb
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
for i in gnome-splash/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
for i in gnome-screensaver/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
for i in applications/screensavers/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
done
#mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
#for i in backgrounds/images/* ; do
-# install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
+# install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
#done
#
#mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
#for i in backgrounds/*.xml ; do
-# install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
+# install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
#done
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/Waves/1600x1200
-for i in kde-splash/Waves/{Theme.rc,Preview.png} ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/Waves
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/FedoraWaves/1600x1200
+for i in kde-splash/FedoraWaves/{Theme.rc,Preview.png} ; do
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/FedoraWaves
done
-for i in kde-splash/Waves/1600x1200/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/Waves/1600x1200
+for i in kde-splash/FedoraWaves/1600x1200/* ; do
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/kde4/apps/ksplash/Themes/FedoraWaves/1600x1200
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
for i in pixmaps/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
done
for size in 16x16 24x24 32x32 36x36 48x48 96x96 ; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$size/apps
for i in icons/hicolor/$size/apps/* ; do
- install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps
+ install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps
pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$size/apps
ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png icon-panel-menu.png
ln -s ../../../hicolor/$size/apps/fedora-logo-icon.png gnome-main-menu.png
@@ -124,7 +128,9 @@
for i in 16 24 32 36 48 96; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
- cp $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places/start-here.png
+ # why not use (sym)links like Bluecurve above? -- Rex
+ install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places/start-here.png
+ install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/${i}x${i}/places/start-here.png
done
%clean
@@ -134,6 +140,7 @@
touch --no-create %{_datadir}/icons/hicolor || :
touch --no-create %{_datadir}/icons/Bluecurve || :
touch --no-create %{_datadir}/icons/Fedora || :
+touch --no-create %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE ||:
if [ -x /usr/bin/gtk-update-icon-cache ]; then
if [ -f %{_datadir}/icons/hicolor/index.theme ]; then
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -151,6 +158,7 @@
%doc COPYING
%{_datadir}/firstboot/themes/fedora-waves
%{_datadir}/kde4/apps/ksplash/Themes/*
+%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
%{_datadir}/pixmaps/*
%{_datadir}/rhgb/*
%{_datadir}/anaconda/pixmaps/*
@@ -173,6 +181,10 @@
# end i386 bits
%changelog
+* Thu Apr 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 8.99.2-2
+- kde-splash: rename to FedoraWaves, fixup animation
+- include start-here icons for Fedora-KDE icon theme
+
* Wed Apr 2 2008 Ray Strode <rstrode at redhat.com> - 8.99.2-1
- firstboot changed artwork locations
More information about the fedora-extras-commits
mailing list