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] - 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