cygwin-pixman 0.28.2

2 files changed, 55 insertions, 31 deletions

diff --git a/cygwin-pixman.spec b/cygwin-pixman.spec
index 9278d82..403f9e0 100644
--- a/cygwin-pixman.spec
+++ b/cygwin-pixman.spec
@@ -1,63 +1,88 @@
-%global __strip %{_cygwin_strip}
-%global __objdump %{_cygwin_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_cygwin_findrequires}
-%global __find_provides %{_cygwin_findprovides}
+%{?cygwin_package_header}
 
 Name:           cygwin-pixman
-Version:        0.28.0
+Version:        0.28.2
 Release:        1
 Summary:        Cygwin pixel manipulation library
 
 License:        MIT
 Group:          Development/Libraries
 URL:            http://cgit.freedesktop.org/pixman/
-Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  automake autoconf cygwin-libtool
-BuildRequires:  cygwin-filesystem
-BuildRequires:  cygwin-binutils
-BuildRequires:  cygwin-gcc
-BuildRequires:  cygwin
+Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2
+
+BuildRequires:  automake autoconf libtool
+
+BuildRequires:  cygwin32-filesystem
+BuildRequires:  cygwin32-binutils
+BuildRequires:  cygwin32-gcc
+BuildRequires:  cygwin32
+
+BuildRequires:  cygwin64-filesystem
+BuildRequires:  cygwin64-binutils
+BuildRequires:  cygwin64-gcc
+BuildRequires:  cygwin64
 
 
 %description
 Cygwin pixel manipulation library for X and cairo.
 
+%package -n cygwin32-pixman
+Summary:        Cygwin64 pixel manipulation library
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
+
+%description -n cygwin32-pixman
+Pixel manipulation library for Cygwin i686 toolchain.
+
+%package -n cygwin64-pixman
+Summary:        Cygwin64 pixel manipulation library
+Group:          Development/Libraries
+
+%description -n cygwin64-pixman
+Pixel manipulation library for Cygwin x86_64 toolchain.
+
+%{?cygwin_debug_package}
+
 
 %prep
 %setup -q -n pixman-%{version}
-%{_cygwin_autoreconf}
+autoreconf -fiv
 
 
 %build
-%{_cygwin_configure} --disable-static
-make %{?_smp_mflags}
+%cygwin_configure --disable-static
+%cygwin_make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la
+%cygwin_make install DESTDIR=$RPM_BUILD_ROOT
 
+# We intentionally do not ship *.la files
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%files -n cygwin32-pixman
+%{cygwin32_bindir}/cygpixman-1-0.dll
+%{cygwin32_includedir}/pixman-1/
+%{cygwin32_libdir}/libpixman-1.dll.a
+%{cygwin32_libdir}/pkgconfig/pixman-1.pc
 
-%files
-%defattr(-,root,root,-)
-%{_cygwin_bindir}/cygpixman-1-0.dll
-%dir %{_cygwin_includedir}/pixman-1
-%{_cygwin_includedir}/pixman-1/pixman.h
-%{_cygwin_includedir}/pixman-1/pixman-version.h
-%{_cygwin_libdir}/libpixman-1.dll.a
-%{_cygwin_libdir}/pkgconfig/pixman-1.pc
+%files -n cygwin64-pixman
+%{cygwin64_bindir}/cygpixman-1-0.dll
+%{cygwin64_includedir}/pixman-1/
+%{cygwin64_libdir}/libpixman-1.dll.a
+%{cygwin64_libdir}/pkgconfig/pixman-1.pc
 
 
 %changelog
+* Tue Jul 02 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.28.2-1
+- Version bump.
+- Adapt to new Cygwin packaging scheme.
+- Add cygwin64 package.
+
 * Wed Nov 07 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.28.0-1
 - Version bump.
 
diff --git a/sources b/sources
index fd71c00..aa2c028 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6b3e4c5300adb893a2baa9631c23efb2  pixman-0.26.2.tar.bz2
-703c3f62437b161c610056e076560570  pixman-0.28.0.tar.bz2
+f6e3294c4edb7b6bca8459e604286348  pixman-0.28.2.tar.bz2