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:
dba2122
)
Remove PKG_CONFIG_PATH since its set in mingw_cflags by default now. Misc bug other...
author
Daniel P. Berrange
<berrange@redhat.com>
Wed, 10 Sep 2008 11:33:19 +0000
(07:33 -0400)
committer
Daniel P. Berrange
<berrange@redhat.com>
Wed, 10 Sep 2008 11:33:19 +0000
(07:33 -0400)
atk/mingw-atk.spec
patch
|
blob
|
history
cairo/mingw-cairo.spec
patch
|
blob
|
history
fontconfig/mingw-fontconfig.spec
patch
|
blob
|
history
gettext/mingw-gettext.spec
patch
|
blob
|
history
gnutls/mingw-gnutls.spec
patch
|
blob
|
history
gtk2/mingw-gtk2.spec
patch
|
blob
|
history
libgcrypt/mingw-libgcrypt.spec
patch
|
blob
|
history
libvirt/mingw-libvirt.spec
patch
|
blob
|
history
pango/mingw-pango.spec
patch
|
blob
|
history
diff --git
a/atk/mingw-atk.spec
b/atk/mingw-atk.spec
index
df65723
..
596c065
100644
(file)
--- a/
atk/mingw-atk.spec
+++ b/
atk/mingw-atk.spec
@@
-30,7
+30,6
@@
MinGW Windows Atk library.
%patch1 -p1
%build
%patch1 -p1
%build
-PKG_CONFIG_PATH="%{_mingw_libdir}/pkgconfig" \
%{_mingw_configure}
make
%{_mingw_configure}
make
diff --git
a/cairo/mingw-cairo.spec
b/cairo/mingw-cairo.spec
index
924444b
..
bb9525e
100644
(file)
--- a/
cairo/mingw-cairo.spec
+++ b/
cairo/mingw-cairo.spec
@@
-30,7
+30,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
diff --git
a/fontconfig/mingw-fontconfig.spec
b/fontconfig/mingw-fontconfig.spec
index
dad57ca
..
ae5c7e4
100644
(file)
--- a/
fontconfig/mingw-fontconfig.spec
+++ b/
fontconfig/mingw-fontconfig.spec
@@
-16,6
+16,7
@@
BuildArch: noarch
BuildRequires: mingw-filesystem >= 19
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-filesystem >= 19
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
+BuildRequires: mingw-freetype
%description
MinGW Windows Fontconfig library.
%description
MinGW Windows Fontconfig library.
@@
-25,13
+26,7
@@
MinGW Windows Fontconfig library.
%setup -q -n fontconfig-%{version}
%build
%setup -q -n fontconfig-%{version}
%build
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
-#{_mingw_configure} --with-arch=i686
- CC="%{_mingw_cc}" \
- CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" \
- ./configure \
- --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \
- --prefix=%{_mingw_prefix} --with-arch=i686
+%{_mingw_configure} --with-arch=i686
make
make
diff --git
a/gettext/mingw-gettext.spec
b/gettext/mingw-gettext.spec
index
b8acaa2
..
52d4608
100644
(file)
--- a/
gettext/mingw-gettext.spec
+++ b/
gettext/mingw-gettext.spec
@@
-40,6
+40,7
@@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
diff --git
a/gnutls/mingw-gnutls.spec
b/gnutls/mingw-gnutls.spec
index
65c5165
..
6db6945
100644
(file)
--- a/
gnutls/mingw-gnutls.spec
+++ b/
gnutls/mingw-gnutls.spec
@@
-43,7
+43,7
@@
make
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
diff --git
a/gtk2/mingw-gtk2.spec
b/gtk2/mingw-gtk2.spec
index
7cebe4f
..
e6de6b7
100644
(file)
--- a/
gtk2/mingw-gtk2.spec
+++ b/
gtk2/mingw-gtk2.spec
@@
-36,7
+36,6
@@
MinGW Windows Gtk2 library.
%build
# XXX fix jasper dlls
%build
# XXX fix jasper dlls
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
%{_mingw_configure} --without-jasper
make
%{_mingw_configure} --without-jasper
make
diff --git
a/libgcrypt/mingw-libgcrypt.spec
b/libgcrypt/mingw-libgcrypt.spec
index
c502734
..
fab8761
100644
(file)
--- a/
libgcrypt/mingw-libgcrypt.spec
+++ b/
libgcrypt/mingw-libgcrypt.spec
@@
-36,7
+36,7
@@
make
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
diff --git
a/libvirt/mingw-libvirt.spec
b/libvirt/mingw-libvirt.spec
index
3082670
..
eb8456e
100644
(file)
--- a/
libvirt/mingw-libvirt.spec
+++ b/
libvirt/mingw-libvirt.spec
@@
-1,8
+1,8
@@
-%
define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%
include /usr/lib/rpm/mingw-defs
Name: mingw-libvirt
Name: mingw-libvirt
-Version: 0.4.
4
-Release:
2%{?dist
}
+Version: 0.4.
5
+Release:
1%{?dist}%{?extra_release
}
Summary: MinGW Windows libvirt virtualization library
License: LGPLv2+
Summary: MinGW Windows libvirt virtualization library
License: LGPLv2+
@@
-11,20
+11,16
@@
URL: http://www.libvirt.org/
Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: mingw-filesystem >= 19
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libgpg-error
BuildRequires: mingw-libgcrypt
BuildRequires: mingw-gnutls
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libgpg-error
BuildRequires: mingw-libgcrypt
BuildRequires: mingw-gnutls
+BuildRequires: mingw-gettext
BuildRequires: mingw-libxml2
BuildRequires: mingw-portablexdr
BuildRequires: mingw-libxml2
BuildRequires: mingw-portablexdr
-Requires: mingw-runtime
-Requires: mingw-libgpg-error
-Requires: mingw-libgcrypt
-Requires: mingw-gnutls
-Requires: mingw-libxml2
-
%description
MinGW Windows libvirt virtualization library.
%description
MinGW Windows libvirt virtualization library.
@@
-34,17
+30,17
@@
MinGW Windows libvirt virtualization library.
%build
%build
-PKG_CONFIG_PATH="%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \
-
CC="i686-pc-mingw32-gcc"
\
-
CFLAGS="-O2 -g -Wall -pipe"
\
-
./configure
\
- --
build=%_build
\
- --
host=i686-pc-mingw32
\
- --
prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw
\
- --without-
xen --without-qemu --without-libvirtd
\
- --without-
sasl
-# XXX Should include SASL, and maybe polkit?
-
+# XXX enable SASL in future
+
%{_mingw_configure}
\
+
--without-sasl
\
+
--without-avahi
\
+ --
without-polkit
\
+ --
without-python
\
+ --
without-xen
\
+ --without-
qemu
\
+ --without-
lxc \
+ --without-openvz \
+ --without-libvirtd
make
make
@@
-53,6
+49,9
@@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT/%{_mingw_sysconfdir}/libvirt
+rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/gtk-doc/*
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-60,18
+59,23
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_mingw_bindir}/libvirt-0.dll
+%{_mingw_bindir}/virsh.exe
+%{_mingw_libdir}/libvirt.a
+%{_mingw_libdir}/libvirt.dll.a
+%{_mingw_libdir}/libvirt.la
+%{_mingw_libdir}/pkgconfig/libvirt.pc
-%changelog
-* Tue Sep 2 2008 <berrange@li15-219.members.linode.com> - 0.4.4-2
-- Add BR on portablexdr, set PKG_CONFIG_PATH for libxml/gnutls, set CFLAGS
+%{_mingw_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+
+%dir %{_mingw_includedir}/libvirt
+%{_mingw_includedir}/libvirt/libvirt.h
+%{_mingw_includedir}/libvirt/virterror.h
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4-1
+%{_mingw_mandir}/man1/virsh.1*
+
+
+%changelog
+* Tue Sep 2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-1
- Initial RPM release, largely based on earlier work from several sources.
- Initial RPM release, largely based on earlier work from several sources.
diff --git
a/pango/mingw-pango.spec
b/pango/mingw-pango.spec
index
091cdba
..
dca3f3f
100644
(file)
--- a/
pango/mingw-pango.spec
+++ b/
pango/mingw-pango.spec
@@
-30,7
+30,6
@@
MinGW Windows Pango library.
%setup -q -n pango-%{version}
%build
%setup -q -n pango-%{version}
%build
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
%{_mingw_configure}
make
%{_mingw_configure}
make