[gnome-icon-theme/f19] Revert recent packaging changes for F19

Kalev Lember kalev at fedoraproject.org
Sat Jun 15 11:39:23 UTC 2013


commit 9b8a17f1d20ead8cb15e9eff096cb7566071dc3d
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Jun 15 13:30:17 2013 +0200

    Revert recent packaging changes for F19
    
    The F19 freeze is upon us, it's too late to ship a separate -devel
    package. The gnome-icon-theme Bodhi update was already unpushed; this
    now reverts the changes in git as well to the version we actually ended
    up shipping with.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=972372

 gnome-icon-theme.spec |   65 +++++++++++++-----------------------------------
 1 files changed, 18 insertions(+), 47 deletions(-)
---
diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 5b6471e..f747499 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,24 +1,20 @@
-Summary:    GNOME icon theme
-Name:       gnome-icon-theme
-Version:    3.8.2
-License:    LGPLv3+
-Group:      User Interface/Desktops
-Release:    4%{?dist}
-URL:        http://www.gnome.org
-
+Summary: GNOME icon theme
+Name: gnome-icon-theme
+Version: 3.8.2
+Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/gnome-icon-theme
 Source0: http://download.gnome.org/sources/gnome-icon-theme/3.8/%{name}-%{version}.tar.xz
 Source1: legacy-icon-mapping.xml
-
-BuildRequires: gnome-common
-BuildRequires: gtk2-devel
+License: GPL+
+BuildArch: noarch
+Group: User Interface/Desktops
 BuildRequires: icon-naming-utils >= 0.8.7
+BuildRequires: gettext
+BuildRequires: librsvg2
 BuildRequires: intltool
-BuildRequires: librsvg2-devel
-BuildRequires: pkgconfig
+BuildRequires: gtk2
 Requires: hicolor-icon-theme
-
-BuildArch: noarch
+Requires: pkgconfig
 
 %description
 This package contains the default icon theme used by the GNOME desktop.
@@ -26,21 +22,12 @@ This package contains the default icon theme used by the GNOME desktop.
 %package legacy
 Summary: Old names for icons in gnome-icon-theme
 Group: User Interface/Desktops
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description legacy
 This package contains symlinks to make the icons in gnome-icon-theme
 available under old names.
 
-%package devel
-
-Summary: Development files for gnome-icon-theme
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-Development files for gnome-icon-theme
-
 %prep
 %setup -q
 
@@ -120,29 +107,13 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 
 %files -f files.txt
 %doc COPYING AUTHORS
+%{_datadir}/pkgconfig/gnome-icon-theme.pc
 %ghost %{_datadir}/icons/gnome/icon-theme.cache
 
 %files legacy -f legacy.txt
 
-%files devel
-%{_datadir}/pkgconfig/gnome-icon-theme.pc
-
 %changelog
-* Wed Jun 12 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 3.8.2-4
-- Update license to LGPLv3+
-
-* Tue Jun 11 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 3.8.2-3
-- Split pc file into devel package properly as per guidelines (972372)
-- Update to proper license (LGPLv2+)
-- Update BR's (use gnome-common)
-- Update bogus changelog dates
-- Make spec file easier to read
-- Add missing url tag
-
-* Sat Jun  8 2013 Matthias Clasen <mclasen at redhat.com> - 3.8.2-2
-- Drop dep on pkgconfig, instead co-own /usr/share/pkgconfig
-
-* Tue May 14 2013 Richard Hughes <rhughes at redhat.com> - 3.8.2-1
+* Mon May 13 2013 Richard Hughes <rhughes at redhat.com> - 3.8.2-1
 - Update to 3.8.2
 
 * Tue Mar 26 2013 Richard Hughes <rhughes at redhat.com> - 3.8.0-1
@@ -351,7 +322,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 * Tue Jun 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.2-1
 - Update to 2.23.2
 
-* Wed Apr 16 2008 David Zeuthen <davidz at redhat.com> - 2.22.0-6
+* Thu Apr 16 2008 David Zeuthen <davidz at redhat.com> - 2.22.0-6
 - Refresh disc icons
 
 * Tue Apr  1 2008 David Zeuthen <davidz at redhat.com> - 2.22.0-5
@@ -406,7 +377,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 * Wed Jan 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.5-1
 - Update to 2.17.5
 
-* Thu Dec 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.4.1-1
+* Wed Dec 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.4.1-1
 - Update to 2.17.4.1
 
 * Wed Dec 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.4-1
@@ -440,7 +411,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 * Sat Aug 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.91-1.fc6
 - Update to 2.15.91
 
-* Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> 2.15.90-1.fc6
+* Thu Aug  2 2006 Matthias Clasen <mclasen at redhat.com> 2.15.90-1.fc6
 - Update to 2.15.90
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
@@ -532,7 +503,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 * Thu Mar 17 2005 John (J5) Palmieri <johnp at redhat.com> - 2.9.92-1
 - Update to upstream version 2.9.92
 
-* Mon Mar  7 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.91-2
+* Sun Mar  7 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.91-2
 - Fix %%post 
 
 * Wed Feb  9 2005 Matthias Clasen <mclasen at redhat.com> - 2.9.91-1


More information about the scm-commits mailing list