Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	libgpod.spec
@@ -1,24 +1,30 @@ # norootforbuild -%define soname 3 +%define soname 4 +%define pkg_version_4 0.7.0 %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 pkg_version_latest %{pkg_version_4} -%define build_so_2 1 +%define build_so_3 2 # # 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 +%if 0%{?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 0%{?suse_version} < 1100 +%define build_so_2 1 +%else +%define build_so_2 0 +%endif Name: libgpod%{soname} Summary: Shared Library to access the Contents of an iPod @@ -26,8 +32,9 @@ Group: System/Libraries URL: http://gtkpod.sourceforge.net/ Version: %{pkg_version_latest} -Release: 100.5 +Release: 150 Source: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_latest}.tar.gz +Source4: http://prdownloads.sourceforge.net/gtkpod/libgpod-%{pkg_version_3}.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 @@ -36,19 +43,31 @@ Patch3: libgpod-0.4.2-gettext-soname.patch Patch4: libgpod-0.5.2-gettext-soname.patch Patch5: libgpod-0.6.0-gettext-soname.patch +Patch6: libgpod-0.6.0-gcc-4.3.patch +Patch7: libgpod-0.6.0-missing_includes.patch BuildRoot: %{_tmppath}/%{name}-%{pkg_version_latest}-build BuildRequires: gtk2-devel hal-devel perl-XML-Parser update-desktop-files gtk-doc +BuildRequires: taglib-devel gcc-c++ libstdc++-devel pcre-devel libxml2-devel BuildRequires: gcc glibc-devel make autoconf automake libtool intltool gettext-devel +%if 0%{?suse_version} >= 1100 +BuildRequires: sg3_utils-devel +%else +# for libsgutils +BuildRequires: scsi +%endif # python bindings need eyeD3 0.6.6 which is only there since 10.1 -%if %suse_version >= 1010 +%if 0%{?suse_version} >= 1010 BuildRequires: python-devel python-eyeD3 swig python-mutagen %py_requires %endif -%if %suse_version >= 1030 +%if 0%{?suse_version} >= 1020 +BuildRequires: python-gobject2-devel +%endif +%if 0%{?suse_version} >= 1030 BuildRequires: fdupes %endif -Provides: libgpod%{soname} = %{pkg_version_latest}-%{release} -Provides: libgpod = %{pkg_version_latest}-%{release} +Provides: libgpod%{soname}-packman = %{pkg_version_latest}-%{release} +Provides: libgpod-packman = %{pkg_version_latest}-%{release} %description libgpod is a shared library to access the contents of an iPod. This library @@ -60,20 +79,52 @@ libgpod supports playlists, smart playlists, playcounts, ratings and podcasts. Support for cover art and photos is currently being tested. + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> + %debug_package +%package -n libgpod-tools +Group: Hardware/Other +Summary: Utilities for libgpod +Requires: libgpod%{soname} = %{pkg_version_latest}-%{release} + +%description -n libgpod-tools +This package contains various utilities that use libgpod. + + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> + %package -n libgpod-devel Group: Development/Libraries/C and C++ Summary: Library to Manipulate Songs and Playlists Stored on iPod Requires: libgpod%{soname} = %{pkg_version_latest}-%{release} -Requires: gtk2-devel glibc-devel dbus-1-devel hal-devel -Provides: libgpod-devel = %{pkg_version_latest}-%{release} +Requires: gtk2-devel glib2-devel dbus-1-devel hal-devel +Provides: libgpod-devel-packman = %{pkg_version_latest}-%{release} %description -n libgpod-devel libgpod is a library meant to abstract access to an iPod content. It provides an easy to use API to retrieve the list of files and playlist stored on an iPod, to modify them and to save them back to the iPod. + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> + %package -n libgpod-devel-static Group: Development/Libraries/C and C++ Summary: Library to Manipulate Songs and Playlists Stored on iPod @@ -84,17 +135,34 @@ provides an easy to use API to retrieve the list of files and playlist stored on an iPod, to modify them and to save them back to the iPod. -%if %suse_version >= 1010 + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> + +%if 0%{?suse_version} >= 1010 %package -n libgpod-python Summary: Python Module to access iPod Content Group: Development/Languages/Python Provides: python-libgpod = %{pkg_version_latest}-%{release} Requires: python-mutagen +Requires: %{name} = %{version}-%{release} %description -n libgpod-python A python module to access iPod content. This module provides bindings to the libgpod library. -%endif # %suse_version >= 1010 + + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> +%endif # 0%{?suse_version} >= 1010 %package -n libgpod-doc Summary: Developer Documentation for libgpod @@ -103,20 +171,60 @@ %description -n libgpod-doc API reference documentation for libgpod + + + +Authors: +-------- + Jorg Schuler <jcsjcs@users.sourceforge.net> + Christophe Fergeau <teuf@gnome.org> + +%if %build_so_3 +%package -n libgpod3 +Summary: Shared Library to access the Contents of an iPod +Version: %{pkg_version_3} +License: GNU Library General Public License version 2 or later (LGPL 2) +Group: System/Libraries +Provides: libgpod2-packman = %{pkg_version_3}-%{release} +Provides: libgpod-packman = %{pkg_version_3}-%{release} +%if 0%{?suse_version} >= 1020 && 0%{?suse_version} < 1030 +Obsoletes: libgpod +Provides: libgpod = %{pkg_version_3}-%{release} +%endif +%description -n libgpod3 +This package contains libgpod.so.2 for backwards compatibility.
[-] [+]	Deleted	libgpod-0.4.2.patch ^
@@ -1,12 +0,0 @@ -diff -NubBr libgpod-0.4.2/src/ithumb-writer.c libgpod-0.4.2.patched/src/ithumb-writer.c ---- libgpod-0.4.2/src/ithumb-writer.c 2007-01-09 14:31:13.000000000 +0100 -+++ libgpod-0.4.2.patched/src/ithumb-writer.c 2007-01-19 08:51:10.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.6.0-gcc-4.3.patch ^
@@ -0,0 +1,12 @@ +--- tests/test-rebuild-db.cc.orig 2008-06-20 00:30:24.000000000 +0200 ++++ tests/test-rebuild-db.cc 2008-06-20 00:30:49.000000000 +0200 +@@ -35,6 +35,9 @@ + #include <id3v2tag.h> + #include <mpegfile.h> + ++#include <string.h> ++#include <cstring> ++ + #include "itdb.h" + + static char *
[-] [+]	Added	libgpod-0.6.0-missing_includes.patch ^
@@ -0,0 +1,32 @@ +--- tests/test-rebuild-db.cc ++++ tests/test-rebuild-db.cc +@@ -29,6 +29,7 @@ + #include <sys/stat.h> + #include <typeinfo> + #include <unistd.h> ++#include <string.h> + + #include <glib/gstdio.h> + +--- tools/hal-callout.c ++++ tools/hal-callout.c +@@ -32,6 +32,9 @@ + #endif + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif + #include <sys/mount.h> + #include <itdb.h> + #include <itdb_device.h> +--- tools/ipod-scsi-inquiry.c ++++ tools/ipod-scsi-inquiry.c +@@ -30,6 +30,7 @@ + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <unistd.h> + #include <scsi/sg_cmds.h>
[-] [+]	Deleted	libgpod-gettext-soname.patch ^
@@ -1,11 +0,0 @@ ---- 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.7.0.tar.gz ^