From 7f8f482f400d74fb4276884522f9c807bc1801bca3aadaa324a5d5cf28ea49c0 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 6 Sep 2020 11:46:58 +0000
Subject: [PATCH 1/3] - Remove old specfile constructs.

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libasn1c?expand=0&rev=18
---
 _service         |  2 +-
 libasn1c.changes |  5 +++++
 libasn1c.spec    | 11 ++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/_service b/_service
index 81332d3..b4c1f4c 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
-		<param name="url">git://git.osmocom.org/libasn1c</param>
+		<param name="url">https://git.osmocom.org/libasn1c</param>
 		<param name="revision">master</param>
 		<param name="parent-tag">0.9.32</param>
 		<param name="versionformat">0.9.32</param>
diff --git a/libasn1c.changes b/libasn1c.changes
index 9d64379..799601c 100644
--- a/libasn1c.changes
+++ b/libasn1c.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep  6 11:45:01 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove old specfile constructs.
+
 -------------------------------------------------------------------
 Thu Aug 15 04:54:16 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/libasn1c.spec b/libasn1c.spec
index aa44a95..1729c88 100644
--- a/libasn1c.spec
+++ b/libasn1c.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libasn1c
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,14 +22,13 @@ Release:        0
 Summary:        Osmocon ASN.1 decoder and encoder library
 License:        BSD-2-Clause
 Group:          Development/Libraries/C and C++
-Url:            http://openbsc.osmocom.org/trac/
+URL:            https://git.osmocom.org/libasn1c
 
 Source:         %name-%version.tar.xz
 BuildRequires:  libtool >= 2
 BuildRequires:  pkg-config
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libosmocore) >= 0.1.13
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Lev Walkins's asn1c runtime, as a shared library and with
@@ -66,7 +65,7 @@ This subpackage contains libraries and header files for developing
 applications that want to make use of libasn1c.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 echo %version >.tarball-version
@@ -87,12 +86,10 @@ fi
 %postun -n libasn1c1 -p /sbin/ldconfig
 
 %files -n libasn1c1
-%defattr(-,root,root)
 %_libdir/libasn1c.so.1*
 
 %files -n libasn1c-devel
-%defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %_includedir/asn1c/
 %_libdir/pkgconfig/*.pc
 %_libdir/libasn1c.so

From f439aa358d2be81cf03acdb7f5ff097892657069f3cbd063fd9ab7b85c611289 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 6 Sep 2020 11:53:51 +0000
Subject: [PATCH 2/3] - Move headers to distinct directory to enforce
 pkg-config   correctness on library users.

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libasn1c?expand=0&rev=19
---
 libasn1c.changes | 2 ++
 libasn1c.spec    | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libasn1c.changes b/libasn1c.changes
index 799601c..034b49e 100644
--- a/libasn1c.changes
+++ b/libasn1c.changes
@@ -2,6 +2,8 @@
 Sun Sep  6 11:45:01 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
 - Remove old specfile constructs.
+- Move headers to distinct directory to enforce pkg-config
+  correctness on library users.
 
 -------------------------------------------------------------------
 Thu Aug 15 04:54:16 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
diff --git a/libasn1c.spec b/libasn1c.spec
index 1729c88..310e12a 100644
--- a/libasn1c.spec
+++ b/libasn1c.spec
@@ -70,8 +70,9 @@ applications that want to make use of libasn1c.
 %build
 echo %version >.tarball-version
 autoreconf -fi
-%configure --disable-static
-make %{?_smp_mflags}
+# bugzilla.opensuse.org/795968 for rationale
+%configure --disable-static --includedir="%_includedir/%name"
+%make_build
 
 %install
 %make_install
@@ -90,7 +91,7 @@ fi
 
 %files -n libasn1c-devel
 %license COPYING
-%_includedir/asn1c/
+%_includedir/%name/
 %_libdir/pkgconfig/*.pc
 %_libdir/libasn1c.so
 

From e54a3ec79b254d2e8be097f1d74d03c2b8cb1d145f2c7855a7f62357b02e1ae0 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 6 Sep 2020 12:38:00 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/network:telephony/libasn1c?expand=0&rev=20

---
 libasn1c.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libasn1c.spec b/libasn1c.spec
index 310e12a..2b5572e 100644
--- a/libasn1c.spec
+++ b/libasn1c.spec
@@ -68,7 +68,7 @@ applications that want to make use of libasn1c.
 %autosetup -p1
 
 %build
-echo %version >.tarball-version
+echo "%version" >.tarball-version
 autoreconf -fi
 # bugzilla.opensuse.org/795968 for rationale
 %configure --disable-static --includedir="%_includedir/%name"
@@ -79,7 +79,7 @@ autoreconf -fi
 find "%buildroot/%_libdir" -type f -name "*.la" -delete
 
 %check
-if ! make check %{?_smp_mflags}; then
+if ! %make_build check; then
 	find . -name testsuite.log -exec cat "{}" "+"
 fi