rpms/generic-logos/devel .cvsignore, 1.10, 1.11 generic-logos.spec, 1.15, 1.16 sources, 1.12, 1.13
Bill Nottingham
notting at fedoraproject.org
Mon May 3 23:40:20 UTC 2010
Author: notting
Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5248/devel
Modified Files:
.cvsignore generic-logos.spec sources
Log Message:
13.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 30 Oct 2009 20:36:34 -0000 1.10
+++ .cvsignore 3 May 2010 23:40:20 -0000 1.11
@@ -1 +1 @@
-generic-logos-12.2.tar.bz2
+generic-logos-13.0.tar.bz2
Index: generic-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/generic-logos.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- generic-logos.spec 5 Nov 2009 00:23:59 -0000 1.15
+++ generic-logos.spec 3 May 2010 23:40:20 -0000 1.16
@@ -1,19 +1,24 @@
-Name: generic-logos
-Summary: Icons and pictures
-Version: 12.2
-Release: 2%{?dist}
-Group: System Environment/Base
-Source0: generic-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: fedora-logos
-Conflicts: kdebase <= 3.1.5
-Conflicts: anaconda-images <= 10
-Conflicts: redhat-artwork <= 5.0.5
+Name: generic-logos
+Version: 13.0
+Release: 1%{?dist}
+Summary: Icons and pictures
+
+Group: System Environment/Base
+URL: https://fedorahosted.org/generic-logos/
+Source0: https://fedorahosted.org/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
# For _kde4_appsdir macro:
BuildRequires: kde-filesystem
@@ -29,34 +34,35 @@ 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/generic
+mkdir -p %{buildroot}%{_datadir}/firstboot/themes/generic
for i in firstboot/* ; do
- install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/generic
+ install -p -m 644 $i %{buildroot}%{_datadir}/firstboot/themes/generic
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
@@ -64,19 +70,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/*
@@ -90,6 +96,15 @@ rm -rf $RPM_BUILD_ROOT
# end i386 bits
%changelog
+* Mon May 3 2010 Bill Nottingham <notting at redhat.com> - 13.0-1
+- Update for Fedora 13
+
+* Sat Dec 26 2009 Fabian Affolter <fabian at bernewireless.net> - 12.2-3
+- Changed SourceO to upstream link
+- Added URL and README
+- Added version to LGPL of the KDE logo
+- Minor cosmetic layout changes
+
* Wed Nov 4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.2-2
- kde icon installation
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 30 Oct 2009 20:36:34 -0000 1.12
+++ sources 3 May 2010 23:40:20 -0000 1.13
@@ -1 +1 @@
-8ecfc42b1b6a580b42790a191ba714a9 generic-logos-12.2.tar.bz2
+584ed101c01ed5b0c9d9fe697e8a579a generic-logos-13.0.tar.bz2
More information about the scm-commits
mailing list