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
Import patches from native build
[fedora-mingw.git]
/
libjpeg
/
mingw-libjpeg.spec
diff --git
a/libjpeg/mingw-libjpeg.spec
b/libjpeg/mingw-libjpeg.spec
index
fc50282
..
65fb352
100644
(file)
--- a/
libjpeg/mingw-libjpeg.spec
+++ b/
libjpeg/mingw-libjpeg.spec
@@
-1,8
+1,12
@@
-%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-libjpeg
Version: 6b
Name: mingw-libjpeg
Version: 6b
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
Summary: MinGW Windows Libjpeg library
License: IJG
@@
-21,7
+25,7
@@
Patch100: jpeg-mingw.patch
BuildArch: noarch
BuildArch: noarch
-BuildRequires: mingw-filesystem >=
19
+BuildRequires: mingw-filesystem >=
23
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libpng
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libpng
@@
-65,17
+69,16
@@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1
make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
mkdir -p $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1
make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
-# Work around the broken makefiles...
-mv $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1/*.1 $RPM_BUILD_ROOT%{_mingw_mandir}/man1
-
# Remove static library.
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
# Remove static library.
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
+# Remove manual pages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_prefix}/man
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-95,13
+98,13
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_includedir}/jpeglib.h
%{_mingw_libdir}/libjpeg.dll.a
%{_mingw_libdir}/libjpeg.la
%{_mingw_includedir}/jpeglib.h
%{_mingw_libdir}/libjpeg.dll.a
%{_mingw_libdir}/libjpeg.la
-%{_mingw_mandir}/man1/cjpeg.1*
-%{_mingw_mandir}/man1/djpeg.1*
-%{_mingw_mandir}/man1/jpegtran.1*
-%{_mingw_mandir}/man1/rdjpgcom.1*
-%{_mingw_mandir}/man1/wrjpgcom.1*
+
%changelog
%changelog
+* Sun Sep 21 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-3
+- Fix URL.
+- Remove manpages which duplicate Fedora native.
+
* Wed Sep 10 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.
* Wed Sep 10 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.