[minbar/f17] Fix dso linking

[Hicham HAOUARI]

commit b5c4d752b69d6f0748c78faf52d2632f68170596
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Wed Feb 29 12:25:36 2012 +0000

    Fix dso linking

 minbar-0.2.1-fix-dso-linking.patch |   12 ++++++++++++
 minbar.spec                        |   34 ++++++++++++++--------------------
 2 files changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/minbar-0.2.1-fix-dso-linking.patch b/minbar-0.2.1-fix-dso-linking.patch
new file mode 100644
index 0000000..3572b1f
--- /dev/null
+++ b/minbar-0.2.1-fix-dso-linking.patch
@@ -0,0 +1,12 @@
+--- minbar-0.2.1/src/Makefile.am.old	2012-02-28 14:56:54.676900342 +0000
++++ minbar-0.2.1/src/Makefile.am	2012-02-28 14:57:43.914770360 +0000
+@@ -20,7 +20,8 @@ minbar_LDFLAGS = \
+ 
+ minbar_LDADD = @ITL_LIBS@ 	\
+ 	$(MINBAR_LIBS)		\
+- 	$(INTLLIBS)
++ 	$(INTLLIBS)		\
++	-lm
+ 
+ if USE_NOTIFY
+ minbar_LDADD += $(NOTIFY_LIBS)
diff --git a/minbar.spec b/minbar.spec
index cc6f4a0..4805e76 100644
--- a/minbar.spec
+++ b/minbar.spec
@@ -1,6 +1,6 @@
 Name:           minbar
 Version:        0.2.1
-Release:        13%{?dist}
+Release:        12%{?dist}
 Summary:        Athan call and prayer times notification software
 
 Group:          User Interface/Desktops
@@ -8,16 +8,16 @@ License:        GPLv2+
 URL:            http://djihed.com/minbar/
 Source0:        http://files.djihed.com/%{name}/%{name}-%{version}.tar.lzma
 Patch0:         %{name}-notificationfix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         %{name}-%{version}-fix-dso-linking.patch
 
 BuildRequires:  libitl-devel libglade2-devel gstreamer-devel libgnomecanvas-devel
 BuildRequires:  GConf2-devel libnotify-devel gettext desktop-file-utils
+BuildRequires:  gnome-common autoconf automake intltool
 BuildRequires:  rarian-compat
 BuildRequires:  perl(XML::Parser)
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
-#Requires:       
 
 %description
 Minbar is a GNOME GUI with tray icon, for athan 
@@ -27,8 +27,10 @@ call and notifications for Islam prayer times.
 %prep
 %setup -q
 %patch0 -p 1
+%patch1 -p 1 -b .fix-dso-linking
 sed -i -e "s|\(Utility;\)\1|\1|" %{name}.desktop.in
 rm data/minbar.schemas{,.in} # outdated in 0.2.1 lzma tarball
+autoreconf -if
 
 %build
 %configure
@@ -42,9 +44,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-desktop-file-install --vendor="fedora" \
-      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-      --delete-original \
+desktop-file-validate  \
       $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
@@ -79,25 +79,19 @@ if [ "$1" -eq 0 ]; then
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README NEWS TODO HACKING ChangeLog
-%{_bindir}/minbar
-%{_datadir}/applications/fedora-minbar.desktop
-%{_datadir}/icons/hicolor/*/apps/minbar.png
-%{_sysconfdir}/gconf/schemas/minbar.schemas
-%{_mandir}/man1/minbar.1.gz
-%{_datadir}/minbar/
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_mandir}/man1/%{name}.1.*
+%{_datadir}/%{name}
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.2.1-12
-- Rebuild for new libpng
+* Tue Feb 28 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.2.1-12
+- Fix dso linking issue
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild