[cairo-clock] fix ldflags

Tom Callaway spot at fedoraproject.org
Thu Mar 22 19:57:23 UTC 2012


commit 2e250e3c10032ca81b9b29136ff43d84438c31ec
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 22 15:57:20 2012 -0400

    fix ldflags

 cairo-clock-0.3.4-fix-ldflags.patch |   24 ++++++++++++++++++++++++
 cairo-clock.spec                    |   21 ++++++++++-----------
 2 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/cairo-clock-0.3.4-fix-ldflags.patch b/cairo-clock-0.3.4-fix-ldflags.patch
new file mode 100644
index 0000000..fc93faf
--- /dev/null
+++ b/cairo-clock-0.3.4-fix-ldflags.patch
@@ -0,0 +1,24 @@
+diff -up cairo-clock-0.3.4/src/Makefile.am.BAD cairo-clock-0.3.4/src/Makefile.am
+--- cairo-clock-0.3.4/src/Makefile.am.BAD	2012-03-22 15:54:47.043876121 -0400
++++ cairo-clock-0.3.4/src/Makefile.am	2012-03-22 15:54:52.556829072 -0400
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = cairo_clock
+ transform = s/_/-/g
+ 
+-cairo_clock_LDFLAGS = -Wl, --export-dynamic
++cairo_clock_LDFLAGS = -Wl,--export-dynamic
+ 
+ cairo_clock_LDADD =	\
+ 	$(GLIB_LIBS)	\
+diff -up cairo-clock-0.3.4/src/Makefile.in.BAD cairo-clock-0.3.4/src/Makefile.in
+--- cairo-clock-0.3.4/src/Makefile.in.BAD	2012-03-22 15:54:34.824980346 -0400
++++ cairo-clock-0.3.4/src/Makefile.in	2012-03-22 15:54:37.906954065 -0400
+@@ -226,7 +226,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-cairo_clock_LDFLAGS = -Wl, --export-dynamic
++cairo_clock_LDFLAGS = -Wl,--export-dynamic
+ cairo_clock_LDADD = \
+ 	$(GLIB_LIBS)	\
+ 	$(GTK_LIBS)	\
diff --git a/cairo-clock.spec b/cairo-clock.spec
index 5ea03cd..7888f0c 100644
--- a/cairo-clock.spec
+++ b/cairo-clock.spec
@@ -1,18 +1,18 @@
 Summary:	Cairo-rendered on-screen clock 
 Name:		cairo-clock
 Version:	0.3.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 URL:		http://macslow.thepimp.net/?page_id=23
 Source0:	http://macslow.thepimp.net/projects/%{name}/%{name}-%{version}.tar.gz
+Patch0:		cairo-clock-0.3.4-fix-ldflags.patch
 License:	GPLv2
 Group:		User Interface/Desktops
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	gettext
 BuildRequires:	perl-XML-Parser
 BuildRequires:	desktop-file-utils
 BuildRequires:	librsvg2-devel
 BuildRequires:	libglade2-devel
+BuildRequires:	libtool
 
 %description
 Cairo-Clock is a desktop clock using cairo for rendering and taking advantage
@@ -20,16 +20,16 @@ of the Composite extension on newer Xorg servers.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-ldflags
 sed 's/Application;//' -i desktop/%{name}.desktop
 
 %build
 %configure
-%{__make}  %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install INSTALL="install -p"  DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+make install INSTALL="install -p"  DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install					\
 	--vendor fedora					\
 	--add-category X-Fedora				\
@@ -37,15 +37,11 @@ desktop-file-install					\
 	desktop/%{name}.desktop
 %find_lang %{name}
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/%{name}
 %{_datadir}/applications/*
@@ -54,6 +50,9 @@ desktop-file-install					\
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Mar 22 2012 Tom Callaway <spot at fedoraproject.org> - 0.3.4-9
+- fix ldflags
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list