Updated with Fedora 13 files

diff --git a/COPYING-kde-logo b/COPYING-kde-logo
index 7199d10..3761725 100644 (file)
--- a/COPYING-kde-logo
+++ b/COPYING-kde-logo
@@ -1,4 +1,4 @@
-From http://wiki.kde.org/tiki-index.php?page=KDE+Logo:
+From http://www.kde.org/stuff/clipart.php:
 Trademark License
 Copying of the KDE Logo is subject to the LGPL copyright license.
 Trading and branding with the KDE Logo is subject to our trademark licence:

diff --git a/Makefile b/Makefile
index 93c334e..a4f63b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ tag:
 archive: tag
        @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION).tar
        @bzip2 -f $(NAME)-$(VERSION).tar
-       @echo "The archive is at $(NAME)-$(VERSION).tar.bz2"
+       @echo "$(NAME)-$(VERSION).tar.bz2 created" 
 
 clean:
        rm -f *~ *bz2

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..93989bf
--- /dev/null
+++ b/README
@@ -0,0 +1,8 @@
+parsidora-logos - A replacement for fedora-logos
+==============================================
+
+This package contains various image files which will be used by the bootloader,
+anaconda, and other related tools in Parsidora replacing fedora-logos package.
+
+parsidora-logos is licensed under GPLv2 and LGPl, for more details check
+COPYING and COPYING-kde-logo. 

diff --git a/anaconda/anaconda_header.png b/anaconda/anaconda_header.png
index e46cf3c..cf92ddb 100644 (file)
Binary files a/anaconda/anaconda_header.png and b/anaconda/anaconda_header.png differ

diff --git a/anaconda/progress_first.png b/anaconda/progress_first.png
new file mode 100644 (file)
index 0000000..4ae357d
Binary files /dev/null and b/anaconda/progress_first.png differ

diff --git a/anaconda/splash.png b/anaconda/splash.png
index 8e162d6..4ae357d 100644 (file)
Binary files a/anaconda/splash.png and b/anaconda/splash.png differ

diff --git a/anaconda/syslinux-splash.png b/anaconda/syslinux-splash.png
new file mode 100644 (file)
index 0000000..92bb177
Binary files /dev/null and b/anaconda/syslinux-splash.png differ

diff --git a/anaconda/syslinux-vesa-splash.jpg b/anaconda/syslinux-vesa-splash.jpg
index d7d3c2a..f3efedc 100644 (file)
Binary files a/anaconda/syslinux-vesa-splash.jpg and b/anaconda/syslinux-vesa-splash.jpg differ

diff --git a/bootloader/splash.xpm.gz b/bootloader/splash.xpm.gz
index 3a3686a..e4792e2 100644 (file)
Binary files a/bootloader/splash.xpm.gz and b/bootloader/splash.xpm.gz differ

diff --git a/firstboot/firstboot-left.png b/firstboot/firstboot-left.png
index 2670273..c198b71 100644 (file)
Binary files a/firstboot/firstboot-left.png and b/firstboot/firstboot-left.png differ

diff --git a/firstboot/splash-small.png b/firstboot/splash-small.png
deleted file mode 100644 (file)
index d839dd9..0000000
Binary files a/firstboot/splash-small.png and /dev/null differ

diff --git a/firstboot/workstation.png b/firstboot/workstation.png
index abd6f03..9621802 100644 (file)
Binary files a/firstboot/workstation.png and b/firstboot/workstation.png differ

diff --git a/parsidora-logos.spec b/parsidora-logos.spec
index 5291926..fe3e245 100644 (file)
--- a/parsidora-logos.spec
+++ b/parsidora-logos.spec
@@ -1,20 +1,25 @@
-Name: parsidora-logos
-Summary: Parsidora Icons and pictures
-Version: 12.2
-Release: 1%{?dist}
-Group: System Environment/Base
-Source0: parsidora-logos-%{version}.tar.bz2
-License: GPLv2 and LGPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-Obsoletes: redhat-logos
-Provides: redhat-logos = %{version}-%{release}
-Provides: system-logos = %{version}-%{release}
-Conflicts: generic-logos
-Conflicts: fedora-logos
-Conflicts: kdebase <= 3.1.5
-Conflicts: anaconda-images <= 10
-Conflicts: redhat-artwork <= 5.0.5
+Name:       parsidora-logos
+Version:    13.0
+Release:    1%{?dist}
+Summary:    Parsidora Icons and pictures
+
+Group:      System Environment/Base
+URL:        http://parsidora.ir/parsidora-logos/ 
+Source0:    http://parsidora.ir/released/%{name}/%{name}-%{version}.tar.bz2
+#The KDE Logo is under a LGPL license (no version statement)
+License:    GPLv2 and LGPLv2+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:  noarch
+
+Obsoletes:  redhat-logos
+Provides:   redhat-logos = %{version}-%{release}
+Provides:   system-logos = %{version}-%{release}
+
+Conflicts:  fedora-logos
+Conflicts:  kdebase <= 3.1.5
+Conflicts:  anaconda-images <= 10
+Conflicts:  redhat-artwork <= 5.0.5
+Conflicts:  generic-logos
 # For _kde4_appsdir macro:
 BuildRequires: kde-filesystem
 
@@ -27,34 +32,35 @@ anaconda, and other related tools in Parsidora replacing fedora-logos package.
 %setup -q
 
 %build
+#nothing to build
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # should be ifarch i386
-mkdir -p $RPM_BUILD_ROOT/boot/grub
-install -p -m 644 bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
+mkdir -p %{buildroot}/boot/grub
+install -p -m 644 bootloader/splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/parsidora
+mkdir -p %{buildroot}%{_datadir}/firstboot/themes/parsidora
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/parsidora
+  install -p -m 644 $i %{buildroot}%{_datadir}/firstboot/themes/parsidora
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
+mkdir -p %{buildroot}%{_datadir}/pixmaps/splash
 for i in gnome-splash/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
+  install -p -m 644 $i %{buildroot}%{_datadir}/pixmaps/splash
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/pixmaps
 for i in pixmaps/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
+  install -p -m 644 $i %{buildroot}%{_datadir}/pixmaps
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/48x48/apps/
-install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/48x48/apps/
-mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
-install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
+mkdir -p %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/48x48/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/48x48/apps/
+mkdir -p %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
+install -p -m 644 ksplash/SolarComet-kde.png %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
 for i in plymouth/charge/* ; do
@@ -62,19 +68,19 @@ for i in plymouth/charge/* ; do
 done
 
 # File or directory names do not count as trademark infringement
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
-install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
-install        -p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/Fedora/scalable/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* %{buildroot}%{_datadir}/icons/Fedora/48x48/apps/
+install        -p -m 644 icons/Fedora/scalable/apps/* %{buildroot}%{_datadir}/icons/Fedora/scalable/apps/
 
-(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
+(cd anaconda; make DESTDIR=%{buildroot} install)
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%doc COPYING COPYING-kde-logo
+%defattr(-,root,root,-)
+%doc COPYING COPYING-kde-logo README
 %{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/Fedora/*/apps/*
@@ -88,5 +94,8 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
+* Sat May 15 2010 Hedayat Vatankhah <hedayat@grad.com> - 13.0-1
+- Updated for Fedora 13
+
 * Tue Jan 26 2010 Hedayat Vatankhah <hedayat@grad.com> - 12.2-1
 - Initial version. Forked from generic-logos-12.2-2 package