Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	libgpod.spec
@@ -1,35 +1,42 @@ # norootforbuild -%define soname 2 +%define soname 3 +%define pkg_version_3 0.6.0 +%define pkg_version_2 0.5.2 %define pkg_version_1 0.4.2 %define pkg_version_0 0.4.0 +%define pkg_version_latest %{pkg_version_3} +%define build_so_2 1 +# +# Only build .so.1 and .so.0 libraries on openSUSE versions below 10.3, +# as 10.3 ships .so.2 and not older ones: +# %if %suse_version < 1030 %define build_so_1 1 %define build_so_0 1 +%else +%define build_so_1 0 +%define build_so_0 0 %endif -%if %suse_version >= 1030 Name: libgpod%{soname} -%else -Name: libgpod -%endif Summary: Shared Library to access the Contents of an iPod License: GNU Library General Public License version 2 or later (LGPL 2) Group: System/Libraries URL: http://gtkpod.sourceforge.net/ -Version: 0.5.2 -Release: 100 -Source: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{version}.tar.gz -%if %{?build_so_1:1}0 -Source1: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_1}.tar.gz -Patch1: libgpod-0.4.2.patch -%endif -%if %{?build_so_0:1}0 -Source2: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_0}.tar.gz -%endif -Patch2: libgpod-gettext-soname.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Version: %{pkg_version_latest} +Release: 100.5 +Source: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_latest}.tar.gz +Source3: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_2}.tar.gz +Source2: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_1}.tar.gz +Source1: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_0}.tar.gz +Patch1: libgpod-0.4.2-lower_ithumb_max_size.patch +Patch2: libgpod-0.4.0-gettext-soname.patch +Patch3: libgpod-0.4.2-gettext-soname.patch +Patch4: libgpod-0.5.2-gettext-soname.patch +Patch5: libgpod-0.6.0-gettext-soname.patch +BuildRoot: %{_tmppath}/%{name}-%{pkg_version_latest}-build BuildRequires: gtk2-devel hal-devel perl-XML-Parser update-desktop-files gtk-doc BuildRequires: gcc glibc-devel make autoconf automake libtool intltool gettext-devel # python bindings need eyeD3 0.6.6 which is only there since 10.1 @@ -40,10 +47,8 @@ %if %suse_version >= 1030 BuildRequires: fdupes %endif -%if %suse_version < 1030 -Obsoletes: libgpod2 -Provides: libgpod2 = %{version}-%{release} -%endif +Provides: libgpod%{soname} = %{pkg_version_latest}-%{release} +Provides: libgpod = %{pkg_version_latest}-%{release} %description libgpod is a shared library to access the contents of an iPod. This library @@ -55,11 +60,14 @@ libgpod supports playlists, smart playlists, playcounts, ratings and podcasts. Support for cover art and photos is currently being tested. +%debug_package + %package -n libgpod-devel Group: Development/Libraries/C and C++ Summary: Library to Manipulate Songs and Playlists Stored on iPod -Requires: %{name} = %{version}-%{release} -Requires: gtk2-devel glibc-devel glib2-devel dbus-1-devel hal-devel +Requires: libgpod%{soname} = %{pkg_version_latest}-%{release} +Requires: gtk2-devel glibc-glib2-devel dbus-1-devel hal-devel +Provides: libgpod-devel = %{pkg_version_latest}-%{release} %description -n libgpod-devel libgpod is a library meant to abstract access to an iPod content. It @@ -69,7 +77,7 @@ %package -n libgpod-devel-static Group: Development/Libraries/C and C++ Summary: Library to Manipulate Songs and Playlists Stored on iPod -Requires: libgpod-devel = %{version}-%{release} +Requires: libgpod-devel = %{pkg_version_latest}-%{release} %description -n libgpod-devel-static libgpod is a library meant to abstract access to an iPod content. It @@ -79,15 +87,14 @@ %if %suse_version >= 1010 %package -n libgpod-python Summary: Python Module to access iPod Content -Summary(de): Ein Python module für den iPod Zugriff Group: Development/Languages/Python -Provides: python-libgpod = %{version}-%{release} +Provides: python-libgpod = %{pkg_version_latest}-%{release} Requires: python-mutagen %description -n libgpod-python A python module to access iPod content. This module provides bindings to the libgpod library. -%endif +%endif # %suse_version >= 1010 %package -n libgpod-doc Summary: Developer Documentation for libgpod @@ -96,39 +103,99 @@ %description -n libgpod-doc API reference documentation for libgpod -%if %suse_version >= 930 -%debug_package +%if %build_so_2 +%package -n libgpod2 +Summary: Shared Library to access the Contents of an iPod +Version: %{pkg_version_2} +License: GNU Library General Public License version 2 or later (LGPL 2) +Group: System/Libraries +Provides: libgpod2 = %{pkg_version_2}-%{release} +Provides: libgpod = %{pkg_version_2}-%{release} +%if %suse_version >= 1020 && %suse_version < 1030 +Obsoletes: libgpod +Provides: libgpod = %{pkg_version_2}-%{release} +%endif +%description -n libgpod2 +This package contains libgpod.so.2 for backwards compatibility. %endif -%prep -%if %{?build_so_1:1}0 && %{?build_so_0:1}0 -%setup -q -b 1 -b 2 -n "libgpod-%{version}" -%else -%if %{?build_so_1:1}0 -%setup -q -b 1 -n "libgpod-%{version}" -%else -%if %{?build_so_0:1}0 -%setup -q -b 2 -n "libgpod-%{version}" -%else -%setup -q -n "libgpod-%{version}" -%endif #%{?build_so_0:1}0 -%endif #%{?build_so_1:1}0 -%endif #%{?build_so_1:1}0 && %{?build_so_0:1}0 -%if %suse_version >= 1030 -%patch2 -p1 -%__sed -i 's\|@@SONAME@@\|%{soname}\|g' configure.ac +%if %build_so_1 +%package -n libgpod1 +Summary: Shared Library to access the Contents of an iPod +Version: %{pkg_version_1} +License: GNU Library General Public License version 2 or later (LGPL 2) +Group: System/Libraries +Provides: libgpod1 = %{pkg_version_1}-%{release} +Provides: libgpod = %{pkg_version_1}-%{release} +%description -n libgpod1 +This package contains libgpod.so.1 for backwards compatibility. %endif -%if %suse_version >= 1010 -%__sed -i '/^#!\/usr\/bin\/env python/ d' \ - bindings/python/gtkpod.py +%if %build_so_0 +%package -n libgpod0 +Summary: Shared Library to access the Contents of an iPod +Version: %{pkg_version_0} +License: GNU Library General Public License version 2 or later (LGPL 2) +Group: System/Libraries +Provides: libgpod0 = %{pkg_version_0}-%{release} +Provides: libgpod = %{pkg_version_0}-%{release} +%if %suse_version < 1020 +Obsoletes: libgpod +Provides: libgpod = %{pkg_version_0}-%{release} +%endif +%description -n libgpod0 +This package contains libgpod.so.0 for backwards compatibility. +%endif + +%prep +%setup -q -n "libgpod-%{pkg_version_latest}" +# change GETTEXT_PACKAGE from libgpod to libgpod%{soname}: +%patch5 +%__sed -i 's\|@@SONAME@@\|%{soname}\|g' configure.ac +# Fix path to python: +%__sed -i '/^#!\/usr\/bin\/env python/ d' bindings/python/gtkpod.py %__chmod 644 bindings/python/examples/*.py + +%if %build_so_0 +%setup -q -D -T -a 1 -n "libgpod-%{pkg_version_latest}" +pushd "libgpod-%{pkg_version_0}" +# change GETTEXT_PACKAGE from libgpod to libgpod0:
[-] [+]	Added	libgpod-0.4.0-gettext-soname.patch ^
@@ -0,0 +1,11 @@ +--- configure.ac.orig 2007-12-01 21:12:36.000000000 +0100 ++++ configure.ac 2007-12-01 21:12:44.000000000 +0100 +@@ -92,7 +92,7 @@ + dnl ************************************************** + ALL_LINGUAS="de es fr he it ja sv" + +-GETTEXT_PACKAGE=libgpod ++GETTEXT_PACKAGE=libgpod@@SONAME@@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +
[-] [+]	Added	libgpod-0.4.2-gettext-soname.patch ^
@@ -0,0 +1,11 @@ +--- configure.ac.orig 2007-12-01 21:11:05.000000000 +0100 ++++ configure.ac 2007-12-01 21:11:15.000000000 +0100 +@@ -94,7 +94,7 @@ + dnl ************************************************** + ALL_LINGUAS="de es fr he it ja sv" + +-GETTEXT_PACKAGE=libgpod ++GETTEXT_PACKAGE=libgpod@@SONAME@@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +
[-] [+]	Added	libgpod-0.4.2-lower_ithumb_max_size.patch ^
@@ -0,0 +1,11 @@ +--- src/ithumb-writer.c.orig 2007-12-01 02:04:27.000000000 +0100 ++++ src/ithumb-writer.c 2007-12-01 02:04:51.000000000 +0100 +@@ -46,7 +46,7 @@ + #include <fcntl.h> + + +-#define ITHUMB_MAX_SIZE (500L1000L1000L) ++#define ITHUMB_MAX_SIZE (256L1000L1000L) + /* for testing: / + /#define ITHUMB_MAX_SIZE (1L1000L1000L)*/ +
[-] [+]	Added	libgpod-0.5.2-gettext-soname.patch ^
@@ -0,0 +1,11 @@ +--- configure.ac.orig 2007-09-08 00:13:07.000000000 +0200 ++++ configure.ac 2007-09-08 00:13:29.000000000 +0200 +@@ -94,7 +94,7 @@ + dnl ************************************************** + ALL_LINGUAS="de es fr he it ja sv" + +-GETTEXT_PACKAGE=libgpod ++GETTEXT_PACKAGE=libgpod@@SONAME@@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +
[-] [+]	Added	libgpod-0.6.0-gettext-soname.patch ^
@@ -0,0 +1,11 @@ +--- configure.ac.orig 2007-12-01 21:06:18.000000000 +0100 ++++ configure.ac 2007-12-01 21:06:52.000000000 +0100 +@@ -173,7 +173,7 @@ + dnl ************************************************** + ALL_LINGUAS="de es fr he it ja ro sv" + +-GETTEXT_PACKAGE=libgpod ++GETTEXT_PACKAGE=libgpod@@SONAME@@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +
	Added	libgpod-0.6.0.tar.gz ^