[mingw32-gettext] Removed html documentation and info pages
by Kalev Lember
commit 868e68cf1621700033cb0f64e143e4dbe8303434
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Mon May 23 06:04:40 2011 +0300
Removed html documentation and info pages
mingw32-gettext.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/mingw32-gettext.spec b/mingw32-gettext.spec
index e9eadcb..f4c7100 100644
--- a/mingw32-gettext.spec
+++ b/mingw32-gettext.spec
@@ -6,7 +6,7 @@
Name: mingw32-gettext
Version: 0.17
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
@@ -71,11 +71,13 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
-rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
-# Remove man pages, these are available in base gettext-devel.
+# Remove documentation - already available in base gettext-devel.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/
+rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/gettext/
+rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libasprintf/
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/info/
%find_lang %{name} --all-name
@@ -123,14 +125,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libintl.dll.a
%{_mingw32_libdir}/libintl.la
-%{_mingw32_docdir}/gettext
-%{_mingw32_docdir}/libasprintf/autosprintf_all.html
-
%{_mingw32_datadir}/gettext/
%{_mingw32_datadir}/aclocal/*m4
-%{_mingw32_datadir}/info/autosprintf.info
-%{_mingw32_datadir}/info/gettext.info
%files static
%defattr(-,root,root,-)
@@ -140,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 0.17-16
+- Removed html documentation and info pages
+
* Wed Apr 27 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.17.15
- Dropped the proxy-libintl pieces as the upstream gtk+ win32 maintainers
also decided to drop it and it's causing more harm than good
12 years, 11 months
[mingw32-filesystem] Own the _mingw32_datadir/cmake/ directory
by Kalev Lember
commit 750c540bd01e27a7e677e352680b00e0bf853f80
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Sat May 21 12:12:05 2011 +0300
Own the _mingw32_datadir/cmake/ directory
mingw32-filesystem.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 076bcb1..f9ed43c 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 68
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -115,6 +115,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig
mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/cmake
# We don't normally package manual pages and info files, except
# where those are not supplied by a Fedora native package. So we
@@ -165,6 +166,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
+* Sat May 21 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-2
+- Own the _mingw32_datadir/cmake/ directory
+
* Fri May 20 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-1
- Support RPM 4.9 new "fileattr" dep extraction system
- Cleaned up the spec file from cruft not needed with latest rpm
12 years, 11 months
[mingw32-filesystem] Cleaned up the spec file from cruft not needed with latest rpm
by Kalev Lember
commit 11c4c8fba587396ef960ca6fd8a4dedab6294e48
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Fri May 20 13:30:59 2011 +0300
Cleaned up the spec file from cruft not needed with latest rpm
mingw32-filesystem.spec | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 54afefa..dab8866 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -8,7 +8,6 @@ Summary: MinGW base filesystem and environment
Group: Development/Libraries
License: GPLv2+
URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: COPYING
@@ -77,8 +76,6 @@ sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh
%install
-rm -rf $RPM_BUILD_ROOT
-
mkdir -p $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
@@ -147,12 +144,8 @@ install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
@@ -175,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri May 20 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-1
- Support RPM 4.9 new "fileattr" dep extraction system
+- Cleaned up the spec file from cruft not needed with latest rpm
* Sat May 14 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 67-1
- Don't unset PKG_CONFIG_PATH in the wrapper scripts
12 years, 11 months
[mingw32-gcc] Cleaned up the spec file from cruft not needed with latest rpm
by Kalev Lember
commit 9b22addc192602799c84d56b04cc3d0edf9de35c
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Sat May 21 09:33:27 2011 +0300
Cleaned up the spec file from cruft not needed with latest rpm
mingw32-gcc.spec | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/mingw32-gcc.spec b/mingw32-gcc.spec
index bf37cfe..849aca1 100644
--- a/mingw32-gcc.spec
+++ b/mingw32-gcc.spec
@@ -9,7 +9,6 @@ License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
Group: Development/Languages
URL: http://gcc.gnu.org
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: texinfo
BuildRequires: mingw32-filesystem >= 68
@@ -126,8 +125,6 @@ popd
%install
-rm -rf $RPM_BUILD_ROOT
-
pushd build
make DESTDIR=$RPM_BUILD_ROOT install
@@ -152,12 +149,7 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
popd
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%{_bindir}/%{_mingw32_target}-gcc
%{_bindir}/%{_mingw32_target}-gcc-%{version}
%{_bindir}/%{_mingw32_target}-gccbug
@@ -199,7 +191,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw32-cpp
-%defattr(-,root,root,-)
/lib/%{_mingw32_target}-cpp
%{_bindir}/%{_mingw32_target}-cpp
%{_mandir}/man1/%{_mingw32_target}-cpp.1*
@@ -209,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
%files c++
-%defattr(-,root,root,-)
%{_bindir}/%{_mingw32_target}-g++
%{_bindir}/%{_mingw32_target}-c++
%{_mandir}/man1/%{_mingw32_target}-g++.1*
@@ -224,7 +214,6 @@ rm -rf $RPM_BUILD_ROOT
%files objc
-%defattr(-,root,root,-)
%{_libdir}/gcc/%{_mingw32_target}/%{version}/include/objc/
%{_libdir}/gcc/%{_mingw32_target}/%{version}/libobjc.a
%{_libdir}/gcc/%{_mingw32_target}/%{version}/libobjc.dll.a
@@ -233,12 +222,10 @@ rm -rf $RPM_BUILD_ROOT
%files objc++
-%defattr(-,root,root,-)
%{_libexecdir}/gcc/%{_mingw32_target}/%{version}/cc1objplus
%files gfortran
-%defattr(-,root,root,-)
%{_bindir}/%{_mingw32_target}-gfortran
%{_mandir}/man1/%{_mingw32_target}-gfortran.1*
%{_libdir}/gcc/%{_mingw32_target}/%{version}/libgfortran.a
@@ -257,6 +244,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat May 21 2011 Kalev Lember <kalev(a)smartlink.ee> - 4.5.3-3
- Rebuilt with automatic dep extraction and removed all manual
mingw32(...) provides / requires
+- Cleaned up the spec file from cruft not needed with latest rpm
* Tue May 10 2011 Kalev Lember <kalev(a)smartlink.ee> - 4.5.3-2
- Disable plugin support with a configure option, instead of deleting
12 years, 11 months
[mingw32-gcc] Rebuilt with automatic dep extraction
by Kalev Lember
commit f04325eb4834b868d29a1ed417a992200d015766
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Sat May 21 09:32:23 2011 +0300
Rebuilt with automatic dep extraction
... and removed all manual mingw32(...) provides / requires.
mingw32-gcc.spec | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/mingw32-gcc.spec b/mingw32-gcc.spec
index cf2f977..bf37cfe 100644
--- a/mingw32-gcc.spec
+++ b/mingw32-gcc.spec
@@ -2,7 +2,7 @@
Name: mingw32-gcc
Version: 4.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows cross-compiler (GCC) for C
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@@ -12,7 +12,7 @@ Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: texinfo
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 68
# Need mingw32-binutils which support %gnu_unique_object >= 2.19.51.0.14
BuildRequires: mingw32-binutils >= 2.19.51.0.14
BuildRequires: mingw32-runtime
@@ -25,23 +25,10 @@ BuildRequires: zlib-devel
BuildRequires: libgomp
BuildRequires: flex
-# NB: Explicit mingw32-filesystem dependency is REQUIRED here.
-Requires: mingw32-filesystem >= 48
# Need mingw32-binutils which support %gnu_unique_object
Requires: mingw32-binutils >= 2.19.51.0.14
-Requires: mingw32-runtime
Requires: mingw32-w32api
Requires: mingw32-cpp
-# libgomp dll is linked with pthreads, but since we don't run the
-# automatic dependency scripts, it doesn't get picked up automatically.
-Requires: mingw32-pthreads
-
-# We don't run the automatic dependency scripts which would
-# normally detect and provide the following DLL:
-Provides: mingw32(libgcc_s_sjlj-1.dll)
-Provides: mingw32(libgomp-1.dll)
-Provides: mingw32(libssp-0.dll)
-
%description
MinGW Windows cross-compiler (GCC) for C.
@@ -59,9 +46,6 @@ MinGW Windows cross-C Preprocessor
Summary: MinGW Windows cross-compiler for C++
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-# We don't run the automatic dependency scripts which would
-# normally detect and provide the following DLL:
-Provides: mingw32(libstdc++-6.dll)
%description c++
MinGW Windows cross-compiler for C++.
@@ -72,9 +56,6 @@ Summary: MinGW Windows cross-compiler support for Objective C
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
#Requires: mingw32-libobjc = %{version}-%{release}
-# We don't run the automatic dependency scripts which would
-# normally detect and provide the following DLL:
-Provides: mingw32(libobjc-2.dll)
%description objc
MinGW Windows cross-compiler support for Objective C.
@@ -94,9 +75,6 @@ MinGW Windows cross-compiler support for Objective C++.
Summary: MinGW Windows cross-compiler for FORTRAN
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-# We don't run the automatic dependency scripts which would
-# normally detect and provide the following DLL:
-Provides: mingw32(libgfortran-3.dll)
%description gfortran
MinGW Windows cross-compiler for FORTRAN.
@@ -276,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat May 21 2011 Kalev Lember <kalev(a)smartlink.ee> - 4.5.3-3
+- Rebuilt with automatic dep extraction and removed all manual
+ mingw32(...) provides / requires
+
* Tue May 10 2011 Kalev Lember <kalev(a)smartlink.ee> - 4.5.3-2
- Disable plugin support with a configure option, instead of deleting
the files in the install section
12 years, 11 months
[mingw32-filesystem] Generate versionless mingw32-filesystem Requires
by Kalev Lember
commit 2de8bb604b4ffd190b9f7d2f3a02bbc25c93b0e0
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Fri May 20 14:07:16 2011 +0300
Generate versionless mingw32-filesystem Requires
The automatically generated Requires were too strict, making every
binary rpm depend on the very latest mingw32-filesystem. For almost all
packages any mingw32-filesystem from Fedora repos is sufficient.
Using versionless mingw32-filesystem Requires avoids the situation where
e.g. downgrading mingw32-filesystem would be impossible due to other
packages needlessly depending on it.
mingw32-filesystem.spec | 4 ++--
mingw32-find-requires.sh | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index dab8866..076bcb1 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -68,7 +68,6 @@ This environment is maintained by the Fedora MinGW SIG at:
%prep
%setup -q -c -T
cp %{SOURCE0} COPYING
-sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh
%build
@@ -134,7 +133,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/themes
# NB. NOT _libdir
mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm
+install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm
install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm
@@ -169,6 +168,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
* Fri May 20 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-1
- Support RPM 4.9 new "fileattr" dep extraction system
- Cleaned up the spec file from cruft not needed with latest rpm
+- Generate versionless mingw32-filesystem Requires
* Sat May 14 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 67-1
- Don't unset PKG_CONFIG_PATH in the wrapper scripts
diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh
index 9d93388..ae1047e 100755
--- a/mingw32-find-requires.sh
+++ b/mingw32-find-requires.sh
@@ -14,9 +14,8 @@ fi
filelist=`sed "s/['\"]/\\\&/g"`
-# Everything requires mingw32-filesystem of at least the current version
-# and mingw32-runtime.
-echo 'mingw32-filesystem >= @VERSION@'
+# Everything requires mingw32-filesystem and mingw32-runtime.
+echo 'mingw32-filesystem'
echo 'mingw32-runtime'
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
12 years, 11 months
[mingw32-filesystem] Support RPM 4.9 new "fileattr" dep extraction system
by Kalev Lember
commit b4298c0ccc855b3dbd8c109eb21ed19a5b82f0e7
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Fri May 20 13:27:53 2011 +0300
Support RPM 4.9 new "fileattr" dep extraction system
mingw32-filesystem.spec | 10 +++++++++-
mingw32.attr | 3 +++
2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 5411573..54afefa 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 67
+Version: 68
Release: 1%{?dist}
Summary: MinGW base filesystem and environment
@@ -21,6 +21,7 @@ Source6: mingw32-scripts.sh
Source7: mingw32-rpmlint.config
Source8: Toolchain-mingw32.cmake
Source9: mingw32-find-debuginfo.sh
+Source10: mingw32.attr
Requires: pkgconfig
@@ -140,6 +141,9 @@ install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm
install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm
+mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs
+install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/
+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
@@ -165,9 +169,13 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/i686-pc-mingw32/
%{_datadir}/mingw32
/usr/lib/rpm/mingw32-*
+/usr/lib/rpm/fileattrs/mingw32.attr
%changelog
+* Fri May 20 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-1
+- Support RPM 4.9 new "fileattr" dep extraction system
+
* Sat May 14 2011 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 67-1
- Don't unset PKG_CONFIG_PATH in the wrapper scripts
mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171)
diff --git a/mingw32.attr b/mingw32.attr
new file mode 100644
index 0000000..fa9251a
--- /dev/null
+++ b/mingw32.attr
@@ -0,0 +1,3 @@
+%__mingw32_provides %{_rpmconfigdir}/mingw32-find-provides.sh
+%__mingw32_requires %{_rpmconfigdir}/mingw32-find-requires.sh
+%__mingw32_path ^%{_mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
12 years, 11 months