- Merge-review cleanup (#226012)

libgnomecanvas.spec

@@ -1,24 +1,17 @@
 %define gettext_package libgnomecanvas-2.0
 
-%define gtk2_version 2.1.2
-%define libart_lgpl_version 2.3.8
-%define libglade2_version 2.0.1
-%define gail_version 1.9.0
-
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.30.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/libgnomecanvas/2.30/%{name}-%{version}.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
-Requires: gtk2 >= %{gtk2_version}
+BuildRequires: gtk2-devel
-Requires: libglade2 >= 2.6.3-2
+BuildRequires: libart_lgpl-devel
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libglade2-devel 
-BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version}
+BuildRequires: gail-devel
-BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: libtool gettext
 BuildRequires: intltool
 
@@ -30,17 +23,11 @@ Tk canvas widget but has evolved quite a bit over time.
 %package devel
 Summary: Libraries and headers for libgnomecanvas
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Conflicts: gnome-libs-devel < 1.4.1.2
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: libart_lgpl-devel >= %{libart_lgpl_version}
-Requires: libglade2-devel >= 2.6.3-2
-Requires: pkgconfig
 # for /usr/share/gtk-doc/html
 Requires: gtk-doc
 
 %description devel
-
 The canvas widget allows you to create custom displays using stock items
 such as circles, lines, text, and so on. It was originally a port of the
 Tk canvas widget but has evolved quite a bit over time.
@@ -49,24 +36,18 @@ Tk canvas widget but has evolved quite a bit over time.
 %setup -q
 
 %build
-export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g')
+%configure --disable-gtk-doc --enable-glade --disable-static
-%configure --disable-gtk-doc --enable-glade
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-export tagname=CC
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags} 
 
 %install
-rm -rf %{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-export tagname=CC
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-make install DESTDIR=$RPM_BUILD_ROOT  LIBTOOL=/usr/bin/libtool
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{a,la}
 
 %find_lang %{gettext_package}
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -85,6 +66,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libgnomecanvas
 
 %changelog
+* Thu Sep 23 2010 Parag Nemade <paragn AT fedoraproject.org> 2.30.1-2
+- Merge-review cleanup (#226012)
+
 * Thu Apr  1 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-1
 - Update to 2.30.1