[libXxf86misc] - Merge-review cleanup (#226095)
paragn
paragn at fedoraproject.org
Tue Sep 14 15:52:00 UTC 2010
commit 7b74684779062f33029e33e7ab4feeee8ae63ea8
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Tue Sep 14 21:21:30 2010 +0530
- Merge-review cleanup (#226095)
libXxf86misc.spec | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/libXxf86misc.spec b/libXxf86misc.spec
index f299f06..bdb8f11 100644
--- a/libXxf86misc.spec
+++ b/libXxf86misc.spec
@@ -1,12 +1,10 @@
Summary: X.Org X11 libXxf86misc runtime library
Name: libXxf86misc
Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
BuildRequires: pkgconfig(xproto) pkgconfig(xext)
@@ -27,26 +25,18 @@ X.Org X11 libXxf86misc development package
%build
%configure --disable-static
-make
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-# FIXME: Missing some of the doc files %doc AUTHORS COPYING README INSTALL ChangeLog
-%doc COPYING ChangeLog
+%doc README COPYING ChangeLog
%{_libdir}/libXxf86misc.so.1
%{_libdir}/libXxf86misc.so.1.1.0
@@ -54,10 +44,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/libXxf86misc.so
%{_libdir}/pkgconfig/xxf86misc.pc
-#%dir %{_mandir}/man3x
%{_mandir}/man3/*.3*
%changelog
+* Tue Sep 14 2010 Parag Nemade <paragn AT fedoraproject.org> 1.0.2-2
+- Merge-review cleanup (#226095)
+
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-1
- libXxf86misc 1.0.2
More information about the scm-commits
mailing list