From 05d8fafb4c84f8fbc6e719f78a2e96d1f6abdfed Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 14 May 2013 10:08:49 +0100 Subject: [PATCH 1/6] Update to 3.8.2 --- .gitignore | 1 + gnome-icon-theme.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6fe5040..0a34de4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ gnome-icon-theme-2.31.0.tar.bz2 /gnome-icon-theme-3.7.4.tar.xz /gnome-icon-theme-3.7.91.tar.xz /gnome-icon-theme-3.8.0.tar.xz +/gnome-icon-theme-3.8.2.tar.xz diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index 2faee3c..dda0bde 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -1,6 +1,6 @@ Summary: GNOME icon theme Name: gnome-icon-theme -Version: 3.8.0 +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 @@ -113,6 +113,9 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %files legacy -f legacy.txt %changelog +* Tue May 14 2013 Richard Hughes - 3.8.2-1 +- Update to 3.8.2 + * Tue Mar 26 2013 Richard Hughes - 3.8.0-1 - Update to 3.8.0 diff --git a/sources b/sources index 38fb0a4..d8a0e45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bd45bea3f5b23bd9872d2148da6fb95 gnome-icon-theme-3.8.0.tar.xz +d645c5a504daa64730dfc083344de1b9 gnome-icon-theme-3.8.2.tar.xz From 8b0c8f0058c861e7048270e62ecd1da2406aa465 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 8 Jun 2013 20:09:50 -0400 Subject: [PATCH 2/6] Drop pkgconfig dep --- gnome-icon-theme.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index dda0bde..27520db 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -1,7 +1,7 @@ Summary: GNOME icon theme Name: gnome-icon-theme Version: 3.8.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -14,7 +14,6 @@ BuildRequires: librsvg2 BuildRequires: intltool BuildRequires: gtk2 Requires: hicolor-icon-theme -Requires: pkgconfig %description This package contains the default icon theme used by the GNOME desktop. @@ -107,12 +106,16 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %files -f files.txt %doc COPYING AUTHORS +%dir %{_datadir}/pkgconfig %{_datadir}/pkgconfig/gnome-icon-theme.pc %ghost %{_datadir}/icons/gnome/icon-theme.cache %files legacy -f legacy.txt %changelog +* Sat Jun 8 2013 Matthias Clasen - 3.8.2-2 +- Drop dep on pkgconfig, instead co-own /usr/share/pkgconfig + * Tue May 14 2013 Richard Hughes - 3.8.2-1 - Update to 3.8.2 From eda30549c837606544b12851fddc4ce78adc7bb4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jun 2013 14:30:45 -0400 Subject: [PATCH 3/6] Add a comment explaining the recent change --- gnome-icon-theme.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index 27520db..a950815 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -106,6 +106,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %files -f files.txt %doc COPYING AUTHORS +# better to co-won this directory than pulling pkgconfig in %dir %{_datadir}/pkgconfig %{_datadir}/pkgconfig/gnome-icon-theme.pc %ghost %{_datadir}/icons/gnome/icon-theme.cache From c038f5e5b56d657cfc7ba32446de11df2b37b61b Mon Sep 17 00:00:00 2001 From: Dan Mashal Date: Tue, 11 Jun 2013 03:07:19 -0700 Subject: [PATCH 4/6] Update spec file --- gnome-icon-theme.spec | 59 +++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index a950815..e94b6f5 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -1,32 +1,45 @@ -Summary: GNOME icon theme -Name: gnome-icon-theme -Version: 3.8.2 -Release: 2%{?dist} +Summary: GNOME icon theme +Name: gnome-icon-theme +Version: 3.8.2 +License: LGPLv2+ +Group: User Interface/Desktops +Release: 3%{?dist} +URL: http://www.gnome.org + #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 -License: GPL+ -BuildArch: noarch -Group: User Interface/Desktops -BuildRequires: icon-naming-utils >= 0.8.7 -BuildRequires: gettext -BuildRequires: librsvg2 + BuildRequires: intltool -BuildRequires: gtk2 +BuildRequires: icon-naming-utils >= 0.8.7 +BuildRequires: gnome-common +BuildRequires: librsvg2-devel +Requires: icon-naming-utils Requires: hicolor-icon-theme +BuildArch: noarch + %description 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} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{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 @@ -106,14 +119,22 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : %files -f files.txt %doc COPYING AUTHORS -# better to co-won this directory than pulling pkgconfig in -%dir %{_datadir}/pkgconfig -%{_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 +* Tue Jun 11 2013 Dan Mashal - 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 - 3.8.2-2 - Drop dep on pkgconfig, instead co-own /usr/share/pkgconfig @@ -326,7 +347,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : * Tue Jun 17 2008 Matthias Clasen - 2.23.2-1 - Update to 2.23.2 -* Thu Apr 16 2008 David Zeuthen - 2.22.0-6 +* Wed Apr 16 2008 David Zeuthen - 2.22.0-6 - Refresh disc icons * Tue Apr 1 2008 David Zeuthen - 2.22.0-5 @@ -381,7 +402,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 -* Wed Dec 21 2006 Matthias Clasen - 2.17.4.1-1 +* Thu Dec 21 2006 Matthias Clasen - 2.17.4.1-1 - Update to 2.17.4.1 * Wed Dec 20 2006 Matthias Clasen - 2.17.4-1 @@ -415,7 +436,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : * Sat Aug 12 2006 Matthias Clasen 2.15.91-1.fc6 - Update to 2.15.91 -* Thu Aug 2 2006 Matthias Clasen 2.15.90-1.fc6 +* Wed Aug 2 2006 Matthias Clasen 2.15.90-1.fc6 - Update to 2.15.90 * Wed Jul 12 2006 Matthias Clasen 2.15.3-1 @@ -507,7 +528,7 @@ gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || : * Thu Mar 17 2005 John (J5) Palmieri - 2.9.92-1 - Update to upstream version 2.9.92 -* Sun Mar 7 2005 Matthias Clasen - 2.9.91-2 +* Mon Mar 7 2005 Matthias Clasen - 2.9.91-2 - Fix %%post * Wed Feb 9 2005 Matthias Clasen - 2.9.91-1 From cd207b3b5238874af74ef6fb6f3fdd5c5c3252f9 Mon Sep 17 00:00:00 2001 From: Dan Mashal Date: Tue, 11 Jun 2013 03:14:55 -0700 Subject: [PATCH 5/6] Update typo --- gnome-icon-theme.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index e94b6f5..2fffa5e 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -10,11 +10,11 @@ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-icon-theme/3.8/%{name}-%{version}.tar.xz Source1: legacy-icon-mapping.xml -BuildRequires: intltool -BuildRequires: icon-naming-utils >= 0.8.7 BuildRequires: gnome-common +BuildRequires: icon-naming-utils >= 0.8.7 +BuildRequires: intltool BuildRequires: librsvg2-devel -Requires: icon-naming-utils +BuildRequires: pkgconfig Requires: hicolor-icon-theme BuildArch: noarch @@ -35,7 +35,7 @@ available under old names. Summary: Development files for gnome-icon-theme Group: Development/Libraries -Requires: %{name}{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for gnome-icon-theme From ffa0f368a1692bcacdca48bc164718e51b777772 Mon Sep 17 00:00:00 2001 From: Dan Mashal Date: Tue, 11 Jun 2013 03:34:32 -0700 Subject: [PATCH 6/6] Update spec file and fix 972372 --- gnome-icon-theme.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec index 2fffa5e..8b18dc7 100644 --- a/gnome-icon-theme.spec +++ b/gnome-icon-theme.spec @@ -11,6 +11,7 @@ Source0: http://download.gnome.org/sources/gnome-icon-theme/3.8/%{name}-%{versio Source1: legacy-icon-mapping.xml BuildRequires: gnome-common +BuildRequires: gtk2-devel BuildRequires: icon-naming-utils >= 0.8.7 BuildRequires: intltool BuildRequires: librsvg2-devel