[yelp] Use pkgconfig for BuildRequires
David King
amigadave at fedoraproject.org
Wed Dec 10 23:39:06 UTC 2014
commit 820a62c5b759382b34a736cbf9156bd047fc0c60
Author: David King <amigadave at amigadave.com>
Date: Wed Dec 10 23:38:33 2014 +0000
Use pkgconfig for BuildRequires
yelp.spec | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
---
diff --git a/yelp.spec b/yelp.spec
index d1604c8..0620a7e 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,37 +1,36 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
-Summary: Help browser for the GNOME desktop
-Name: yelp
-Epoch: 1
-Version: 3.14.1
-Release: 2%{?dist}
-#VCS: git:git://git.gnome.org/yelp
-Source: http://download.gnome.org/sources/yelp/3.14/%{name}-%{version}.tar.xz
+Name: yelp
+Epoch: 1
+Version: 3.14.1
+Release: 3%{?dist}
+Summary: Help browser for the GNOME desktop
+
+Group: Applications/System
+License: GPLv2+
+URL: https://wiki.gnome.org/Apps/Yelp
+#VCS: git:git://git.gnome.org/yelp
+Source: https://download.gnome.org/sources/yelp/3.14/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=687960
-Patch1: 0001-Center-new-windows.patch
-
-URL: http://live.gnome.org/Yelp
-License: GPLv2+
-Group: Applications/System
-Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: yelp-xsl
-
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: gtk3-devel >= 3.0.0
-BuildRequires: libxml2-devel >= 2.6.5
-BuildRequires: libxslt-devel >= 1.1.4
-BuildRequires: webkitgtk3-devel
+Patch1: 0001-Center-new-windows.patch
+
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(libexslt)
+BuildRequires: pkgconfig(libxslt)
+BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(webkitgtk-3.0)
+BuildRequires: pkgconfig(yelp-xsl)
BuildRequires: desktop-file-utils
-BuildRequires: yelp-xsl-devel >= 3.0.1
-BuildRequires: xz-devel
BuildRequires: bzip2-devel
BuildRequires: gettext-devel
BuildRequires: intltool
-BuildRequires: sqlite-devel
BuildRequires: itstool
+Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: yelp-xsl
+
%description
Yelp is the help browser for the GNOME desktop. It is designed
@@ -67,10 +66,10 @@ the libraries in the yelp-libs package.
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm $RPM_BUILD_ROOT%{_libdir}/libyelp.la
@@ -113,10 +112,13 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
%files devel
%{_libdir}/libyelp.so
%{_includedir}/libyelp
-%{_datadir}/gtk-doc/html/libyelp
+%{_datadir}/gtk-doc
%changelog
+* Wed Dec 10 2014 David King <amigadave at amigadave.com> - 1:3.14.1-3
+- Use pkgconfig for BuildRequires
+
* Mon Nov 10 2014 Matthias Clasen <mclasen at redhat.com> - 1:3.14.1-2
- Drop the gnome-user-docs dependency (#1149511)
More information about the scm-commits
mailing list