[uget/f12/master] - Apply upstream patch for build issue with recent libnotify
Mamoru Tasaka
mtasaka at fedoraproject.org
Sat Sep 4 17:49:04 UTC 2010
commit 0bd396ac66579b02ba54c3f7d64788c2fad36498
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Sun Sep 5 02:49:07 2010 +0900
- Apply upstream patch for build issue with recent libnotify
uget-1.6.0-remove-libnotify-flag.patch | 20 ++++++++++++++++++++
uget.spec | 17 +++++++++++------
2 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/uget-1.6.0-remove-libnotify-flag.patch b/uget-1.6.0-remove-libnotify-flag.patch
new file mode 100644
index 0000000..949b29c
--- /dev/null
+++ b/uget-1.6.0-remove-libnotify-flag.patch
@@ -0,0 +1,20 @@
+------------------------------------------------------------------------
+r323 | plushuang | 2010-08-19 08:13:17 +0900 (Thu, 19 Aug 2010) | 1 line
+
+* uget-cmd/Makefile: remove @LIBNOTIFY_CFLAGS@ and @LIBNOTIFY_LIBS@
+------------------------------------------------------------------------
+Index: uget-cmd/Makefile.am
+===================================================================
+--- uget-cmd/Makefile.am (revision 322)
++++ uget-cmd/Makefile.am (revision 323)
+@@ -2,8 +2,8 @@
+
+ # set the include path found by configure
+ uget_cmd_CPPFLAGS = -DDATADIR='"$(datadir)"' -I$(top_srcdir)/include -I$(top_srcdir)/uget-cmd
+-uget_cmd_CFLAGS = @LFS_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @LIBNOTIFY_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
+-uget_cmd_LDFLAGS = @LFS_LDFLAGS@ @GIO_LIBS@ @GTHREAD_LIBS@ @CURL_LIBS@ @LIBNOTIFY_LIBS@ @GSTREAMER_LIBS@ @LIBPWMD_LIBS@
++uget_cmd_CFLAGS = @LFS_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBPWMD_CFLAGS@
++uget_cmd_LDFLAGS = @LFS_LDFLAGS@ @GIO_LIBS@ @GTHREAD_LIBS@ @CURL_LIBS@ @GSTREAMER_LIBS@ @LIBPWMD_LIBS@
+ uget_cmd_LDADD = $(top_builddir)/src/libuglib.a
+
+ uget_cmd_SOURCES = \
diff --git a/uget.spec b/uget.spec
index d7a1e83..5170842 100644
--- a/uget.spec
+++ b/uget.spec
@@ -1,13 +1,13 @@
Name: uget
Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Download manager using GTK+ and libcurl
Group: Applications/Internet
License: LGPLv2+
URL: http://urlget.sourceforge.net/
Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: uget-1.6.0-remove-libnotify-flag.patch
BuildRequires: desktop-file-utils
BuildRequires: gstreamer-devel
@@ -16,6 +16,9 @@ BuildRequires: intltool
BuildRequires: libcurl-devel
BuildRequires: libnotify-devel
+# Autotools related
+BuildRequires: automake
+
Obsoletes: urlgfe < 1.0.4
Provides: urlgfe = %{name}-%{version}
@@ -29,11 +32,10 @@ Uget is the successor of urlgfe, which was called URLget before.
%prep
%setup -q
+%patch0 -p0 -b .libno_flags
+autoreconf -fi
+
%build
-# See:
-# https://bugzilla.gnome.org/show_bug.cgi?id=622550
-# http://git.gnome.org/browse/libnotify/commit/?id=0eb56b2fcf16d5381011e0bae2cf942416dae55c
-export LDFLAGS=$(pkg-config --libs gtk+-2.0)
%configure
make -k %{?_smp_mflags}
@@ -80,6 +82,9 @@ exit 0
%{_datadir}/sounds/%{name}/
%changelog
+* Sun Sep 5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0-2
+- Apply upstream patch for build issue with recent libnotify
+
* Wed Aug 18 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0-1
- 1.6.0
More information about the scm-commits
mailing list