Updating branches
by Richard W.M. Jones
This question has come up a lot: Whether we should backport changes
from Rawhide to EL-5/F-10. A corollary is whether we should keep
certain packages in synch across the different branches (particularly
mingw32-filesystem). This is my opinion on this subject. Comments &
follow-ups welcome.
No we should not do this, except in the following cases:
(1) When a package is approved after a Fedora review, we should create
new packages in EL-5/F-10 as long as this doesn't require a huge
amount of effort.
(2) We should upgrade those packages to track the native versions of
packages[1] and where there are security updates.
(3) If someone asks *and* is willing to do all the required work
(provide a sensible, working patch), then we or they can upgrade the
package.
But apart from those reasons, we should leave working packages in
EL-5/F-10 untouched.
In particular there are two outstanding patches from mingw32-
filesystem-44 in Rawhide which haven't been backported. The C++
compiler detection stuff isn't necessary for F-10 or EL-5 - it appears
that the brokenness comes about as a side-effect of something in
libtool-2. The rpmlint message suppression is cosmetic. So both
patches fall under clause (3) above.
Rich.
[1] We need to get Dan's compare stuff working ...
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
15 years, 3 months
virt-top
by Farkas Levente
hi,
the same binary rename for virt-top.
--- a/virt-top/mingw32-virt-top.spec Mon Jan 26 19:59:43 2009 +0000
+++ b/virt-top/mingw32-virt-top.spec Tue Jan 27 17:14:03 2009 +0100
@@ -6,7 +6,7 @@
Name: mingw32-virt-top
Version: 1.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MinGW Windows port of top(1) for virtualization stats
License: GPLv2+
@@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
BuildRoot:
%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 35
+BuildRequires: mingw32-filesystem >= 43-6
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@ -92,6 +92,8 @@ export OCAMLFIND_CONF=%{_sysconfdir}/%{_
make DESTDIR=$RPM_BUILD_ROOT install
+# Rename win32 native binaries
+mv $RPM_BUILD_ROOT%{_mingw32_bindir}/virt-top
$RPM_BUILD_ROOT%{_mingw32_bindir}/virt-top.exe
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,10 +101,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%{_mingw32_bindir}/virt-top
+%{_mingw32_bindir}/virt-top.exe
%changelog
+* Tue Jan 27 2009 Levente Farkas <lfarkas(a)lfarkas.org> - 1.0.3-4
+- Rename win32 binaries.
+
* Sat Jan 24 2009 Richard W.M. Jones <rjones(a)redhat.com> - 1.0.3-3
- PDcurses library was renamed to libpdcurses.dll
--
Levente "Si vis pacem para bellum!"
15 years, 3 months
libjpeg
by Farkas Levente
hi,
as it's pointed out during the review i rename win32 binaries.
yours.
diff -r 871b667014c7 libjpeg/mingw32-libjpeg.spec
--- a/libjpeg/mingw32-libjpeg.spec Mon Jan 26 19:59:43 2009 +0000
+++ b/libjpeg/mingw32-libjpeg.spec Tue Jan 27 17:06:26 2009 +0100
@@ -6,7 +6,7 @@
Name: mingw32-libjpeg
Version: 6b
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
@@ -25,7 +25,7 @@ Patch100: jpeg-mingw32.patch
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 23
+BuildRequires: mingw32-filesystem >= 43-6
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@ -97,6 +97,11 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandi
# Remove manual pages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+# Rename win32 native binaries
+cd $RPM_BUILD_ROOT%{_mingw32_bindir}
+for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
+ mv $i $i.exe
+done
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,11 +110,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README
-%{_mingw32_bindir}/cjpeg
-%{_mingw32_bindir}/djpeg
-%{_mingw32_bindir}/jpegtran
-%{_mingw32_bindir}/rdjpgcom
-%{_mingw32_bindir}/wrjpgcom
+%{_mingw32_bindir}/cjpeg.exe
+%{_mingw32_bindir}/djpeg.exe
+%{_mingw32_bindir}/jpegtran.exe
+%{_mingw32_bindir}/rdjpgcom.exe
+%{_mingw32_bindir}/wrjpgcom.exe
%{_mingw32_bindir}/libjpeg-62.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
@@ -120,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 27 2009 Levente Farkas <lfarkas(a)lfarkas.org> - 6b-8
+- Rename win32 binaries.
+
* Fri Jan 23 2009 Richard W.M. Jones <rjones(a)redhat.com> - 6b-7
- Disable static libraries.
- Use _smp_mflags.
--
Levente "Si vis pacem para bellum!"
15 years, 3 months
pango patch
by Farkas Levente
add license to the pango package.
diff -r 871b667014c7 pango/mingw32-pango.spec
--- a/pango/mingw32-pango.spec Mon Jan 26 19:59:43 2009 +0000
+++ b/pango/mingw32-pango.spec Tue Jan 27 16:53:32 2009 +0100
@@ -6,7 +6,7 @@
Name: mingw32-pango
Version: 1.22.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows Pango library
License: LGPLv2+
@@ -69,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+%doc COPYING
%{_mingw32_bindir}/libpango-1.0-0.dll
%{_mingw32_bindir}/libpangocairo-1.0-0.dll
%{_mingw32_bindir}/libpangoft2-1.0-0.dll
@@ -98,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 27 2009 Levente Farkas <lfarkas(a)lfarkas.org> - 1.22.1-3
+- Include license file in documentation section.
+
* Fri Jan 23 2009 Richard W.M. Jones <rjones(a)redhat.com> - 1.22.1-2
- Disable static libraries.
- Use _smp_mflags.
--
Levente "Si vis pacem para bellum!"
15 years, 3 months
cairo
by Farkas Levente
hi,
is there any reason to include
%{_mingw32_datadir}/gtk-doc/html/cairo/
in the cairo package?
--
Levente "Si vis pacem para bellum!"
15 years, 3 months
shell scripts in mingw32 packages
by Farkas Levente
hi,
as i look through the mingw32 packages for exe files without .exe
extension i thing about whether is it useful to include perl, python and
shell scripts in these packages? or we assume may be someone have
windows perl or cygwin installed on win32? but still then i assume most
script won't working on win32.
or it's an upstream problem not ours?
--
Levente "Si vis pacem para bellum!"
15 years, 3 months
rpms/mingw32-filesystem/devel mingw32-rpmlint.config, NONE, 1.1 mingw32-filesystem.spec, 1.11, 1.12
by Richard W.M. Jones
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6745
Modified Files:
mingw32-filesystem.spec
Added Files:
mingw32-rpmlint.config
Log Message:
* Mon Jan 26 2009 Richard W.M. Jones <rjones(a)redhat.com> - 44-1
- Install rpmlint overrides file to suppress some rpmlint warnings.
--- NEW FILE mingw32-rpmlint.config ---
# rpmlint overrides file.
# This file filters out MinGW warnings.
# See: http://fedoraproject.org/wiki/MinGW/Rpmlint
# Unconditionally remove devel-file-in-non-devel rpmlint warning.
addFilter ("^mingw32-.*devel-file-in-non-devel")
# /usr/i686-pc-mingw32 is permitted by MinGW packaging guidelines.
addFilter ("^mingw32-.*non-standard-dir-in-usr i686-pc-mingw32")
# Permit *.la files (error is a bit odd, but it's what rpmlint prints).
addFilter ("^mingw32-.*script-without-shebang.*\.la$")
# GCC and libtool create executable archive files. It's not clear
# why, but we permit this for now.
addFilter ("^mingw32-.*spurious-executable-perm.*\.dll\.a$")
# *.dll.a files are permitted arch-independent objects.
addFilter ("^mingw32-.*arch-independent-package-contains-binary-or-object.*\.dll\.a$")
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mingw32-filesystem.spec 24 Jan 2009 18:11:43 -0000 1.11
+++ mingw32-filesystem.spec 26 Jan 2009 17:21:27 -0000 1.12
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 43
-Release: 6%{?dist}
+Version: 44
+Release: 1%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -18,9 +18,13 @@
Source4: mingw32-find-requires.sh
Source5: mingw32-find-provides.sh
Source6: mingw32-scripts.sh
+Source7: mingw32-rpmlint.config
Requires: setup
Requires: rpm
+Requires: rpmlint >= 0.85-2
+
+BuildRequires: rpmlint >= 0.85-2
# Note about 'Provides: mingw32(foo.dll)'
# ------------------------------------------------------------
@@ -88,6 +92,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/
+
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32
# GCC requires these directories, even though they contain links
@@ -137,6 +144,7 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
+%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config
%{_bindir}/mingw32-configure
%{_bindir}/mingw32-make
%{_libexecdir}/mingw32-scripts
@@ -145,6 +153,9 @@
%changelog
+* Mon Jan 26 2009 Richard W.M. Jones <rjones(a)redhat.com> - 44-1
+- Install rpmlint overrides file to suppress some rpmlint warnings.
+
* Sat Jan 24 2009 Richard W.M. Jones <rjones(a)redhat.com> - 43-6
- Don't claim C++ compiler exists if it's not installed, as this
breaks autoconf and (in particular) libtool.
15 years, 3 months
Questions about distro/package specific suppression of an rpmlint check
by Richard W.M. Jones
(To rpmlint-discuss, CC'd to fedora-mingw)
I would like to suppress certain rpmlint errors in a distro/package
specific way, ie. without needing to involve changes to upstream
rpmlint.
As a concrete example, if the distribution is Fedora and the package
name is mingw32-*, I would like to suppress the 'devel-file-in-
non-devel' package warning completely. There are others too listed at
[1] but for now I'm just concentrating on this one warning.
I read some other messages on this list, for example [2] and the code
at [3], however these seem to concern adding new warnings/errors,
which is certainly a useful thing to do, but not what I want to do at
the moment.
The other problem is that dropping files into /usr/share/rpmlint isn't
manageable from RPM. Firstly it requires editing an array entry in
/usr/share/rpmlint/Config.py. Secondly (less importantly) it means
that our base package would need to depend on rpmlint.
Any thoughts on this? I'm probably missing how to do it.
Rich.
[1] http://fedoraproject.org/wiki/MinGW/Rpmlint
[2] https://www.zarb.org/pipermail/rpmlint-discuss/2008-November/000649.html
[3] http://plf.zarb.org/svn/rpmlint/PlfCheck.py
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
15 years, 3 months