filesystem patch
by Farkas Levente
hi,
here is my modified patch and the script for all script use the macros
and a few tab->space conversion.
may i apply it?
another important note, as we add and rebuild with -mms-bitfields in all
spec file
BuildRequires: mingw32-filesystem >= 23
Requires: mingw32-filesystem >= 23
should have to change to
BuildRequires: mingw32-filesystem >= 38
Requires: mingw32-filesystem >= 38
and there are some spec file where mingw32-filesystem only BuildRequires
and not Requires. imho all packages should have to add it. the same
apply to mingw32-example.spec too.
--
Levente "Si vis pacem para bellum!"
? mingw32-scripts.sh
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.4
diff -u -r1.4 mingw32-filesystem.spec
--- mingw32-filesystem.spec 19 Nov 2008 18:02:20 -0000 1.4
+++ mingw32-filesystem.spec 21 Nov 2008 10:31:05 -0000
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 37
+Version: 38
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
@@ -17,7 +17,7 @@
#Source3: mingw32.csh
Source4: mingw32-find-requires.sh
Source5: mingw32-find-provides.sh
-Source6: mingw32-configure.sh
+Source6: mingw32-scripts.sh
Requires: setup
Requires: rpm
@@ -72,8 +72,10 @@
mkdir -p $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure
+(cd $RPM_BUILD_ROOT%{_bindir}; for i in mingw32-env mingw32-configure mingw32-make ; do ln -s %{_libexecdir}/mingw32-scripts $i ; done)
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -130,12 +132,17 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/mingw32-configure
+%{_bindir}/*
+%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-*
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> 38-1
+- all script use macros.mingw32
+- a few tab->space conversion
+
* Wed Nov 19 2008 Richard Jones <rjones(a)redhat.com> - 37-1
- Revert part of the 36-1 patch. --build option to configure was wrong.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.3
diff -u -r1.3 mingw32-macros.mingw32
--- mingw32-macros.mingw32 19 Nov 2008 18:02:20 -0000 1.3
+++ mingw32-macros.mingw32 21 Nov 2008 10:31:05 -0000
@@ -23,16 +23,16 @@
%_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%_mingw32_cc i686-pc-mingw32-gcc
-%_mingw32_cpp i686-pc-mingw32-gcc -E
-%_mingw32_ar i686-pc-mingw32-ar
-%_mingw32_as i686-pc-mingw32-as
-%_mingw32_dlltool i686-pc-mingw32-dlltool
-%_mingw32_ranlib i686-pc-mingw32-ranlib
-%_mingw32_strip i686-pc-mingw32-strip
-%_mingw32_objdump i686-pc-mingw32-objdump
+%_mingw32_cc i686-pc-mingw32-gcc
+%_mingw32_cpp i686-pc-mingw32-gcc -E
+%_mingw32_ar i686-pc-mingw32-ar
+%_mingw32_as i686-pc-mingw32-as
+%_mingw32_dlltool i686-pc-mingw32-dlltool
+%_mingw32_ranlib i686-pc-mingw32-ranlib
+%_mingw32_strip i686-pc-mingw32-strip
+%_mingw32_objdump i686-pc-mingw32-objdump
%_mingw32_nm i686-pc-mingw32-nm
-%_mingw32_windres i686-pc-mingw32-windres
+%_mingw32_windres i686-pc-mingw32-windres
%_mingw32_cxx i686-pc-mingw32-g++
%_mingw32_cache mingw32-config.cache
15 years, 5 months
mingw32-w32api.patch
by Farkas Levente
a small patch the mingw32-w32api
--
Levente "Si vis pacem para bellum!"
--- /home/lfarkas/tmp/fedora-mingw--devel/w32api/mingw32-w32api.spec 2008-11-21 13:15:52.000000000 +0100
+++ mingw32-w32api.spec 2008-11-21 13:59:00.000000000 +0100
@@ -5,8 +5,8 @@
%define __find_provides %{_mingw32_findprovides}
Name: mingw32-w32api
-Version: 3.12
-Release: 3%{?dist}
+Version: 3.12
+Release: 4%{?dist}
Summary: MinGW Windows cross-compiler Win32 header files
License: Public Domain
@@ -15,14 +15,13 @@
Source0: http://dl.sourceforge.net/sourceforge/mingw/w32api-%{version}-mingw32-src...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-filesystem >= 38
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gcc
BuildRequires: mingw32-runtime
-Requires: mingw32-filesystem >= 23
Requires: mingw32-binutils
Requires: mingw32-gcc
Requires: mingw32-runtime
@@ -30,11 +29,6 @@
# Once this is installed, mingw32-bootstrap (binary bootstrapper) is no
# longer needed.
Obsoletes: mingw32-w32api-bootstrap
-Obsoletes: mingw-w32api-bootstrap
-
-Provides: mingw-w32api = %{version}-%{release}
-Obsoletes: mingw-w32api < 3.11-7
-
%description
MinGW Windows cross-compiler Win32 header files.
@@ -44,17 +38,13 @@
%setup -q -n w32api-%{version}-mingw32
%build
-./configure \
- --build=%_build \
- --host=%{_mingw32_host}
-
+%{_mingw32_configure}
make
%install
rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install
+%{_mingw32_makeinstall}
%clean
@@ -68,6 +58,9 @@
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 3.12-4
+- Enable _mingw32_configure
+
* Wed Nov 19 2008 Richard W.M. Jones <rjones(a)redhat.com> - 3.12-3
- Rebuild against mingw32-filesystem 37
15 years, 5 months
mingw32-runtime.patch
by Farkas Levente
hi,
rhis patch reenable _mingw32_configure in mingw32-runtime.
is it ok?
--
Levente "Si vis pacem para bellum!"
--- mingw32-runtime.spec 2008-11-21 13:15:52.000000000 +0100
+++ /home/lfarkas/rpm/SPECS/mingw32-runtime.spec 2008-11-21 13:06:58.000000000 +0100
@@ -6,7 +6,7 @@
Name: mingw32-runtime
Version: 3.15.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: MinGW Windows cross-compiler runtime and root filesystem
License: Public Domain
@@ -17,11 +17,10 @@
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 26
+BuildRequires: mingw32-filesystem >= 38
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gcc
-Requires: mingw32-filesystem >= 26
Requires: mingw32-binutils
Requires: mingw32-gcc
@@ -43,24 +42,16 @@
%build
-# NB: Do not use _mingw32_configure here as it won't work.
-CFLAGS="-I%{_mingw32_includedir}" \
-./configure \
- --build=%_build \
- --host=%{_mingw32_host}
-make
-
+MINGW_CFLAGS="%{_mingw32_cflags} -I%{_mingw32_includedir}" %{_mingw32_configure}
+%{_mingw32_make}
%install
rm -rf $RPM_BUILD_ROOT
-
-make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install
+%{_mingw32_makeinstall}
# make install places these in nonstandard locations, so move them.
mkdir -p $RPM_BUILD_ROOT%{_mingw32_docdir}
mv $RPM_BUILD_ROOT%{_mingw32_prefix}/doc/* $RPM_BUILD_ROOT%{_mingw32_docdir}/
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}
-mv $RPM_BUILD_ROOT%{_mingw32_prefix}/man/* $RPM_BUILD_ROOT%{_mingw32_mandir}/
%clean
@@ -77,6 +68,9 @@
%changelog
+* Fri Nov 21 2008 Levente Farkas <lfarkas(a)lfarkas.org> - 3.15.1-6
+- Reenable _mingw32_configure
+
* Thu Nov 20 2008 Richard W.M. Jones <rjones(a)redhat.com> - 3.15.1-5
- Don't use _mingw32_configure macro - doesn't work here.
15 years, 5 months
mingw32-gcc
by Farkas Levente
hi,
in mingw32-gcc why put a link into
/lib/i686-pc-mingw32-cpp -> ../usr/bin/i686-pc-mingw32-cpp
i see there is the same in the naive linux package, but in cross compile
env is this really required?
--
Levente "Si vis pacem para bellum!"
15 years, 5 months
release number after rebuild
by Farkas Levente
hi,
did you increase all release number after the mass rebuild? imho it'd be
useful...
--
Levente "Si vis pacem para bellum!"
15 years, 5 months
where is the doc now?
by Farkas Levente
hi,
according to mingw32-macros.mingw32
%_mingw32_docdir %{_mingw32_prefix}/share/doc
and it's not my modification:-)
while in http://fedoraproject.org/wiki/Packaging/MinGW
it's in the filesystem layout %{_mingw32_prefix}/doc
imho the whole page should have to reviewed.
--
Levente "Si vis pacem para bellum!"
15 years, 5 months
space or tab
by Farkas Levente
hi,
should we use space or tab in mingw32-macros.mingw32? currently mixed
which i hate, so i like to fix it (which one is not important for me).
--
Levente "Si vis pacem para bellum!"
15 years, 5 months