[gnome-pilot-conduits] Update to 2.32.1

Matthew Barnes mbarnes at fedoraproject.org
Fri Dec 17 11:35:09 UTC 2010


commit 1379e24dd79a78ca10aafcc4572647031ad44d28
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Fri Dec 17 06:34:53 2010 -0500

    Update to 2.32.1

 .gitignore                                         |    1 +
 ...-pilot-conduits-2.0.17-require-libgnomeui.patch |   24 ---------------
 gnome-pilot-conduits.spec                          |   31 ++++++++-----------
 sources                                            |    2 +-
 4 files changed, 15 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c556087..3d0fa9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-pilot-conduits-2.0.17.tar.bz2
+/gnome-pilot-conduits-2.32.1.tar.bz2
diff --git a/gnome-pilot-conduits.spec b/gnome-pilot-conduits.spec
index 7350796..e7fb041 100644
--- a/gnome-pilot-conduits.spec
+++ b/gnome-pilot-conduits.spec
@@ -1,10 +1,8 @@
-%define gnome_pilot_version 2.0.17
-
 ### Abstract ###
 
 Name: gnome-pilot-conduits
-Version: 2.0.17
-Release: 5%{?dist}
+Version: 2.32.1
+Release: 1%{?dist}
 License: GPLv2+ and MPLv1.0
 Group: Applications/Communications
 Summary: Additional conduits for gnome-pilot
@@ -13,18 +11,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
 Source: http://download.gnome.org/source/%{name}/2.0/%{name}-%{version}.tar.bz2
 ExcludeArch: s390 s390x
 
-### Patches ###
-
-Patch0: gnome-pilot-conduits-2.0.17-require-libgnomeui.patch
-
 ### Dependencies ###
 
-Requires: gnome-pilot >= %{gnome_pilot_version}
+Requires: gnome-pilot
 
 ### Build Dependencies ###
 
 BuildRequires: gettext
-BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
+BuildRequires: gnome-pilot-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libtool
 
@@ -42,17 +36,14 @@ currently features
 
 %prep
 %setup -q
-%patch0 -p1 -b .require-libgnomeui
 
 %build
-%configure
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
    $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits
@@ -70,12 +61,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/gnome-pilot/conduits/*.conduit
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Fri Dec 17 2010 Matthew Barnes <mbarnes at redhat.com> - 2.32.1-1
+- Update to 2.32.1
+- Spec file cleanups by Parag AN (RH bug #225829).
+
 * Wed Oct 06 2010 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-5
 - Rebuild against gnome-pilot 2.32.0.
 
diff --git a/sources b/sources
index 039c0bd..a0c4cdc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27c7f665660ef68ec23552bdd0c9a571  gnome-pilot-conduits-2.0.17.tar.bz2
+5f07f8cfa07afc76c9f9341be0224832  gnome-pilot-conduits-2.32.1.tar.bz2


More information about the scm-commits mailing list