[packages/girl] - updated to 9.8.0 - added link patch (use just girl_LDADD, not AM_LDFLAGS to pass libs so that as-n

qboosh qboosh at pld-linux.org
Sun Feb 12 08:32:49 CET 2017


commit 84042f7577880950cd24d08be08f053eb7ccb3d3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 12 08:34:32 2017 +0100

    - updated to 9.8.0
    - added link patch (use just girl_LDADD, not AM_LDFLAGS to pass libs so that as-needed is honoured)

 girl-link.patch | 11 +++++++++++
 girl.spec       | 25 +++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/girl.spec b/girl.spec
index 11179ee..b2c5542 100644
--- a/girl.spec
+++ b/girl.spec
@@ -5,28 +5,31 @@
 Summary:	GNOME Internet Radio Locator
 Summary(pl.UTF-8):	GNOME Internet Radio Locator - program do wyszukiwania rozgłośni internetowych
 Name:		girl
-Version:	9.2.0
+Version:	9.8.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Applications/System
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/girl/9.2/%{name}-%{version}.tar.xz
-# Source0-md5:	d23c41f924332b02d8f6df55bf348d46
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/girl/9.8/%{name}-%{version}.tar.xz
+# Source0-md5:	3b856d9a105ade153d3d1a22fab72834
+Patch0:		%{name}-link.patch
 URL:		https://wiki.gnome.org/Apps/Girl
-BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
+BuildRequires:	glib2-devel >= 1:2.40
 BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	gstreamer-devel >= 1.0
+BuildRequires:	gstreamer-plugins-base-devel >= 1.0
 BuildRequires:	gtk+2-devel >= 2.0
 BuildRequires:	gtk-doc >= 1.16
 BuildRequires:	intltool >= 0.50.1
 BuildRequires:	libgnome-devel >= 2.0
-BuildRequires:	libgnomecanvas-devel >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Suggests:	streamripper
-Suggests:	totem
+Requires:	glib2 >= 1:2.40
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,9 +43,15 @@ nadających na żywo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--with-recording
 
 %{__make}
 
diff --git a/girl-link.patch b/girl-link.patch
new file mode 100644
index 0000000..9becab0
--- /dev/null
+++ b/girl-link.patch
@@ -0,0 +1,11 @@
+--- girl-9.8.0/src/Makefile.am.orig	2017-02-06 16:23:28.000000000 +0100
++++ girl-9.8.0/src/Makefile.am	2017-02-12 08:32:31.610420116 +0100
+@@ -6,8 +6,6 @@
+ 	-DGIRL_DATADIR="\"$(pkgdatadir)\"" \
+ 	$(NULL)
+ 
+-AM_LDFLAGS= $(GIRL_LIBS)
+-
+ noinst_PROGRAMS = test-stations-gfx test-endianess test-stations
+ 
+ test_stations_SOURCES = test-stations.c girl-stations-map.h girl-stations-map.c girl-tz.c girl-tz.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/girl.git/commitdiff/84042f7577880950cd24d08be08f053eb7ccb3d3



More information about the pld-cvs-commit mailing list