[mate-icon-theme] 1.6.2-0.2.git
Rex Dieter
rdieter at fedoraproject.org
Mon Aug 26 15:07:18 UTC 2013
commit 1fdf628098496159e5de7cb0902c474e0050b67c
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Aug 26 10:07:09 2013 -0500
1.6.2-0.2.git
- drop -devel subpkg (for just a pkgconfig file)
- move pkgconfig back to datadir
mate-icon-theme-pkgconfig_dir.patch | 12 ++++++++++++
mate-icon-theme.spec | 27 ++++++++++++++++++---------
2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/mate-icon-theme-pkgconfig_dir.patch b/mate-icon-theme-pkgconfig_dir.patch
new file mode 100644
index 0000000..58ae465
--- /dev/null
+++ b/mate-icon-theme-pkgconfig_dir.patch
@@ -0,0 +1,12 @@
+diff -up mate-icon-theme-bb3711a/Makefile.am.pkgconfig_dir mate-icon-theme-bb3711a/Makefile.am
+--- mate-icon-theme-bb3711a/Makefile.am.pkgconfig_dir 2013-08-25 08:18:57.000000000 -0500
++++ mate-icon-theme-bb3711a/Makefile.am 2013-08-26 10:04:35.644972478 -0500
+@@ -83,7 +83,7 @@ install-data-local:
+ touch $(DESTDIR)$(themedir); \
+ fi
+
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(datadir)/pkgconfig
+ pkgconfig_DATA = mate-icon-theme.pc
+
+ EXTRA_DIST = \
diff --git a/mate-icon-theme.spec b/mate-icon-theme.spec
index 121df13..7a2e9dc 100644
--- a/mate-icon-theme.spec
+++ b/mate-icon-theme.spec
@@ -2,7 +2,7 @@
Name: mate-icon-theme
Version: 1.6.2
-Release: 0.1.git%{_internal_version}%{?dist}
+Release: 0.2.git%{_internal_version}%{?dist}
Summary: Icon theme for MATE Desktop
License: GPLv2+ and LGPLv2+
URL: http://mate-desktop.org
@@ -13,21 +13,26 @@ Source0: http://raveit65.fedorapeople.org/Mate/git-uptream/%{name}-%{versi
BuildArch: noarch
+# revert incorrect (imo) upstream commit wrt pkgconfig dir
+# https://github.com/mate-desktop/mate-icon-theme/commit/75b8c0524de04928ea8cf2c1c8859d6abd4d0459
+Patch1: mate-icon-theme-pkgconfig_dir.patch
+
BuildRequires: mate-common
BuildRequires: icon-naming-utils
+Obsoletes: mate-icon-theme-devel < 1.6.2-0.2
+Provides: mate-icon-theme-devel = %{version}-%{release}
+# ship a .pc file but avoid a dep on pkg-config
+%global __requires_exclude pkg-config
+
%description
Icon theme for MATE Desktop
-%package devel
-Summary: Development files for mate-icon-theme
-
-%description devel
-Development files for mate-icon-theme
%prep
%setup -q -n %{name}-%{_internal_version}
+%patch1 -p1 -b .pkgconfig_dir
NOCONFIGURE=1 ./autogen.sh
%build
@@ -60,12 +65,16 @@ fi
%doc AUTHORS COPYING README
%{_datadir}/icons/mate
%{_datadir}/icons/menta
-
-%files devel
-%{_libdir}/pkgconfig/mate-icon-theme.pc
+%dir %{_datadir}/pkgconfig
+%{_datadir}/pkgconfig/mate-icon-theme.pc
%changelog
+* Mon Aug 26 2013 Rex Dieter <rdieter at fedoraproject.org>
+- 1.6.2-0.2.git
+- drop -devel subpkg (for just a pkgconfig file)
+- move pkgconfig back to datadir
+
* Sun Aug 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-0.1.git26ccf0d
- update to latest git version
- add sympolic icons to mate icon theme
More information about the scm-commits
mailing list