rpms/libXres/F-12 libXres.spec,1.26,1.27 sources,1.10,1.11

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libXres/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13688

Modified Files:
	libXres.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
- libXres 1.0.4



Index: libXres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/F-12/libXres.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXres.spec	14 Aug 2009 11:13:43 -0000	1.26
+++ libXres.spec	13 Oct 2009 16:00:33 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X-Resource extension client library
 Name: libXres
-Version: 1.0.3
-Release: 9%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 X-Resource is an extension that allows a client to query
@@ -21,7 +19,6 @@ the X server about its usage of various 
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXres development package
@@ -29,20 +26,14 @@ X.Org X11 libXres development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,15 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/XRes.h
-%if %{with_static}
-%{_libdir}/libXRes.a
-%endif
 %{_libdir}/libXRes.so
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXres 1.0.4
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.3-9
 - Merge-review cleanups #226086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2007 00:12:42 -0000	1.10
+++ sources	13 Oct 2009 16:00:33 -0000	1.11
@@ -1 +1 @@
-de66ffb657aba64c9d6dbdeabb757f3e  libXres-1.0.3.tar.bz2
+4daf91f93d924e693f6f6ed276791be2  libXres-1.0.4.tar.bz2