Hello community, here is the log from the commit of package tangerine checked in at Wed Nov 15 00:55:00 CET 2006. -------- --- tangerine/tangerine.changes 2006-10-30 01:17:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/tangerine/tangerine.changes 2006-11-13 18:15:24.000000000 +0100 @@ -2 +2 @@ -Mon Oct 30 01:17:42 CET 2006 - ro@suse.de +Mon Nov 13 18:15:02 CET 2006 - james@suse.de @@ -4 +4 @@ -- fix patch naming +- Make it build correctly on x86_64 Old: ---- tangerine-desktop-icon.patch tangerine-pkgconfig.patch tangerine-taglib-sharp.patch New: ---- tangerine-0.3.0-desktop-icon.patch tangerine-0.3.0-pkgconfig.patch tangerine-0.3.0-taglib-sharp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tangerine.spec ++++++ --- /var/tmp/diff_new_pack.RndtAU/_old 2006-11-15 00:54:00.000000000 +0100 +++ /var/tmp/diff_new_pack.RndtAU/_new 2006-11-15 00:54:00.000000000 +0100 @@ -13,16 +13,16 @@ Name: tangerine BuildRequires: beagle glade-sharp2 gnome-sharp2 gtk-sharp2 ipod-sharp mDNSResponder-devel pkgconfig update-desktop-files xorg-x11-devel URL: http://www.snorp.net/log/tangerine -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Multimedia/Other Autoreqprov: on Version: 0.3.0 -Release: 15 +Release: 25 Summary: DAAP music server Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-pkgconfig.patch -Patch1: %{name}-taglib-sharp.patch -Patch2: %{name}-desktop-icon.patch +Patch: %{name}-%{version}-pkgconfig.patch +Patch1: %{name}-%{version}-taglib-sharp.patch +Patch2: %{name}-%{version}-desktop-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,7 +52,7 @@ autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \ - --libdir=%{_libdir} \ + --libdir=%{_prefix}/%_lib \ --mandir=%{_mandir} \ --enable-mdnsd \ --enable-beagle @@ -72,19 +72,18 @@ %defattr(-,root,root) %doc AUTHORS NEWS README COPYING %{_bindir}/tangerine* -%dir %{_libdir}/tangerine -%{_libdir}/tangerine/*.so* +%dir %{_prefix}/%{_lib}/tangerine %{_libdir}/pkgconfig/tangerine.pc -%dir %{_prefix}/lib/tangerine/ -%{_prefix}/lib/tangerine/ -%{_prefix}/lib/tangerine/*.exe* -%{_prefix}/lib/tangerine/plugins +%{_prefix}/%{_lib}/tangerine/*.dll* +%{_prefix}/%{_lib}/tangerine/*.so* +%{_prefix}/%{_lib}/tangerine/*.exe* +%{_prefix}/%{_lib}/tangerine/plugins %{_datadir}/applications/tangerine-properties.desktop /opt/gnome/share/icons/hicolor/*/apps/tangerine.* %changelog -n tangerine -* Mon Oct 30 2006 - ro@suse.de -- fix patch naming +* Mon Nov 13 2006 - james@suse.de +- Make it build correctly on x86_64 * Thu Oct 26 2006 - snorp@ximian.com - Fix the desktop file icon * Fri Sep 29 2006 - gekker@suse.de ++++++ tangerine-0.3.0-desktop-icon.patch ++++++ --- src/tangerine-properties.desktop +++ src/tangerine-properties.desktop @@ -4,5 +4,5 @@ Version=1.0 Exec=tangerine-properties Type=Application -Icon=tangerine +Icon=tangerine.png Categories=Application;Settings;Utility;X-SuSE-ControlCenter-System; ++++++ tangerine-0.3.0-pkgconfig.patch ++++++ --- configure.ac +++ configure.ac @@ -28,6 +28,13 @@ AC_MSG_ERROR([Can not find "gmcs" in your PATH]) fi +dnl gtk-sharp-2.0, gnome-sharp-2.0, glade-sharp-2.0 +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0) +AC_SUBST(GTK_SHARP_LIBS) + +PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0) +AC_SUBST(GLADE_SHARP_LIBS) + AC_ARG_ENABLE(mdnsd, AC_HELP_STRING([--enable-mdnsd], [Use mDNSResponder instead of Avahi]), enable_mdnsd="yes", enable_mdnsd="no") AM_CONDITIONAL(ENABLE_MDNSD, test "x$enable_mdnsd" = "xyes") @@ -40,13 +47,6 @@ AC_SUBST(MCS_FLAGS) fi -dnl gtk-sharp-2.0, gnome-sharp-2.0, glade-sharp-2.0 -PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0) -AC_SUBST(GTK_SHARP_LIBS) - -PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0) -AC_SUBST(GLADE_SHARP_LIBS) - AC_ARG_ENABLE(beagle, AC_HELP_STRING([--disable-beagle], [Do not build the beagle plugin]), enable_beagle="no", enable_beagle="yes") if test "x$enable_beagle" = "xyes"; then \ ++++++ tangerine-0.3.0-taglib-sharp.patch ++++++ --- deps/taglib-sharp/Makefile.am +++ deps/taglib-sharp/Makefile.am @@ -2,7 +2,7 @@ ASSEMBLY_NAME = taglib-sharp ASSEMBLY = $(top_builddir)/deps/taglib-sharp/$(ASSEMBLY_NAME).dll -taglibdir = $(pkglibdir) +taglibdir = $(prefix)/lib/tangerine taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb ASSEMBLY_SOURCES = \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org