rpms/fedora-logos/devel .cvsignore, 1.86, 1.87 fedora-logos.spec, 1.130, 1.131 sources, 1.100, 1.101
Tom Callaway
spot at fedoraproject.org
Fri Sep 4 19:58:14 UTC 2009
- Previous message (by thread): rpms/fedora-logos/F-11 fedora-logos.spec, 1.129, 1.130 sources, 1.100, 1.101
- Next message (by thread): rpms/etoys/F-10 .cvsignore, 1.6, 1.7 etoys.spec, 1.5, 1.6 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20924/devel
Modified Files:
.cvsignore fedora-logos.spec sources
Log Message:
11.0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore 18 May 2009 20:50:59 -0000 1.86
+++ .cvsignore 4 Sep 2009 19:58:13 -0000 1.87
@@ -1 +1 @@
-fedora-logos-11.0.6.tar.bz2
+fedora-logos-11.0.7.tar.bz2
Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- fedora-logos.spec 24 Jul 2009 22:36:41 -0000 1.130
+++ fedora-logos.spec 4 Sep 2009 19:58:14 -0000 1.131
@@ -1,18 +1,11 @@
Name: fedora-logos
Summary: Fedora-related icons and pictures
-Version: 11.0.6
-Release: 2%{?dist}
+Version: 11.0.7
+Release: 1%{?dist}
Group: System Environment/Base
URL: http://git.fedorahosted.org/git/fedora-logos.git/
Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
-
-# 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
-# replicate the Fedora code as you downloaded it from the Fedora Project
-# website. However, there are permissions granted for the use of these marks
-# under certain other conditions. You may find those permissions at
-# http://fedoraproject.org/wiki/Legal/TrademarkGuidelines and COPYING file.
-License: Not licensed. See COPYING file for trademark permission.
+License: Licensed only for approved usage, see COPYING for details.
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -28,12 +21,17 @@ BuildRequires: kde-filesystem
%description
The fedora-logos package contains image files which incorporate the
-Fedora trademark and the RPM logo (the "Marks").
-The Marks are trademarks or registered trademarks of Red Hat, Inc.
-in the United States and other countries and are used by permission.
+Fedora trademarks (the "Marks"). The Marks are trademarks or registered
+trademarks of Red Hat, Inc. in the United States and other countries and
+are used by permission.
+
+This package and its content may not be distributed with anything but
+unmodified packages from Fedora Project. It can be used in a Fedora Spin,
+but not in a Fedora Remix. If necessary, this package can be replaced by
+the more liberally licensed generic-logos package.
-See the included COPYING file for information on copying and
-redistribution.
+See the included COPYING file for full information on copying and
+redistribution of this package and its contents.
%prep
%setup -q
@@ -43,16 +41,6 @@ redistribution.
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/redhat
-for i in redhat-pixmaps/*; do
- 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 \
- linkfile=`echo $i | sed -e "s/\(.*\)-mini/mini-\1/"` ; \
- ln -s $i $linkfile ; \
-done)
-
# should be ifarch i386
mkdir -p $RPM_BUILD_ROOT/boot/grub
install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
@@ -189,6 +177,9 @@ fi
# end i386 bits
%changelog
+* Fri Sep 4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.7-1
+- Update to 11.0.7, fix license tag, description
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources 18 May 2009 20:50:59 -0000 1.100
+++ sources 4 Sep 2009 19:58:14 -0000 1.101
@@ -1 +1 @@
-2b3c487849e8d94b9f0c2e409f576e5a fedora-logos-11.0.6.tar.bz2
+46f5981c3c8eb412b2d6c7b94bd6618d fedora-logos-11.0.7.tar.bz2
- Previous message (by thread): rpms/fedora-logos/F-11 fedora-logos.spec, 1.129, 1.130 sources, 1.100, 1.101
- Next message (by thread): rpms/etoys/F-10 .cvsignore, 1.6, 1.7 etoys.spec, 1.5, 1.6 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list