diff --git a/libgpod-0.8.2-pkgconfig_overlinking.patch b/libgpod-0.8.2-pkgconfig_overlinking.patch new file mode 100644 index 0000000..a5dafb2 --- /dev/null +++ b/libgpod-0.8.2-pkgconfig_overlinking.patch @@ -0,0 +1,11 @@ +diff -up libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking libgpod-0.8.2/libgpod-1.0.pc.in +--- libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking 2011-04-15 03:37:34.000000000 -0500 ++++ libgpod-0.8.2/libgpod-1.0.pc.in 2012-08-10 13:53:00.294631805 -0500 +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libgpod + Description: A library to manipulate songs and playlists stored on an ipod + Version: @VERSION@ +-Requires: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@ ++Requires.private: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@ + Libs: -L${libdir} -lgpod + Cflags: -I${includedir}/gpod-1.0 diff --git a/libgpod.spec b/libgpod.spec index 149329e..42bc1a6 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -15,13 +15,17 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.8.2 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.bz2 -BuildRequires: automake libtool +# upstreamable patch: reduce pkgconfig-related overlinking +# +Patch50: libgpod-0.8.2-pkgconfig_overlinking.patch + +BuildRequires: automake libtool BuildRequires: docbook-style-xsl BuildRequires: glib2-devel BuildRequires: gdk-pixbuf2-devel @@ -52,10 +56,7 @@ smart playlists, playcounts, ratings, podcasts, album artwork, photos, etc. %package devel Summary: Development files for the libgpod library Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: glib2-devel -Requires: gdk-pixbuf2-devel -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Libgpod is a library to access the contents of an iPod. It supports playlists, @@ -84,7 +85,7 @@ This package contains the API documentation. %package -n python-gpod Summary: Python module to access iPod content Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python-mutagen %description -n python-gpod @@ -96,7 +97,7 @@ libgpod library. %package sharp Summary: C#/.NET library to access iPod content Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description sharp C#/.NET library to access iPod content. Provides bindings to the libgpod @@ -107,8 +108,7 @@ library. Summary: Development files for libgpod-sharp Summary: C#/.NET library to access iPod content Group: Development/Languages -Requires: %{name}-sharp = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}-sharp%{?_isa} = %{version}-%{release} %description sharp-devel C#/.NET library to access iPod content. Provides bindings to the libgpod @@ -121,6 +121,9 @@ libgpod-sharp. %prep %setup -q + +%patch50 -p1 -b .pkgconfig_overlinking + #autoreconf -f # remove execute perms on the python examples as they'll be installed in %%doc @@ -208,6 +211,11 @@ echo "D /var/run/%{name} 0755 root root -" > \ %endif %changelog +* Fri Aug 10 2012 Rex Dieter - 0.8.2-7 +- libgpod.pc Requires: libimobiledevice-1.0 ... overlinking (#818594) +- tighten subpkg deps (via %%_isa) +- omit -devel deps that (should) get autodetected already + * Thu Jul 19 2012 Fedora Release Engineering - 0.8.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild