- install pkgconfig metadata file for xrender

- release 8

Changed files:
    X11-xrender-pkgconfig.patch -> 1.1
    X11.spec -> 1.52

diff --git a/X11-xrender-pkgconfig.patch b/X11-xrender-pkgconfig.patch
new file mode 100644 (file)
index 0000000..0d88e02
--- /dev/null
+++ b/X11-xrender-pkgconfig.patch
@@ -0,0 +1,35 @@
+diff -Naur xc.orig/lib/Xrender/Imakefile xc/lib/Xrender/Imakefile
+--- xc.orig/lib/Xrender/Imakefile      2004-03-04 18:46:58.000000000 +0100
++++ xc/lib/Xrender/Imakefile   2004-08-19 22:06:20.971964080 +0200
+@@ -133,6 +133,16 @@
+ 
+ HEADERS = Xrender.h $(NONSTANDARD_HEADERS)
+ 
++SUBSTVARS=prefix="$(PROJECTROOT)" \
++          exec_prefix="$(BINDIR)" \
++          libdir="$(USRLIBDIR)" \
++          includedir="$(INCROOT)" \
++          VERSION="0.8.4" \
++          X_REQUIRES="" \
++          RENDER_CFLAGS="" \
++          X_NON_PKG_CFLAGS="" \
++          X_NON_PKG_LIBS="-lX11 -lXext"
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+@@ -142,3 +152,14 @@
+ distclean:: clean
+       RemoveFile(Makefile)
+ #endif
++
++all:: xrender.pc
++
++xrender.pc: xrender.pc.in
++      RemoveFile($@)
++      sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
++
++InstallNonExecFile(xrender.pc,/usr/lib/pkgconfig)
++
++clean::
++      RemoveFile(xrender.pc)

diff --git a/X11.spec b/X11.spec
index a804d81394e692acfbd191f7c4b1a5c7eaed924b..dfc8e00be115ce2d252d1051090896a50a35d0cd 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -19,7 +19,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.7.0
-Release:       7
+Release:       8
 Epoch:         1
 License:       XFree86 1.0 (?)
 Group:         X11/Xorg
@@ -122,6 +122,7 @@ Patch52:    XFree86-kernel_headers.patch
 Patch53:       XFree86-stdint.patch
 Patch54:       %{name}-setxkbmap.patch
 Patch55:       %{name}-makefile-fastbuild.patch
+Patch56:       %{name}-xrender-pkgconfig.patch
 URL:           http://www.x.org/
 BuildRequires: /usr/bin/perl
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
@@ -1872,6 +1873,7 @@ X11-libs.
 %patch53 -p0
 %patch54 -p1
 %patch55 -p0
+%patch56 -p0
 
 rm -f xc/config/cf/host.def
 
@@ -2571,6 +2573,7 @@ fi
 %{_mandir}/man3/[A-FH-Z]*
 %{_pkgconfigdir}/xcursor.pc
 %{_pkgconfigdir}/xft.pc
+%{_pkgconfigdir}/xrender.pc
 
 %files Xserver-devel
 %defattr(644,root,root,755)