OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=30

2007-11-23 00:46:37 +00:00 · 2007-11-23 00:46:37 +00:00 · 681fb0ff94
commit 681fb0ff94
parent a7662d0169
3 changed files with 13 additions and 83 deletions
--- a/pixman.diff
+++ b/pixman.diff
@ -1,77 +0,0 @@
--- ../pixman-0.9.4.orig/Makefile.am	2007-08-21 22:15:29.950632500 +0200
-+++ ./Makefile.am	2007-08-21 22:20:47.882502000 +0200
-@@ -1,6 +1,6 @@
- SUBDIRS = pixman test
- 
- pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=pixman-1.pc
-+pkgconfig_DATA=pixman.pc
- 
-$(pkgconfig_DATA): pixman-1.pc.in
-+$(pkgconfig_DATA): pixman.pc.in
--- ../pixman-0.9.4.orig/configure.ac	2007-08-21 22:15:29.966633500 +0200
-+++ ./configure.ac	2007-08-21 22:22:54.362406500 +0200
-@@ -125,7 +125,7 @@
- AC_SUBST(DEP_CFLAGS)
- AC_SUBST(DEP_LIBS)
- 		  
-AC_OUTPUT([pixman-1.pc
-+AC_OUTPUT([pixman.pc
-            Makefile
- 	   pixman/Makefile
- 	   test/Makefile])
--- ../pixman-0.9.4.orig/pixman/Makefile.am	2007-08-21 22:15:28.750557500 +0200
-+++ ./pixman/Makefile.am	2007-08-21 22:29:32.375280750 +0200
-@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libpixman-1.la
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
-libpixman_1_la_SOURCES =		\
-+lib_LTLIBRARIES = libpixman.la
-+libpixman_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-+libpixman_la_LIBADD = @DEP_LIBS@ -lm
-+libpixman_la_SOURCES =		\
- 	pixman.h		\
- 	pixman-region.c		\
- 	pixman-private.h	\
-@@ -15,7 +15,7 @@
- 	pixman-compute-region.c \
- 	pixman-timer.c
- 
-libpixmanincludedir = $(includedir)/pixman-1/
-+libpixmanincludedir = $(includedir)/
- libpixmaninclude_HEADERS = pixman.h
- 
- # wrapper library
-@@ -35,5 +35,5 @@
- 	pixman-mmx.h
- libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
- libpixman_mmx_la_LIBADD = $(DEP_LIBS)
-libpixman_1_la_LIBADD += libpixman-mmx.la
-+libpixman_la_LIBADD += libpixman-mmx.la
- endif
--- ../pixman-0.9.4.orig/test/Makefile.am	2007-08-21 22:15:31.722743250 +0200
-+++ ./test/Makefile.am	2007-08-21 22:34:40.038508500 +0200
-@@ -7,7 +7,7 @@
- 
- INCLUDES = -I$(top_srcdir)/pixman $(GTK_CFLAGS)
- 
-composite_test_LDADD =	$(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
-gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
-+composite_test_LDADD =	$(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
-+gradient_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
- 
-endif
-\ No newline at end of file
-+endif
--- pixman-1.pc.in.orig	2007-09-29 18:47:49.586502250 +0200
-+++ pixman-1.pc.in	2007-09-29 18:48:31.537124000 +0200
-@@ -6,6 +6,6 @@
- Name: Pixman
- Description: The pixman library (version 1)
- Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}/pixman-1 @DEP_CFLAGS@
-Libs: -L${libdir} -lpixman-1 @DEP_LIBS@
-+Cflags: -I${includedir} @DEP_CFLAGS@
-+Libs: -L${libdir} -lpixman @DEP_LIBS@
- 
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 22 22:20:16 CET 2007 - sndirsch@suse.de
+
+- pixman --> pixman-1
+- obsoletes pixman.diff
+
 -------------------------------------------------------------------
 Thu Nov 15 12:45:25 CET 2007 - sndirsch@suse.de

--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@ -19,7 +19,7 @@ Provides:       libXaw.so.8 libXaw.so.7 libXaw.so.6
 %endif
 Url:            http://xorg.freedesktop.org/
 Version:        7.3
-Release:        13
+Release:        15
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@ -64,7 +64,6 @@ Patch3:         p_xft_cjk.diff
 Patch4:         p_xft_register.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
-Patch11:        pixman.diff

 %description
 This package contains the remaining X.Org libraries.
@ -149,10 +148,6 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
-pushd pixman-*
-%patch11 -p0
-mv pixman-1.pc.in pixman.pc.in
-popd

 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@ -201,6 +196,7 @@ exit 0

 %files -n xorg-x11-devel
 %defattr(-,root,root)
+%dir /usr/include/pixman-1
 /usr/bin/xft-config
 /usr/include/*.h
 /usr/include/X11/*.h
@ -210,6 +206,7 @@ exit 0
 /usr/include/X11/XprintAppUtil/
 /usr/include/X11/extensions/*.h
 /usr/include/X11/fonts/*.h
+/usr/include/pixman-1/pixman.h
 /usr/include/xcb/
 /usr/%{_lib}/*.a
 /usr/%{_lib}/*.la
@ -218,7 +215,11 @@ exit 0
 /usr/share/aclocal/*.m4
 %{_mandir}/man1/*
 %{_mandir}/man3/*
+
 %changelog
+* Thu Nov 22 2007 - sndirsch@suse.de
+- pixman --> pixman-1
+- obsoletes pixman.diff
 * Thu Nov 15 2007 - sndirsch@suse.de
 - pixman 0.9.6
  * fixes X.Org Bug 12398