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
Need to BR the C++ compiler.
[fedora-mingw.git]
/
gnutls
/
mingw32-gnutls.spec
diff --git
a/gnutls/mingw32-gnutls.spec
b/gnutls/mingw32-gnutls.spec
index
ec269bc
..
bcbdcbf
100644
(file)
--- a/
gnutls/mingw32-gnutls.spec
+++ b/
gnutls/mingw32-gnutls.spec
@@
-6,7
+6,7
@@
Name: mingw32-gnutls
Version: 2.6.3
Name: mingw32-gnutls
Version: 2.6.3
-Release:
1
%{?dist}
+Release:
4
%{?dist}
Summary: MinGW Windows GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
Summary: MinGW Windows GnuTLS TLS/SSL encryption library
License: GPLv3+ and LGPLv2+
@@
-22,17
+22,29
@@
BuildArch: noarch
Patch1: gnutls-2.6.2-nosrp.patch
# MinGW-specific patches.
Patch1: gnutls-2.6.2-nosrp.patch
# MinGW-specific patches.
-Patch1000:
gnutls
-certtool-build.patch
+Patch1000:
mingw32-gnutls-2.6.3
-certtool-build.patch
-BuildRequires: mingw32-filesystem >=
25
+BuildRequires: mingw32-filesystem >=
40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc
+BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-binutils
+BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt >= 1.2.2
BuildRequires: mingw32-libgpg-error
BuildRequires: mingw32-libgcrypt >= 1.2.2
-BuildRequires: mingw32-iconv
BuildRequires: mingw32-gettext
BuildRequires: mingw32-gettext
+BuildRequires: mingw32-iconv
+BuildRequires: mingw32-readline
BuildRequires: mingw32-zlib
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
@@
-52,14
+64,21
@@
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
+%if 0%{?fedora} > 10
+libtoolize --force --copy
+aclocal
autoreconf
autoreconf
+%endif
+
+
+%build
PATH="%{_mingw32_bindir}:$PATH" \
%{_mingw32_configure} \
--with-included-libtasn1 \
--disable-srp-authentication \
--disable-static
PATH="%{_mingw32_bindir}:$PATH" \
%{_mingw32_configure} \
--with-included-libtasn1 \
--disable-srp-authentication \
--disable-static
-make %{?_smp_mflags}
+# %{?_smp_mflags} doesn't build correctly.
+make
%install
%install
@@
-72,7
+91,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
@@
-82,6
+100,7
@@
rm -rf $RPM_BUILD_ROOT
%files -f gnutls.lang
%defattr(-,root,root)
%files -f gnutls.lang
%defattr(-,root,root)
+%doc COPYING COPYING.LIB
%{_mingw32_bindir}/certtool.exe
%{_mingw32_bindir}/gnutls-cli-debug.exe
%{_mingw32_bindir}/gnutls-cli.exe
%{_mingw32_bindir}/certtool.exe
%{_mingw32_bindir}/gnutls-cli-debug.exe
%{_mingw32_bindir}/gnutls-cli.exe
@@
-109,12
+128,21
@@
rm -rf $RPM_BUILD_ROOT
%changelog
%changelog
-* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-1
+* Thu Feb 19 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-4
+- +BR mingw32-gcc-c++
+
+* Fri Feb 6 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-3
+- Include license.
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.6.3-2
- Rebase to native Fedora version 2.6.3.
- Enable C++ library.
- Rebase to native Fedora version 2.6.3.
- Enable C++ library.
-- Use _smp_mflags.
- Use find_lang macro.
- Don't build static library.
- Use find_lang macro.
- Don't build static library.
+- 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.