From 646f65b8c0ae57bed513d5aedc0e313cc3aaf8676c9ff60b4315473366ab61d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 2 Feb 2021 15:43:37 +0000 Subject: [PATCH 01/10] Update upstream URL OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=17 --- eppic.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eppic.spec b/eppic.spec index af17c28..1327775 100644 --- a/eppic.spec +++ b/eppic.spec @@ -1,7 +1,7 @@ # # spec file for package eppic # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ Patch3: %{name}-use-extern-in-devel-declaration.patch BuildRequires: bison BuildRequires: flex BuildRequires: ncurses-devel -URL: http://code.google.com/p/eppic/ +URL: https://github.com/lucchouina/eppic BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From e99bfc9b5fdf9f9b0ad3a21efee3c8da8d606d556915399623ef35fafcd94d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 2 Feb 2021 16:41:27 +0000 Subject: [PATCH 02/10] Accepting request 868691 from home:marxin:branches:Kernel:kdump - Add eppic-binutils-fix.patch in order to not used 'l' option for ar. It has a new meaning. OBS-URL: https://build.opensuse.org/request/show/868691 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=18 --- eppic-binutils-fix.patch | 13 +++++++++++++ eppic.changes | 6 ++++++ eppic.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 eppic-binutils-fix.patch diff --git a/eppic-binutils-fix.patch b/eppic-binutils-fix.patch new file mode 100644 index 0000000..ca2d403 --- /dev/null +++ b/eppic-binutils-fix.patch @@ -0,0 +1,13 @@ +diff --git a/libeppic/Makefile b/libeppic/Makefile +index 1f97800..4ef7101 100644 +--- a/libeppic/Makefile ++++ b/libeppic/Makefile +@@ -101,7 +101,7 @@ default: $(TARGETS) + $(CFILES): $(HFILES) eppic.tab.h + + $(TARGETS): $(OFILES) +- $(AR) ccurl $(TARGETS) $(OFILES) ++ $(AR) cur $(TARGETS) $(OFILES) + + clean: + -/bin/rm -f *.o $(TARGETS) $(LDIRT) diff --git a/eppic.changes b/eppic.changes index 27e65dc..2718dd2 100644 --- a/eppic.changes +++ b/eppic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 2 08:29:23 UTC 2021 - Martin Liška + +- Add eppic-binutils-fix.patch in order to not used 'l' option for + ar. It has a new meaning. + ------------------------------------------------------------------- Tue Jun 9 13:58:20 UTC 2020 - David Mair diff --git a/eppic.spec b/eppic.spec index 1327775..563d740 100644 --- a/eppic.spec +++ b/eppic.spec @@ -30,6 +30,7 @@ Source: %{name}-git%{git_commit}.tar.bz2 Patch1: %{name}-fix-install.patch Patch2: %{name}-no-return.patch Patch3: %{name}-use-extern-in-devel-declaration.patch +Patch4: %{name}-binutils-fix.patch BuildRequires: bison BuildRequires: flex BuildRequires: ncurses-devel @@ -61,6 +62,7 @@ This package provides the include files and libraries needed for development. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects From 4617f6d9050e50c6fa605b749a78a513af45d13bc97e6189f6e25d59085593dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 10:06:59 +0000 Subject: [PATCH 03/10] - Update upstream URL. - Convert to obs_scm source service. - Upgrade to git commit 873741a. - Drop patches that have been merged into upstream: o eppic-no-return.patch o eppic-use-extern-in-devel-declaration.patch OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=19 --- _service | 11 +++++++++ ...beppic-3.99.git.1599232887.873741a.obscpio | 3 +++ _service:obs_scm:libeppic.obsinfo | 5 ++++ eppic-git5391d3d.tar.bz2 | 3 --- eppic-no-return.patch | 24 ------------------- eppic-use-extern-in-devel-declaration.patch | 13 ---------- eppic.changes | 10 ++++++++ eppic.spec | 22 +++++------------ 8 files changed, 35 insertions(+), 56 deletions(-) create mode 100644 _service create mode 100644 _service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio create mode 100644 _service:obs_scm:libeppic.obsinfo delete mode 100644 eppic-git5391d3d.tar.bz2 delete mode 100644 eppic-no-return.patch delete mode 100644 eppic-use-extern-in-devel-declaration.patch diff --git a/_service b/_service new file mode 100644 index 0000000..e4b3097 --- /dev/null +++ b/_service @@ -0,0 +1,11 @@ + + + git + https://github.com/lucchouina/eppic.git + libeppic + libeppic + 3.99.git + + + + diff --git a/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio b/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio new file mode 100644 index 0000000..8efda1f --- /dev/null +++ b/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c72003fbc7f7b74d02780bcd51818757e5bcd6d28438dad96f331e5939fccdda +size 349195 diff --git a/_service:obs_scm:libeppic.obsinfo b/_service:obs_scm:libeppic.obsinfo new file mode 100644 index 0000000..488469a --- /dev/null +++ b/_service:obs_scm:libeppic.obsinfo @@ -0,0 +1,5 @@ +name: libeppic +version: 3.99.git.1599232887.873741a +mtime: 1599232887 +commit: 873741ae28dae3d0229d929fc588a728f040354f + diff --git a/eppic-git5391d3d.tar.bz2 b/eppic-git5391d3d.tar.bz2 deleted file mode 100644 index 3ceb34d..0000000 --- a/eppic-git5391d3d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cddb7dc40138cadf3c716e54bf433ecdff37d87bf06b4b74f6415b738fe742bf -size 77034 diff --git a/eppic-no-return.patch b/eppic-no-return.patch deleted file mode 100644 index 5db5f02..0000000 --- a/eppic-no-return.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - libeppic/eppic_var.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/libeppic/eppic_var.c -+++ b/libeppic/eppic_var.c -@@ -828,7 +828,7 @@ var_t*v; - evaluation of sizeof or typeof. - */ - int eppic_getvlev() { return vlev; } --eppic_vpush() -+void eppic_vpush() - { - if(vlev==S_MAXSDEEP) { - -@@ -841,7 +841,7 @@ eppic_vpush() - } - } - --eppic_vpop() -+void eppic_vpop() - { - if(vlev) { - eppic_setsvlev(sidx[--vlev]); diff --git a/eppic-use-extern-in-devel-declaration.patch b/eppic-use-extern-in-devel-declaration.patch deleted file mode 100644 index da10c6f..0000000 --- a/eppic-use-extern-in-devel-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/libeppic/eppic.h -=================================================================== ---- a/libeppic/eppic.h -+++ b/libeppic/eppic.h -@@ -467,7 +467,7 @@ type_t *eppic_addstorage(type_t *t1, ty - type_t *eppic_getvoidstruct(int ctype); - - extern int lineno, needvar, instruct, nomacs, eppic_legacy; --node_t *lastv; -+extern node_t *lastv; - - #define NULLNODE ((node_t*)0) - diff --git a/eppic.changes b/eppic.changes index 2718dd2..75b8d35 100644 --- a/eppic.changes +++ b/eppic.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 3 09:54:23 UTC 2021 - Petr Tesařík + +- Update upstream URL. +- Convert to obs_scm source service. +- Upgrade to git commit 873741a. +- Drop patches that have been merged into upstream: + o eppic-no-return.patch + o eppic-use-extern-in-devel-declaration.patch + ------------------------------------------------------------------- Tue Feb 2 08:29:23 UTC 2021 - Martin Liška diff --git a/eppic.spec b/eppic.spec index 563d740..ec21aa8 100644 --- a/eppic.spec +++ b/eppic.spec @@ -16,20 +16,14 @@ # -%define git_date 20140619 -%define git_commit 5391d3d -%define checkout %{git_date}git%{git_commit} - Name: eppic -Version: 3.99.%{checkout} +Version: 3.99.git.1599232887.873741a Release: 0 Summary: Embeddable Pre-Processor and Interpreter for C License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Source: %{name}-git%{git_commit}.tar.bz2 +Source: lib%{name}-%{version}.tar Patch1: %{name}-fix-install.patch -Patch2: %{name}-no-return.patch -Patch3: %{name}-use-extern-in-devel-declaration.patch Patch4: %{name}-binutils-fix.patch BuildRequires: bison BuildRequires: flex @@ -58,26 +52,22 @@ embedded in any tools that is C friendly. This package provides the include files and libraries needed for development. %prep -%setup -n %{name}-git%{git_commit} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%setup -n lib%{name}-%{version} +%patch1 -p2 +%patch4 -p2 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects -cd libeppic make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} %install -cd libeppic mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} make ROOT="%{buildroot}" LIBDIR=%{_libdir} install %files -n libeppic-devel %defattr(-,root,root) -%doc libeppic/README +%doc README %{_includedir}/eppic.h %{_includedir}/eppic_api.h %attr(644,root,root) %{_libdir}/libeppic.a From e4086a67c3a2357f40af1ce7748832b2361dbfb3e565066a6065156d7837a4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 10:09:51 +0000 Subject: [PATCH 04/10] drop set_service service, because it is missing in SLE OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=20 --- _service | 1 - 1 file changed, 1 deletion(-) diff --git a/_service b/_service index e4b3097..47b9cb6 100644 --- a/_service +++ b/_service @@ -7,5 +7,4 @@ 3.99.git - From 15f8b639b67bf871bd50475d86feee8dc8eff475ae106702985a9230c91ad034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 12:22:31 +0000 Subject: [PATCH 05/10] Re-enable set_version source service. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=21 --- _service | 1 + 1 file changed, 1 insertion(+) diff --git a/_service b/_service index 47b9cb6..e4b3097 100644 --- a/_service +++ b/_service @@ -7,4 +7,5 @@ 3.99.git + From 7508093398d2d0577cfcb81b1477d8f3ca5d4df05fc8951a54899eeae4391196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 13:52:08 +0000 Subject: [PATCH 06/10] Change services to localonly. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=22 --- _service | 9 ++++++--- ...:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio | 3 --- _service:obs_scm:libeppic.obsinfo | 5 ----- eppic.spec | 4 ++-- libeppic-3.99.git.1612358888.e8844d3.tar.xz | 3 +++ 5 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 _service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio delete mode 100644 _service:obs_scm:libeppic.obsinfo create mode 100644 libeppic-3.99.git.1612358888.e8844d3.tar.xz diff --git a/_service b/_service index e4b3097..627ef88 100644 --- a/_service +++ b/_service @@ -1,11 +1,14 @@ - + git https://github.com/lucchouina/eppic.git libeppic libeppic 3.99.git - - + + libeppic-*.tar + xz + + diff --git a/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio b/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio deleted file mode 100644 index 8efda1f..0000000 --- a/_service:obs_scm:libeppic-3.99.git.1599232887.873741a.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c72003fbc7f7b74d02780bcd51818757e5bcd6d28438dad96f331e5939fccdda -size 349195 diff --git a/_service:obs_scm:libeppic.obsinfo b/_service:obs_scm:libeppic.obsinfo deleted file mode 100644 index 488469a..0000000 --- a/_service:obs_scm:libeppic.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: libeppic -version: 3.99.git.1599232887.873741a -mtime: 1599232887 -commit: 873741ae28dae3d0229d929fc588a728f040354f - diff --git a/eppic.spec b/eppic.spec index ec21aa8..c304691 100644 --- a/eppic.spec +++ b/eppic.spec @@ -17,12 +17,12 @@ Name: eppic -Version: 3.99.git.1599232887.873741a +Version: 3.99.git.1612358888.e8844d3 Release: 0 Summary: Embeddable Pre-Processor and Interpreter for C License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Source: lib%{name}-%{version}.tar +Source: lib%{name}-%{version}.tar.xz Patch1: %{name}-fix-install.patch Patch4: %{name}-binutils-fix.patch BuildRequires: bison diff --git a/libeppic-3.99.git.1612358888.e8844d3.tar.xz b/libeppic-3.99.git.1612358888.e8844d3.tar.xz new file mode 100644 index 0000000..b387888 --- /dev/null +++ b/libeppic-3.99.git.1612358888.e8844d3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:921b128859ef20eee25f1d8828036ee45b383cdd081250a7da1bd5934d4780d6 +size 73936 From edb05980cec35dadf4dfb3a512365d29ce88fab30acb16bfcf1f14693fc9b597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 13:59:01 +0000 Subject: [PATCH 07/10] - Upgrade to git commit e8844d3. o eppic-binutils-fix.patch OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=23 --- eppic-binutils-fix.patch | 13 ------------- eppic.changes | 5 +++-- eppic.spec | 2 -- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 eppic-binutils-fix.patch diff --git a/eppic-binutils-fix.patch b/eppic-binutils-fix.patch deleted file mode 100644 index ca2d403..0000000 --- a/eppic-binutils-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libeppic/Makefile b/libeppic/Makefile -index 1f97800..4ef7101 100644 ---- a/libeppic/Makefile -+++ b/libeppic/Makefile -@@ -101,7 +101,7 @@ default: $(TARGETS) - $(CFILES): $(HFILES) eppic.tab.h - - $(TARGETS): $(OFILES) -- $(AR) ccurl $(TARGETS) $(OFILES) -+ $(AR) cur $(TARGETS) $(OFILES) - - clean: - -/bin/rm -f *.o $(TARGETS) $(LDIRT) diff --git a/eppic.changes b/eppic.changes index 75b8d35..0c5e822 100644 --- a/eppic.changes +++ b/eppic.changes @@ -1,12 +1,13 @@ ------------------------------------------------------------------- -Wed Feb 3 09:54:23 UTC 2021 - Petr Tesařík +Wed Feb 3 13:57:25 UTC 2021 - Petr Tesařík - Update upstream URL. - Convert to obs_scm source service. -- Upgrade to git commit 873741a. +- Upgrade to git commit e8844d3. - Drop patches that have been merged into upstream: o eppic-no-return.patch o eppic-use-extern-in-devel-declaration.patch + o eppic-binutils-fix.patch ------------------------------------------------------------------- Tue Feb 2 08:29:23 UTC 2021 - Martin Liška diff --git a/eppic.spec b/eppic.spec index c304691..d454fe7 100644 --- a/eppic.spec +++ b/eppic.spec @@ -24,7 +24,6 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Source: lib%{name}-%{version}.tar.xz Patch1: %{name}-fix-install.patch -Patch4: %{name}-binutils-fix.patch BuildRequires: bison BuildRequires: flex BuildRequires: ncurses-devel @@ -54,7 +53,6 @@ This package provides the include files and libraries needed for development. %prep %setup -n lib%{name}-%{version} %patch1 -p2 -%patch4 -p2 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects From 5e6ad1a2b851d0235e45bab5687c0e1e1aec69a2269676c666ad9385e1b8794f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 14:07:52 +0000 Subject: [PATCH 08/10] Switch to bz2 (SLE11 SP4 did not have xz) OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=24 --- _service | 2 +- eppic.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_service b/_service index 627ef88..1e855c0 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ libeppic-*.tar - xz + bz2 diff --git a/eppic.spec b/eppic.spec index d454fe7..0045f7a 100644 --- a/eppic.spec +++ b/eppic.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Embeddable Pre-Processor and Interpreter for C License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Source: lib%{name}-%{version}.tar.xz +Source: lib%{name}-%{version}.tar.bz2 Patch1: %{name}-fix-install.patch BuildRequires: bison BuildRequires: flex From 23a1aa20cfde751da745c91c18d4eccc9608ac017e1417a3cebb2c3aee0b48a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 14:10:30 +0000 Subject: [PATCH 09/10] Remove the tar.xz archive. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=25 --- libeppic-3.99.git.1612358888.e8844d3.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 libeppic-3.99.git.1612358888.e8844d3.tar.xz diff --git a/libeppic-3.99.git.1612358888.e8844d3.tar.xz b/libeppic-3.99.git.1612358888.e8844d3.tar.xz deleted file mode 100644 index b387888..0000000 --- a/libeppic-3.99.git.1612358888.e8844d3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:921b128859ef20eee25f1d8828036ee45b383cdd081250a7da1bd5934d4780d6 -size 73936 From 0665b9523af3570d51296ee8979ece1dbf3bfd52872ba4740fc2e06f22000561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Wed, 3 Feb 2021 14:11:33 +0000 Subject: [PATCH 10/10] Add the tar.bz2 archive OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=26 --- libeppic-3.99.git.1612358888.e8844d3.tar.bz2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 libeppic-3.99.git.1612358888.e8844d3.tar.bz2 diff --git a/libeppic-3.99.git.1612358888.e8844d3.tar.bz2 b/libeppic-3.99.git.1612358888.e8844d3.tar.bz2 new file mode 100644 index 0000000..c6957e3 --- /dev/null +++ b/libeppic-3.99.git.1612358888.e8844d3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02211c62e9d9e72a35571ace192d6b6d06be6f67c5e666130d9b9299ee7e3dcb +size 71203