[harfbuzz] Resolves:rh#971795:Merge -icu-devel subpackage into -devel subpackage
pnemade
pnemade at fedoraproject.org
Fri Jun 7 12:10:03 UTC 2013
commit 9de46d6440c07ddb160a75e2d332a871d58e723c
Author: Parag Nemade <pnemade at redhat.com>
Date: Fri Jun 7 17:39:45 2013 +0530
Resolves:rh#971795:Merge -icu-devel subpackage into -devel subpackage
harfbuzz.spec | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/harfbuzz.spec b/harfbuzz.spec
index 49932a8..b8a0100 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -1,6 +1,6 @@
Name: harfbuzz
Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Text shaping library
License: MIT
@@ -20,6 +20,7 @@ HarfBuzz is an implementation of the OpenType Layout engine.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-icu%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
@@ -32,15 +33,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description icu
This package contains Harfbuzz ICU support library.
-%package icu-devel
-Summary: Development files for %{name}-icu
-Requires: %{name}-icu%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description icu-devel
-The %{name}-icu-devel package contains libraries and header files for
-developing applications that use %{name}-icu.
-
%prep
%setup -q
@@ -61,13 +53,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%post icu -p /sbin/ldconfig
-
%postun icu -p /sbin/ldconfig
+
%files
%doc NEWS ChangeLog AUTHORS COPYING README
%{_libdir}/libharfbuzz.so.*
@@ -77,20 +68,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_bindir}/hb-ot-shape-closure
%{_bindir}/hb-shape
%{_includedir}/harfbuzz/
-%exclude %{_includedir}/harfbuzz/hb-icu.h
%{_libdir}/libharfbuzz.so
%{_libdir}/pkgconfig/harfbuzz.pc
-
-%files icu
-%{_libdir}/libharfbuzz-icu.so.*
-
-%files icu-devel
-%{_includedir}/harfbuzz/hb-icu.h
%{_libdir}/libharfbuzz-icu.so
%{_libdir}/pkgconfig/harfbuzz-icu.pc
+%files icu
+%{_libdir}/libharfbuzz-icu.so.*
%changelog
+* Fri Jun 07 2013 Parag Nemade <pnemade AT redhat DOT com> - 0.9.18-2
+- Resolves:rh#971795:Merge -icu-devel subpackage into -devel subpackage
+
* Wed Jun 05 2013 Parag Nemade <pnemade AT redhat DOT com> - 0.9.18-1
- Update to 0.9.18 upstream release
More information about the scm-commits
mailing list