[libgnomecups] - Merge-review cleanup (#226013)

paragn paragn at fedoraproject.org
Sat Sep 11 03:09:09 UTC 2010


commit 6d8b817e3ae8c5220bee888ce33668eaafa02db4
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sat Sep 11 08:33:52 2010 +0530

    - Merge-review cleanup (#226013)

 libgnomecups.spec |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/libgnomecups.spec b/libgnomecups.spec
index aa51b00..6093ca4 100644
--- a/libgnomecups.spec
+++ b/libgnomecups.spec
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.3
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  LGPLv2
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -15,8 +15,8 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gnome-common
 BuildRequires: autoconf, automake, libtool, gettext
 BuildRequires: intltool
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Source: http://ftp.gnome.org/pub/gnome/sources/libgnomecups/0.2/%{name}-%{version}.tar.bz2
+#Fedora specific patches
 Patch3: libgnomecups-dbus.patch
 Patch5: libgnomecups-0.1.14-go-direct.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=520449
@@ -27,10 +27,9 @@ GNOME library for CUPS integration
 
 %package devel
 Summary: GNOME library for CUPS integration
-Group: Development/GNOME and GTK+
+Group:  Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: cups-devel glib2-devel
-Requires: pkgconfig
 
 %description devel
 GNOME library for CUPS integration
@@ -42,19 +41,16 @@ GNOME library for CUPS integration
 %patch6 -p1 -b .lpoptions
 
 %build
-
 autoreconf -f -i
-%configure --with-dbus=yes
-make
+%configure --with-dbus=yes --disable-static
+make  %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%makeinstall
-%find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
+%find_lang %{name}
 
 %post -p /sbin/ldconfig
 
@@ -69,11 +65,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%exclude %{_libdir}/*.a
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 09 2010 Parag Nemade <paragn AT fedoraproject.org> 0.2.3-8
+- Merge-review cleanup (#226013)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list