[packages/goobox] - updated to 3.4.1 for GNOME 3.x - updated desktop patch - removed obsolete libnotify patch

qboosh qboosh at pld-linux.org
Fri Nov 27 23:24:23 CET 2015 

commit 6416cb4a35d8fca6cdac399e55e1656917539cee
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 27 23:24:58 2015 +0100

    - updated to 3.4.1 for GNOME 3.x
    - updated desktop patch
    - removed obsolete libnotify patch

 goobox-desktop.patch   | 11 +++---
 goobox-libnotify.patch | 52 ---------------------------
 goobox.spec            | 95 +++++++++++++++++++++++---------------------------
 3 files changed, 49 insertions(+), 109 deletions(-)
---
diff --git a/goobox.spec b/goobox.spec
index fcde248..726f06a 100644
--- a/goobox.spec
+++ b/goobox.spec
@@ -1,43 +1,43 @@
 Summary:	CD player and ripper for GNOME
 Summary(pl.UTF-8):	Odtwarzacz i ripper CD dla GNOME
 Name:		goobox
-Version:	0.9.93
-Release:	2
-License:	GPL v2
+Version:	3.4.1
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/goobox/0.9/%{name}-%{version}.tar.bz2
-# Source0-md5:	d12dcf26907935ee4803107c572a5392
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/goobox/3.4/%{name}-%{version}.tar.xz
+# Source0-md5:	748bdf19ba98bcb4494f8e467d45abcd
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-libnotify.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel
-BuildRequires:	ORBit2-devel >= 1:2.12.1
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	brasero-devel >= 3
 BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.36
 BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-doc-utils >= 0.4.0
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gstreamer-GConf-devel >= 0.8.12
-BuildRequires:	gstreamer-devel >= 0.8.12
-BuildRequires:	gstreamer-plugins-devel >= 0.8.12
-BuildRequires:	gtk+2-devel >= 2:2.6.4
-BuildRequires:	intltool
-BuildRequires:	libbonobo-devel >= 2.8.1
-BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
-BuildRequires:	libnotify-devel >= 0.3.2
+BuildRequires:	gstreamer-devel >= 1.0.0
+BuildRequires:	gtk+3-devel >= 3.10.0
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libcoverart-devel >= 1.0.0
+BuildRequires:	libdiscid-devel
+BuildRequires:	libmusicbrainz5-devel >= 5.0.0
+BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	scrollkeeper
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
+BuildRequires:	rpmbuild(macros) >= 1.596
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+Requires(post,postun):	glib2 >= 1:2.36
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	dbus(org.freedesktop.Notifications)
-Requires:	gnome-media-cddb >= 2.10.1
-Requires:	gstreamer-cdparanoia >= 0.8.12
-Requires:	libnotify >= 0.3.2
+Requires:	glib2 >= 1:2.36
+Requires:	gstreamer-cdparanoia >= 1.0.0
+Requires:	gtk+3 >= 3.10.0
+Requires:	hicolor-icon-theme
+Requires:	libcoverart >= 1.0.0
+Requires:	libnotify >= 0.4.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,17 +49,16 @@ Odtwarzacz i ripper CD dla GNOME.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-gnome-doc-prepare --copy --force
-%{__gnome_doc_common}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -67,10 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{mime-info,application-registry}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name} --with-gnome
 
@@ -78,8 +73,8 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install goobox.schemas
-%scrollkeeper_update_post
+%glib_compile_schemas
+%update_icon_cache hicolor
 %banner %{name} -e << EOF
 To be able to rip a CD, You need to install appropriate
 GStreamer plugins:
@@ -89,19 +84,17 @@ GStreamer plugins:
 - gstreamer-vorbis (encoding to Ogg Vorbis)
 EOF
 
-%preun
-%gconf_schema_uninstall goobox.schemas
-
 %postun
