git.annexia.org
/
fedora-mingw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c773c8c
)
Bring up to new package standards
author
Richard W.M. Jones
<rjones@redhat.com>
Sun, 21 Sep 2008 12:41:20 +0000
(13:41 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Sun, 21 Sep 2008 12:41:20 +0000
(13:41 +0100)
freetype/mingw-freetype.spec
patch
|
blob
|
history
glib2/mingw-glib2.spec
patch
|
blob
|
history
iconv/mingw-iconv.spec
patch
|
blob
|
history
libjpeg/mingw-libjpeg.spec
patch
|
blob
|
history
libpng/mingw-libpng.spec
patch
|
blob
|
history
libxml2/mingw-libxml2.spec
patch
|
blob
|
history
zlib/mingw-zlib.spec
patch
|
blob
|
history
diff --git
a/freetype/mingw-freetype.spec
b/freetype/mingw-freetype.spec
index
14efc25
..
16ce10a
100644
(file)
--- a/
freetype/mingw-freetype.spec
+++ b/
freetype/mingw-freetype.spec
@@
-6,7
+6,7
@@
Name: mingw-freetype
Version: 2.3.7
Name: mingw-freetype
Version: 2.3.7
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Freetype library
License: FTL or GPLv2+
Summary: MinGW Windows Freetype library
License: FTL or GPLv2+
@@
-17,7
+17,7
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 2
3
+BuildRequires: mingw-filesystem >= 2
5
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-zlib
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-zlib
@@
-57,7
+57,11
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_libdir}/pkgconfig/freetype2.pc
%{_mingw_datadir}/aclocal/freetype2.m4
%{_mingw_libdir}/pkgconfig/freetype2.pc
%{_mingw_datadir}/aclocal/freetype2.m4
+
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-3
+- Depends on filesystem >= 25.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-2
- Fix source URL.
- Remove static libraries.
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-2
- Fix source URL.
- Remove static libraries.
diff --git
a/glib2/mingw-glib2.spec
b/glib2/mingw-glib2.spec
index
83795e8
..
7697a65
100644
(file)
--- a/
glib2/mingw-glib2.spec
+++ b/
glib2/mingw-glib2.spec
@@
-6,7
+6,7
@@
Name: mingw-glib2
Version: 2.18.0
Name: mingw-glib2
Version: 2.18.0
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@@
-51,6
+51,10
@@
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
+# Remove manpages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-100,16
+104,12
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_datadir}/gtk-doc/html/glib/
%{_mingw_datadir}/gtk-doc/html/gobject/
%{_mingw_datadir}/locale/*/LC_MESSAGES/glib20.mo
%{_mingw_datadir}/gtk-doc/html/glib/
%{_mingw_datadir}/gtk-doc/html/gobject/
%{_mingw_datadir}/locale/*/LC_MESSAGES/glib20.mo
-%{_mingw_mandir}/man1/glib-genmarshal.1*
-%{_mingw_mandir}/man1/glib-gettextize.1*
-%{_mingw_mandir}/man1/glib-mkenums.1*
-%{_mingw_mandir}/man1/gobject-query.1*
-%{_mingw_mandir}/man1/gtester-report.1*
-%{_mingw_mandir}/man1/gtester.1*
-
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.0-3
+- Remove manpages which duplicate Fedora native.
+
* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-2
- Add BR on pkgconfig, gettext and glib2 (native)
* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-2
- Add BR on pkgconfig, gettext and glib2 (native)
diff --git
a/iconv/mingw-iconv.spec
b/iconv/mingw-iconv.spec
index
fea6c24
..
88bb2ad
100644
(file)
--- a/
iconv/mingw-iconv.spec
+++ b/
iconv/mingw-iconv.spec
@@
-6,7
+6,7
@@
Name: mingw-iconv
Version: 1.12
Name: mingw-iconv
Version: 1.12
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
@@
-24,21
+24,31
@@
BuildRequires: mingw-binutils
%description
MinGW Windows Iconv library
%description
MinGW Windows Iconv library
+
%prep
%setup -q -n libiconv-%{version}
%prep
%setup -q -n libiconv-%{version}
+
%build
%{_mingw_configure}
make
%build
%{_mingw_configure}
make
+
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+# Remove documentation which duplicates what is already in
+# Fedora native packages.
+rm -rf $RPM_BUILD_ROOT%{_mingw_docdir}/libiconv/
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root)
%{_mingw_bindir}/iconv
%files
%defattr(-,root,root)
%{_mingw_bindir}/iconv
@@
-53,15
+63,12
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_libdir}/libcharset.la
%{_mingw_libdir}/libiconv.dll.a
%{_mingw_libdir}/libiconv.la
%{_mingw_libdir}/libcharset.la
%{_mingw_libdir}/libiconv.dll.a
%{_mingw_libdir}/libiconv.la
-%{_mingw_docdir}/libiconv/
-%{_mingw_mandir}/man1/iconv.1*
-%{_mingw_mandir}/man3/iconv.3*
-%{_mingw_mandir}/man3/iconv_close.3*
-%{_mingw_mandir}/man3/iconv_open.3*
-%{_mingw_mandir}/man3/iconvctl.3*
%changelog
%changelog
+* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
+- Remove documentation which duplicates what is in Fedora native packages.
+
* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
- Use RPM macros from mingw-filesystem.
* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
- Use RPM macros from mingw-filesystem.
diff --git
a/libjpeg/mingw-libjpeg.spec
b/libjpeg/mingw-libjpeg.spec
index
72ba205
..
65fb352
100644
(file)
--- a/
libjpeg/mingw-libjpeg.spec
+++ b/
libjpeg/mingw-libjpeg.spec
@@
-6,14
+6,14
@@
Name: mingw-libjpeg
Version: 6b
Name: mingw-libjpeg
Version: 6b
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
URL: http://www.ijg.org/
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Summary: MinGW Windows Libjpeg library
License: IJG
URL: http://www.ijg.org/
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.
bz2
+Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.
gz
Source1: libjpeg-configure.in
Patch1: jpeg-c++.patch
Source1: libjpeg-configure.in
Patch1: jpeg-c++.patch
@@
-69,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
@@
-99,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.
diff --git
a/libpng/mingw-libpng.spec
b/libpng/mingw-libpng.spec
index
6769998
..
7e50225
100644
(file)
--- a/
libpng/mingw-libpng.spec
+++ b/
libpng/mingw-libpng.spec
@@
-6,7
+6,7
@@
Name: mingw-libpng
Version: 1.2.31
Name: mingw-libpng
Version: 1.2.31
-Release:
2
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW Windows Libpng library
License: zlib
Summary: MinGW Windows Libpng library
License: zlib
@@
-41,6
+41,9
@@
make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
+# No need to distribute manpages which appear in the Fedora
+# native packages already.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-62,11
+65,12
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_libdir}/libpng12.la
%{_mingw_libdir}/pkgconfig/libpng.pc
%{_mingw_libdir}/pkgconfig/libpng12.pc
%{_mingw_libdir}/libpng12.la
%{_mingw_libdir}/pkgconfig/libpng.pc
%{_mingw_libdir}/pkgconfig/libpng12.pc
-%{_mingw_mandir}/man3/libpng.3*
-%{_mingw_mandir}/man3/libpngpf.3*
-%{_mingw_mandir}/man5/png.5*
+
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-3
+- Don't duplicate Fedora native manpages.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
- Remove static library.
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
- Remove static library.
diff --git
a/libxml2/mingw-libxml2.spec
b/libxml2/mingw-libxml2.spec
index
0138197
..
ae7b176
100644
(file)
--- a/
libxml2/mingw-libxml2.spec
+++ b/
libxml2/mingw-libxml2.spec
@@
-6,7
+6,7
@@
Name: mingw-libxml2
Version: 2.6.32
Name: mingw-libxml2
Version: 2.6.32
-Release:
4
%{?dist}
+Release:
5
%{?dist}
Summary: MinGW Windows libxml2 XML processing library
License: LGPLv2+
Summary: MinGW Windows libxml2 XML processing library
License: LGPLv2+
@@
-44,6
+44,9
@@
make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libxml2.a
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libxml2.a
+# Remove manpages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-64,11
+67,12
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_datadir}/aclocal/*
%{_mingw_docdir}/libxml2-%{version}/
%{_mingw_datadir}/gtk-doc/html/libxml2/
%{_mingw_datadir}/aclocal/*
%{_mingw_docdir}/libxml2-%{version}/
%{_mingw_datadir}/gtk-doc/html/libxml2/
-%{_mingw_mandir}/man1/*
-%{_mingw_mandir}/man3/*
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-5
+- Remove manpages which duplicate Fedora native.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-4
- Remove static libraries.
- List libdir files explicitly.
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-4
- Remove static libraries.
- List libdir files explicitly.
diff --git
a/zlib/mingw-zlib.spec
b/zlib/mingw-zlib.spec
index
9d34350
..
31c032e
100644
(file)
--- a/
zlib/mingw-zlib.spec
+++ b/
zlib/mingw-zlib.spec
@@
-7,7
+7,7
@@
Name: mingw-zlib
Version: 1.2.3
Name: mingw-zlib
Version: 1.2.3
-Release:
7
%{?dist}
+Release:
8
%{?dist}
Summary: MinGW Windows zlib compression library
License: zlib
Summary: MinGW Windows zlib compression library
License: zlib
@@
-55,7
+55,6
@@
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}/man3
make -f win32/Makefile.gcc \
INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
make -f win32/Makefile.gcc \
INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
@@
-70,8
+69,6
@@
mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
# Remove static library.
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
# Remove static library.
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
-%__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
-
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-83,10
+80,12
@@
rm -rf $RPM_BUILD_ROOT
%{_mingw_includedir}/zlib.h
%{_mingw_libdir}/libz.dll.a
%{_mingw_bindir}/zlib1.dll
%{_mingw_includedir}/zlib.h
%{_mingw_libdir}/libz.dll.a
%{_mingw_bindir}/zlib1.dll
-%{_mingw_mandir}/man3/zlib.3
%changelog
%changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
+- Remove manpage.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-7
- Remove static library.
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-7
- Remove static library.