packages: docker/docker.spec - modular xorg deps, pass CC

[glen]

Author: glen                         Date: Mon Mar 22 21:49:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- modular xorg deps, pass CC

---- Files affected:
packages/docker:
   docker.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/docker/docker.spec
diff -u packages/docker/docker.spec:1.9 packages/docker/docker.spec:1.10
--- packages/docker/docker.spec:1.9	Mon Feb 12 22:23:53 2007
+++ packages/docker/docker.spec	Mon Mar 22 22:49:53 2010
@@ -3,17 +3,17 @@
 Summary(pl.UTF-8):	Program dokujący
 Name:		docker
 Version:	1.5
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://icculus.org/openbox/2/docker/%{name}-%{version}.tar.gz
 # Source0-md5:	349320bebd43babb8b43e11c7aae0293
 Patch0:		%{name}-fix.patch
 URL:		http://icculus.org/openbox/2/docker/
-BuildRequires:	XFree86-devel
 BuildRequires:	glib2-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
+BuildRequires:	xorg-lib-libX11-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,12 +34,13 @@
 
 %build
 %{__make} \
+	CC="%{__cc}" \
 	CFLAGS="-pedantic -Wall -W %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
-install %{name} $RPM_BUILD_ROOT%{_bindir}
+install -p %{name} $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,7 +48,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -55,6 +56,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/03/22 21:49:53  glen
+- modular xorg deps, pass CC
+
 Revision 1.9  2007/02/12 21:23:53  glen
 - tabs in preamble
 
@@ -68,7 +72,7 @@
 - cosmetics
 
 Revision 1.5  2003/08/23 10:26:03  luzik
- - updated URL
+- updated URL
 
 Revision 1.4  2003/07/11 12:28:22  ankry
 - URL fixes and other cosmetics
@@ -81,5 +85,4 @@
 
 Revision 1.1  2003/05/05 23:44:43  luzik
 - initial release, made by
-        Fryderyk Dziarmagowski <freetz at gmx.net>
-
+  Fryderyk Dziarmagowski <freetz at gmx.net>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/docker/docker.spec?r1=1.9&r2=1.10&f=u