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
+BR mingw32-libxml2.
[fedora-mingw.git]
/
gnutls
/
mingw32-gnutls.spec
diff --git
a/gnutls/mingw32-gnutls.spec
b/gnutls/mingw32-gnutls.spec
index
044bdab
..
3ea3380
100644
(file)
--- a/
gnutls/mingw32-gnutls.spec
+++ b/
gnutls/mingw32-gnutls.spec
@@
-30,10
+30,20
@@
BuildRequires: mingw32-binutils
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt >= 1.2.2
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt >= 1.2.2
+BuildRequires: mingw32-gettext
BuildRequires: mingw32-iconv
BuildRequires: mingw32-readline
BuildRequires: mingw32-zlib
BuildRequires: mingw32-iconv
BuildRequires: mingw32-readline
BuildRequires: mingw32-zlib
-BuildRequires: autoconf automake libtool
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+
+# Yes, really ...
+BuildRequires: pkgconfig
+
+# For native /usr/bin/msgfmt etc.
+BuildRequires: gettext
Requires: pkgconfig
Requires: pkgconfig
@@
-53,8
+63,11
@@
for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.
touch lib/$i
done
touch lib/$i
done
-%build
+libtoolize --force --copy
autoreconf
autoreconf
+
+
+%build
PATH="%{_mingw32_bindir}:$PATH" \
%{_mingw32_configure} \
--with-included-libtasn1 \
PATH="%{_mingw32_bindir}:$PATH" \
%{_mingw32_configure} \
--with-included-libtasn1 \
@@
-74,7
+87,6
@@
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-
%find_lang gnutls
%find_lang gnutls
@@
-119,6
+131,7
@@
rm -rf $RPM_BUILD_ROOT
- Rebase MinGW patch to 2.6.3.
- +BR mingw32-dlfcn.
- +BR mingw32-readline.
- Rebase MinGW patch to 2.6.3.
- +BR mingw32-dlfcn.
- +BR mingw32-readline.
+- Force rebuild of libtool.
* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-4
- Requires pkgconfig.
* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-4
- Requires pkgconfig.