git.annexia.org
/
fedora-mingw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Just whitespace changes.
[fedora-mingw.git]
/
cairo
/
mingw-cairo.spec
diff --git
a/cairo/mingw-cairo.spec
b/cairo/mingw-cairo.spec
index
924444b
..
e6a6505
100644
(file)
--- a/
cairo/mingw-cairo.spec
+++ b/
cairo/mingw-cairo.spec
@@
-1,19
+1,23
@@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
Name: mingw-cairo
Version: 1.7.4
Name: mingw-cairo
Version: 1.7.4
-Release:
1
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
URL: http://cairographics.org
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
URL: http://cairographics.org
-Source0: http://cairographics.org/
release
s/cairo-%{version}.tar.gz
+Source0: http://cairographics.org/
snapshot
s/cairo-%{version}.tar.gz
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw-filesystem >=
19
+BuildRequires: mingw-filesystem >=
23
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libxml2
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libxml2
@@
-21,6
+25,7
@@
BuildRequires: mingw-pixman
BuildRequires: mingw-freetype
BuildRequires: mingw-libpng
BuildRequires: mingw-fontconfig
BuildRequires: mingw-freetype
BuildRequires: mingw-libpng
BuildRequires: mingw-fontconfig
+BuildRequires: pkgconfig
%description
MinGW Windows Cairo library.
%description
MinGW Windows Cairo library.
@@
-30,7
+35,6
@@
MinGW Windows Cairo library.
%setup -q -n cairo-%{version}
%build
%setup -q -n cairo-%{version}
%build
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
%{_mingw_configure} --disable-xlib --disable-xcb --enable-win32 --enable-png --enable-freetype
make
%{_mingw_configure} --disable-xlib --disable-xcb --enable-win32 --enable-png --enable-freetype
make
@@
-40,7
+44,10
@@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
+
+rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/libcairo.a
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-50,7
+57,6
@@
rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_mingw_bindir}/libcairo-2.dll
%{_mingw_includedir}/cairo/
%defattr(-,root,root)
%{_mingw_bindir}/libcairo-2.dll
%{_mingw_includedir}/cairo/
-%{_mingw_libdir}/libcairo.a
%{_mingw_libdir}/libcairo.dll.a
%{_mingw_libdir}/libcairo.la
%{_mingw_libdir}/pkgconfig/cairo-ft.pc
%{_mingw_libdir}/libcairo.dll.a
%{_mingw_libdir}/libcairo.la
%{_mingw_libdir}/pkgconfig/cairo-ft.pc
@@
-65,5
+71,12
@@
rm -rf $RPM_BUILD_ROOT
%changelog
%changelog
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-3
+- Added dep on pkgconfig
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-2
+- Remove static libraries.
+- Fix source URL.
+
* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-1
- Initial RPM release
* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.7.4-1
- Initial RPM release