-%scrollkeeper_update_postun
+%glib_compile_schemas
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/goobox.schemas
-%{_libdir}/bonobo/servers/*
-%{_omf_dest_dir}/%{name}
-%{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%attr(755,root,root) %{_bindir}/goobox
+%{_datadir}/GConf/gsettings/goobox.convert
+%{_datadir}/appdata/goobox.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Goobox.gschema.xml
+%{_desktopdir}/goobox.desktop
+%{_iconsdir}/hicolor/*x*/apps/goobox.png
+%{_iconsdir}/hicolor/scalable/apps/goobox-symbolic.svg
diff --git a/goobox-desktop.patch b/goobox-desktop.patch
index fcfba95..d9ea0c0 100644
--- a/goobox-desktop.patch
+++ b/goobox-desktop.patch
@@ -1,12 +1,11 @@
-diff -urN goobox-0.6.0.orig/data/goobox.desktop.in goobox-0.6.0/data/goobox.desktop.in
---- goobox-0.6.0.orig/data/goobox.desktop.in	2004-12-09 19:21:56.414671928 +0100
-+++ goobox-0.6.0/data/goobox.desktop.in	2004-12-09 19:23:08.797668040 +0100
+--- goobox-3.4.1/data/goobox.desktop.in.orig	2015-11-17 21:33:37.041995326 +0100
++++ goobox-3.4.1/data/goobox.desktop.in	2015-11-17 21:50:38.245285848 +0100
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  _Name=CD Player
  _Comment=Play and extract CDs
--Categories=GNOME;Application;AudioVideo;
-+Categories=GTK;GNOME;AudioVideo;Audio;Player;
+-Categories=GNOME;GTK;AudioVideo;Audio;
++Categories=GNOME;GTK;AudioVideo;Audio;Player;
  Encoding=UTF-8
  Exec=goobox
- Icon=goobox.png
+ Icon=goobox
diff --git a/goobox-libnotify.patch b/goobox-libnotify.patch
deleted file mode 100644
index 8247d57..0000000
--- a/goobox-libnotify.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aurN goobox-0.9.93.orig/src/main.c goobox-0.9.93/src/main.c
---- goobox-0.9.93.orig/src/main.c	2005-11-18 21:20:08.000000000 +0100
-+++ goobox-0.9.93/src/main.c	2006-05-21 17:34:06.211841144 +0200
-@@ -47,7 +47,6 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
--static NotifyHandle *notify_h = NULL;
- #endif /* HAVE_LIBNOTIFY */
- 
- GtkWindow *main_window = NULL;
-@@ -193,7 +192,7 @@
- 
- #ifdef HAVE_LIBNOTIFY
- 	if (! notify_init ("goobox")) 
--                g_error ("Cannot initialize notification system.");
-+                g_warning ("Cannot initialize notification system.");
- #endif /* HAVE_LIBNOTIFY */
- 
- 	goo_stock_init ();
-@@ -557,27 +556,9 @@
- 	       int         y)
- {
- #ifdef HAVE_LIBNOTIFY
--	NotifyIcon  *icon = notify_icon_new_from_uri("goobox");
--	NotifyHints *hints = NULL;
--
--	if ((x >= 0) && (y >= 0)) {
--		hints = notify_hints_new ();
--		notify_hints_set_int (hints, "x", x);
--		notify_hints_set_int (hints, "y", y);
--	}
--
--	notify_h = notify_send_notification (notify_h,
--					     "device",
--					     NOTIFY_URGENCY_NORMAL,
--					     title,
--					     msg,
--					     icon,
--					     TRUE, 0, 
--					     hints, // no hints
--					     NULL, // no user data
--					     0);
--	
--	if (icon != NULL)
--		notify_icon_destroy (icon);
-+	if(!notify_is_initted())
-+	    return;
-+	NotifyNotification *n = notify_notification_new (title,msg,"goobox",GTK_WIDGET (main_window));
-+	notify_notification_show(n, NULL);
- #endif /* HAVE_LIBNOTIFY */
- }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/goobox.git/commitdiff/6416cb4a35d8fca6cdac399e55e1656917539cee

More information about the pld-cvs-commit mailing list