From 5ec1ed40c290aaa0f259ca1b22c68db0cfd7b024e095d1647a3c1dd2cecba417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 07:40:19 +0000 Subject: [PATCH 01/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=50 --- gawk.changes | 7 +++++++ gawk.spec | 31 +++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/gawk.changes b/gawk.changes index 71216b1..6cfd4c1 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 10 07:39:22 UTC 2017 - josef.moellers@suse.com + +- Split off a seperate package "gawk-extensions-devel" + which contains the .h file describing the API, a set of + sample extensions and their manual pages. + ------------------------------------------------------------------- Mon Sep 5 20:27:40 UTC 2016 - astieger@suse.com diff --git a/gawk.spec b/gawk.spec index 2a7ee5a..f84895a 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,6 @@ Name: gawk Version: 4.1.4 Release: 0 -Summary: GNU awk -License: GPL-3.0+ -Group: Productivity/Text/Utilities Url: http://www.gnu.org/software/gawk/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig @@ -35,10 +32,22 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%description +%pakage -n gawk +Summary: GNU awk +License: GPL-3.0+ +Group: Productivity/Text/Utilities + +%description -n gawk GNU awk is upwardly compatible with the System V Release 4 awk. It is almost completely POSIX 1003.2 compliant. +%package -n gawk-extensions-devel +Summary: Files and samples for gawk extensions +Group: System/Libraries + +%description -n gawk-extensions-devel +Contains API description and sample extensions for gawk + %prep %setup -q chmod -x COPYING @@ -73,7 +82,7 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %find_lang %{name} -%post +%post -n gawk %{_sbindir}/update-alternatives \ --install /bin/awk awk %{_bindir}/gawk 20 \ --slave %{_bindir}/awk usr-bin-awk %{_bindir}/gawk \ @@ -81,14 +90,14 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz -%preun +%preun -n gawk %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk fi -%files -f %{name}.lang +%files -n gawk -f %{name}.lang %defattr(-,root,root) #UsrMerge /bin/awk @@ -105,12 +114,14 @@ fi %{_bindir}/gawk %{_bindir}/igawk %{_libdir}/awk -%{_libdir}/gawk %{_datadir}/awk -%{_includedir}/gawkapi.h %{_infodir}/*.info.gz %{_mandir}/man1/gawk.1%{?ext_man} %{_mandir}/man1/igawk.1%{?ext_man} + +%files -n gawk-extensions-devel +%{_libdir}/gawk +%{_includedir}/gawkapi.h %{_mandir}/man3/*%{?ext_man} %changelog From 8e792ed5656de7dd2ff6f1e4f4900efa8274290bbec1aea2e97234b05428dc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 07:41:46 +0000 Subject: [PATCH 02/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=51 --- gawk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gawk.spec b/gawk.spec index f84895a..398fc8d 100644 --- a/gawk.spec +++ b/gawk.spec @@ -32,7 +32,7 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%pakage -n gawk +%package -n gawk Summary: GNU awk License: GPL-3.0+ Group: Productivity/Text/Utilities From e7a92780d9f4bda8be90dc297d10863768dc34cb6c7f71c5db6155bd43f5e55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 07:43:55 +0000 Subject: [PATCH 03/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=52 --- gawk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gawk.spec b/gawk.spec index 398fc8d..6b966fb 100644 --- a/gawk.spec +++ b/gawk.spec @@ -19,6 +19,9 @@ Name: gawk Version: 4.1.4 Release: 0 +Summary: GNU awk +License: GPL-3.0+ +Group: Productivity/Text/Utilities Url: http://www.gnu.org/software/gawk/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig From f36d1ab9d203478a93aed2feee1fe1a0c890e0151b45eee53e4a600cb9077dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 07:46:54 +0000 Subject: [PATCH 04/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=53 --- gawk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gawk.spec b/gawk.spec index 6b966fb..47b3d2f 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,12 +35,12 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package -n gawk +%package Summary: GNU awk License: GPL-3.0+ Group: Productivity/Text/Utilities -%description -n gawk +%description GNU awk is upwardly compatible with the System V Release 4 awk. It is almost completely POSIX 1003.2 compliant. From 267d41750646f8194c9d5e05fbefd543a7730ecd823ff222e7a172a9062bf6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:00:30 +0000 Subject: [PATCH 05/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=54 --- gawk.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gawk.spec b/gawk.spec index 47b3d2f..c213023 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,16 +35,18 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package +%package -n gawk +Name: gawk Summary: GNU awk License: GPL-3.0+ Group: Productivity/Text/Utilities -%description +%description -n gawk GNU awk is upwardly compatible with the System V Release 4 awk. It is almost completely POSIX 1003.2 compliant. %package -n gawk-extensions-devel +Name: gawk-extensions-devel Summary: Files and samples for gawk extensions Group: System/Libraries From f31b1afa0d803ef8829c151039ef7b404a977416b0053f2930eff5b7aa24de58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:02:47 +0000 Subject: [PATCH 06/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=55 --- gawk.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gawk.spec b/gawk.spec index c213023..faea27b 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,15 +35,14 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package -n gawk -Name: gawk -Summary: GNU awk -License: GPL-3.0+ -Group: Productivity/Text/Utilities +# %package -n gawk +# Summary: GNU awk +# License: GPL-3.0+ +# Group: Productivity/Text/Utilities -%description -n gawk -GNU awk is upwardly compatible with the System V Release 4 awk. It is -almost completely POSIX 1003.2 compliant. +# %description -n gawk +# GNU awk is upwardly compatible with the System V Release 4 awk. It is +# almost completely POSIX 1003.2 compliant. %package -n gawk-extensions-devel Name: gawk-extensions-devel From af988175b69ddbce27adc6dfd6e8923e789fd5245472393740c7d5037dbeb738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:04:27 +0000 Subject: [PATCH 07/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=56 --- gawk.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gawk.spec b/gawk.spec index faea27b..e7880b3 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,15 +35,6 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -# %package -n gawk -# Summary: GNU awk -# License: GPL-3.0+ -# Group: Productivity/Text/Utilities - -# %description -n gawk -# GNU awk is upwardly compatible with the System V Release 4 awk. It is -# almost completely POSIX 1003.2 compliant. - %package -n gawk-extensions-devel Name: gawk-extensions-devel Summary: Files and samples for gawk extensions From e5d7be4df5261f10e45e06425a019c016efce16a7a757c652b84f7344802d120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:08:07 +0000 Subject: [PATCH 08/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=57 --- gawk.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gawk.spec b/gawk.spec index e7880b3..5c328e5 100644 --- a/gawk.spec +++ b/gawk.spec @@ -36,7 +36,6 @@ Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n gawk-extensions-devel -Name: gawk-extensions-devel Summary: Files and samples for gawk extensions Group: System/Libraries From 6c261d0260805cf77a64c0fe01e4e5bc57645ffe3fb583cb02fd5834e25ffd73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:10:46 +0000 Subject: [PATCH 09/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=58 --- gawk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gawk.spec b/gawk.spec index 5c328e5..4225c81 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,6 +35,10 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build +%description -n gawk +GNU awk is upwardly compatible with the System V Release 4 awk. It is +almost completely POSIX 1003.2 compliant. + %package -n gawk-extensions-devel Summary: Files and samples for gawk extensions Group: System/Libraries From 84062e68ac6b65bea171cad48ca38e38c613db67af347b1189b443ac6cee3bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:17:54 +0000 Subject: [PATCH 10/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=59 --- gawk.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gawk.spec b/gawk.spec index 4225c81..e617312 100644 --- a/gawk.spec +++ b/gawk.spec @@ -39,11 +39,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build GNU awk is upwardly compatible with the System V Release 4 awk. It is almost completely POSIX 1003.2 compliant. -%package -n gawk-extensions-devel +%package -n gawk-devel Summary: Files and samples for gawk extensions -Group: System/Libraries +Group: Development/Libraries/C and C++ +Requires: gawk -%description -n gawk-extensions-devel +%description -n gawk-devel Contains API description and sample extensions for gawk %prep @@ -117,7 +118,7 @@ fi %{_mandir}/man1/gawk.1%{?ext_man} %{_mandir}/man1/igawk.1%{?ext_man} -%files -n gawk-extensions-devel +%files -n gawk-devel %{_libdir}/gawk %{_includedir}/gawkapi.h %{_mandir}/man3/*%{?ext_man} From 4fec77f034258f357d0cd3a681fcd247136a2fa74c35336fb39cecf67eccfb38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:20:44 +0000 Subject: [PATCH 11/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=60 --- gawk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gawk.spec b/gawk.spec index e617312..a2a3ea7 100644 --- a/gawk.spec +++ b/gawk.spec @@ -42,7 +42,7 @@ almost completely POSIX 1003.2 compliant. %package -n gawk-devel Summary: Files and samples for gawk extensions Group: Development/Libraries/C and C++ -Requires: gawk +Requires: gawk = %{version} %description -n gawk-devel Contains API description and sample extensions for gawk From 6249595ae3912787b9388fc90226f914f5908df2c3d3d36605b18de0fe997f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 08:26:49 +0000 Subject: [PATCH 12/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=61 --- gawk.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gawk.changes b/gawk.changes index 6cfd4c1..2083375 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Apr 10 07:39:22 UTC 2017 - josef.moellers@suse.com -- Split off a seperate package "gawk-extensions-devel" +- Split off a seperate package "gawk-devel" which contains the .h file describing the API, a set of sample extensions and their manual pages. From baa088ae50c05610e5f0c3b3dc3c9cd2b7422665ff04a08c04c19cc824637a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 09:19:35 +0000 Subject: [PATCH 13/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=62 --- gawk.changes | 6 +++--- gawk.rpmlintrc | 1 + gawk.spec | 22 ++++++---------------- 3 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 gawk.rpmlintrc diff --git a/gawk.changes b/gawk.changes index 2083375..9906c28 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Mon Apr 10 07:39:22 UTC 2017 - josef.moellers@suse.com -- Split off a seperate package "gawk-devel" - which contains the .h file describing the API, a set of - sample extensions and their manual pages. +- Added an explicit rpmlint rule to keep one file (gawkapi.h) + from requiring a separate package. + [+gawk.rpmlintrc] ------------------------------------------------------------------- Mon Sep 5 20:27:40 UTC 2016 - astieger@suse.com diff --git a/gawk.rpmlintrc b/gawk.rpmlintrc new file mode 100644 index 0000000..eb4daa3 --- /dev/null +++ b/gawk.rpmlintrc @@ -0,0 +1 @@ +addFilter("E: devel-file-in-non-devel-package") diff --git a/gawk.spec b/gawk.spec index a2a3ea7..29a20b5 100644 --- a/gawk.spec +++ b/gawk.spec @@ -35,18 +35,10 @@ Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build -%description -n gawk +%description GNU awk is upwardly compatible with the System V Release 4 awk. It is almost completely POSIX 1003.2 compliant. -%package -n gawk-devel -Summary: Files and samples for gawk extensions -Group: Development/Libraries/C and C++ -Requires: gawk = %{version} - -%description -n gawk-devel -Contains API description and sample extensions for gawk - %prep %setup -q chmod -x COPYING @@ -81,7 +73,7 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %find_lang %{name} -%post -n gawk +%post %{_sbindir}/update-alternatives \ --install /bin/awk awk %{_bindir}/gawk 20 \ --slave %{_bindir}/awk usr-bin-awk %{_bindir}/gawk \ @@ -89,14 +81,14 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz -%preun -n gawk +%preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk fi -%files -n gawk -f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root) #UsrMerge /bin/awk @@ -113,14 +105,12 @@ fi %{_bindir}/gawk %{_bindir}/igawk %{_libdir}/awk +%{_libdir}/gawk +%{_includedir}/gawkapi.h %{_datadir}/awk %{_infodir}/*.info.gz %{_mandir}/man1/gawk.1%{?ext_man} %{_mandir}/man1/igawk.1%{?ext_man} - -%files -n gawk-devel -%{_libdir}/gawk -%{_includedir}/gawkapi.h %{_mandir}/man3/*%{?ext_man} %changelog From 645360509f09c6bb795e26286cab310ad101f29af78737ac31a1c1a8ed72961c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 09:22:56 +0000 Subject: [PATCH 14/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=63 --- gawk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gawk.spec b/gawk.spec index 29a20b5..39469a7 100644 --- a/gawk.spec +++ b/gawk.spec @@ -26,6 +26,7 @@ Url: http://www.gnu.org/software/gawk/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/people/viewgpg.php?user_id=80653#/gawk.keyring +Source4: gawk.rpmlintrc Patch1: gawk_ppc64le_ignore_transient_test_time_failure.patch BuildRequires: update-alternatives Requires(post): %{install_info_prereq} From e458cc04be93e4d67fe175e82cd3c25fcbd64eb37a8c1933148bd464d9754f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Mon, 10 Apr 2017 09:26:30 +0000 Subject: [PATCH 15/15] OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=64 --- gawk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gawk.spec b/gawk.spec index 39469a7..c5b812d 100644 --- a/gawk.spec +++ b/gawk.spec @@ -107,8 +107,8 @@ fi %{_bindir}/igawk %{_libdir}/awk %{_libdir}/gawk -%{_includedir}/gawkapi.h %{_datadir}/awk +%{_includedir}/gawkapi.h %{_infodir}/*.info.gz %{_mandir}/man1/gawk.1%{?ext_man} %{_mandir}/man1/igawk.1%{?ext_man}