diff --git a/libglade2.spec b/libglade2.spec index 032c443..1c87565 100644 --- a/libglade2.spec +++ b/libglade2.spec @@ -1,23 +1,16 @@ -%define libxml2_version 2.4.12-0.7 -%define gtk2_version 2.5.0 -%define pango_version 1.3.2 - Summary: The libglade library for loading user interfaces Name: libglade2 Version: 2.6.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/libglade/2.6/libglade-%{version}.tar.bz2 URL: http://www.gnome.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxml2 >= %{libxml2_version} -Requires: gtk2 >= %{gtk2_version} Requires: xml-common -BuildRequires: libxml2-devel >= %{libxml2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: libxml2-devel +BuildRequires: gtk2-devel BuildRequires: fontconfig -BuildRequires: pango-devel >= %{pango_version} +BuildRequires: pango-devel BuildRequires: libtool BuildRequires: gettext-devel @@ -41,11 +34,7 @@ initial interface loading time, there is no performance tradeoff. %package devel Summary: The files needed for libglade application development Group: Development/Libraries -Requires: %name = %{version}-%{release} -Requires: libxml2-devel >= %{libxml2_version} -Requires: gtk2-devel >= %{gtk2_version} -Requires: pkgconfig -Conflicts: libglade < 0.17 +Requires: %{name} = %{version}-%{release} %description devel The libglade-devel package contains the libraries and include files @@ -58,25 +47,20 @@ that you can use to develop libglade applications. %patch2 -p1 -b .secondary %build -%configure --disable-gtk-doc +%configure --disable-gtk-doc --disable-static make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/libglade/2.0 +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%makeinstall - -rm $RPM_BUILD_ROOT%{_libdir}/*.{la,a} - -%clean -rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-, root, root) +%defattr(-, root, root,-) %doc AUTHORS NEWS README COPYING %{_libdir}/lib*.so.* %dir %{_libdir}/libglade @@ -84,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xml/libglade %files devel -%defattr(-, root, root) +%defattr(-, root, root,-) %doc test-libglade.c %{_bindir}/* %{_libdir}/lib*.so @@ -93,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libglade %changelog +* Wed Oct 06 2010 Parag Nemade - 2.6.4-4 +- Merge-review cleanup (#226010) + * Fri Jul 24 2009 Fedora Release Engineering - 2.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild