From 1d668894a695d13803024bb647b4303d1e23d176 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 10 Jun 2009 19:35:34 +0000 Subject: [PATCH] - Update to 0.15.10 - Use %%global instead of %%define - Dropped pixman-0.13.2-license.patch as freedesktop bug #19582 is resolved --- mingw32-pixman.spec | 24 +++++++++++++----------- pixman-0.13.2-license.patch | 27 --------------------------- 2 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 pixman-0.13.2-license.patch diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec index 593423a..06112ce 100644 --- a/mingw32-pixman.spec +++ b/mingw32-pixman.spec @@ -1,12 +1,12 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-pixman -Version: 0.13.2 -Release: 5%{?dist} +Version: 0.15.10 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -16,8 +16,6 @@ Group: Development/Libraries Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz Source1: make-pixman-snapshot.sh -Patch0: pixman-0.13.2-license.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -43,7 +41,6 @@ Static version of the MinGW Windows Pixman library. %prep %setup -q -n pixman-%{version} -%patch0 -p1 %build @@ -65,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE +%doc COPYING %{_mingw32_bindir}/libpixman-1-0.dll %{_mingw32_includedir}/pixman-1 %{_mingw32_libdir}/libpixman-1.dll.a @@ -79,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 10 2009 Erik van Pienbroek - 0.15.10-1 +- Update to 0.15.10 +- Use %%global instead of %%define +- Dropped pixman-0.13.2-license.patch as freedesktop bug #19582 is resolved + * Fri Apr 3 2009 Erik van Pienbroek - 0.13.2-5 - Fixed %%defattr line - Added -static subpackage diff --git a/pixman-0.13.2-license.patch b/pixman-0.13.2-license.patch deleted file mode 100644 index c717677..0000000 --- a/pixman-0.13.2-license.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE ---- pixman-0.13.2.orig/LICENSE 1970-01-01 01:00:00.000000000 +0100 -+++ pixman-0.13.2/LICENSE 2009-01-15 13:14:47.000000000 +0000 -@@ -0,0 +1,23 @@ -+ Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. -+ 2005 Lars Knoll & Zack Rusin, Trolltech -+ 2008 Aaron Plattner, NVIDIA Corporation -+ -+ Permission to use, copy, modify, distribute, and sell this software and its -+ documentation for any purpose is hereby granted without fee, provided that -+ the above copyright notice appear in all copies and that both that -+ copyright notice and this permission notice appear in supporting -+ documentation, and that the name of Keith Packard not be used in -+ advertising or publicity pertaining to distribution of the software without -+ specific, written prior permission. Keith Packard makes no -+ representations about the suitability of this software for any purpose. It -+ is provided "as is" without express or implied warranty. -+ -+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ SOFTWARE. -+