[gnome-mag] - Merge-review cleanup (#225821)

paragn paragn at fedoraproject.org
Thu Sep 23 10:00:48 UTC 2010


commit 6319c13ee6948a11063c0bd849e0fb6a2ddffa5a
Author: paragn <paragn at fedoraproject.org>
Date:   Thu Sep 23 15:35:00 2010 +0530

    - Merge-review cleanup (#225821)

 gnome-mag.spec |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gnome-mag.spec b/gnome-mag.spec
index f5ca2be..4f75f66 100644
--- a/gnome-mag.spec
+++ b/gnome-mag.spec
@@ -1,11 +1,9 @@
-%define po_package gnome-mag
-
 Summary: Screen magnifier for GNOME
 Name: gnome-mag
 Version: 0.16.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
-Group: Desktop/Accessibility
+Group: Applications/System 
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-mag/0.16/%{name}-%{version}.tar.bz2
 
@@ -17,7 +15,7 @@ BuildRequires: libbonobo-devel
 BuildRequires: gtk2-devel
 BuildRequires: at-spi-devel
 BuildRequires: gettext
-BuildRequires: autoconf, automake, libtool
+BuildRequires: libtool
 BuildRequires: dbus-glib-devel
 
 %description
@@ -29,9 +27,6 @@ by other applicaitons and assistive technologies.
 Summary:	Development files for gnome-mag
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libbonobo-devel
-Requires:	gtk2-devel
-Requires:	pkgconfig
 
 %description devel
 This package contains files needed for developing applications
@@ -39,28 +34,30 @@ that are using gnome-mag.
 
 %prep
 %setup -q
+##Following to make rpmlint happy
+sed -i 's|./"|.\\"|g' docs/man/magnifier.1
 
 %build
 export LIBS="-lm"
-%configure
-make
+%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -name '*.la' |xargs /bin/rm
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-%find_lang %{po_package}
+%check
+make check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -f %{po_package}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README NEWS COPYING
 %{_bindir}/magnifier
@@ -80,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Fri Sep 10 2010 Parag Nemade <paragn AT fedoraproject.org> 0.16.1-2
+- Merge-review cleanup (#225821)
+
 * Wed Mar 31 2010 Matthias Clasen <mclasen at redhat.com> - 0.16.1-1
 - Update to 0.16.1
 


More information about the scm-commits mailing list