[libgail-gnome] - Merge-review cleanup (#226006)
paragn
paragn at fedoraproject.org
Sat Sep 11 02:59:01 UTC 2010
commit 71c541392606220f49f5e516cd6972f8fdba403f
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Sat Sep 11 08:23:17 2010 +0530
- Merge-review cleanup (#226006)
libgail-gnome.spec | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/libgail-gnome.spec b/libgail-gnome.spec
index 24dc901..53630d4 100644
--- a/libgail-gnome.spec
+++ b/libgail-gnome.spec
@@ -2,14 +2,15 @@
Summary: Accessibility implementation for GTK+ and GNOME libraries
Name: libgail-gnome
Version: 1.20.3
-Release: 1%{?dist}
+Release: 2%{?dist}
+#Following is dead URL now
URL: http://developer.gnome.org/projects/gap
#VCS: git:git://git.gnome.org/libgail-gnome
Source0: http://download.gnome.org/sources/libgail-gnome/1.20/%{name}-%{version}.tar.bz2
License: LGPLv2+
Group: System Environment/Libraries
-Requires: at-spi >= %{at_spi_version}
+Requires: at-spi
Requires(pre): GConf2
Requires(post): GConf2
@@ -36,7 +37,6 @@ Requires: %{name} = %{version}-%{release}
Requires: atk-devel
Requires: libbonoboui-devel
Requires: gtk2-devel
-Requires: pkgconfig
%description devel
libgail-gnome-devel contains the files required to compile applications against
@@ -46,8 +46,7 @@ the GNOME portions of the GAIL libraries.
%setup -q
%build
-
-%configure
+%configure --disable-static
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
@@ -56,10 +55,9 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dyn
make ##%{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-# Remove unpackaged files
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%pre
%gconf_schema_prepare libgail-gnome
@@ -74,16 +72,20 @@ rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/gtk-2.0/modules/*
%{_sysconfdir}/gconf/schemas/libgail-gnome.schemas
%files devel
+%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*
%changelog
+* Fri Sep 10 2010 Parag Nemade <paragn AT fedoraproject.org> 1.20.3-2
+- Merge-review cleanup (#226006)
+
* Tue Jun 29 2010 Matthias Clasen <mclasen at redhat.com> - 1.20.3-1
- Update to 1.20.3
More information about the scm-commits
mailing list