From d4dfde6371273d3490ef4e3542e14ca5836ca4c7137e1dc2d1a03ae3f52c79b6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 Dec 2019 17:13:12 +0000 Subject: [PATCH] Accepting request 754657 from home:pluskalm:branches:Base:System - Modernise spec file a bit: * Move licnse to library package * Use more of new macros for building OBS-URL: https://build.opensuse.org/request/show/754657 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=23 --- linux-atm.changes | 7 +++++++ linux-atm.spec | 32 ++++++++++---------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/linux-atm.changes b/linux-atm.changes index 1506e96..1f803c5 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 6 11:26:11 UTC 2019 - Martin Pluskal + +- Modernise spec file a bit: + * Move licnse to library package + * Use more of new macros for building + ------------------------------------------------------------------- Thu Jul 11 06:03:18 UTC 2019 - Jiri Slaby diff --git a/linux-atm.spec b/linux-atm.spec index a3fc44f..7418c6d 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -1,7 +1,7 @@ # # spec file for package linux-atm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,14 @@ # +%global sover 1 Name: linux-atm Version: 2.5.2 Release: 0 -%global sover 1 Summary: Tools for ATM License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Networking/Other - -Url: http://linux-atm.sourceforge.net/ +URL: http://linux-atm.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM linux-atm-2.5.2_fdleak.patch Patch0: linux-atm-2.5.2_fdleak.patch @@ -36,25 +35,20 @@ Patch2: linux-atm-2.5.2-fix-header-conflict.patch Patch3: linux-atm-2.5.2-remove-headers-crude-hack.patch # PATCH-FIX-UPSTREAM fix-build-after-y2038-changes-in-glibc.patch -- fix build after y2038 changes in glibc Patch4: fix-build-after-y2038-changes-in-glibc.patch - BuildRequires: bison BuildRequires: flex BuildRequires: glibc-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Tools to support ATM (Asynchronous Transfer Mode) networking. - %package -n libatm%{sover} - Summary: Libraries for ATM Group: System/Libraries %description -n libatm%{sover} Libraries for ATM (Asynchronous Transfer Mode) networking. - %package devel Summary: Development for ATM Group: Development/Libraries/C and C++ @@ -64,40 +58,34 @@ Requires: libatm%{sover} = %{version} Libraries and header files for ATM (Asynchronous Transfer Mode) networking. - %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %configure --disable-static -%{__make} %{?_smp_mflags} +%make_build %install -%{__make} install DESTDIR=%{buildroot} -%{__rm} -rf %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n libatm%{sover} -p /sbin/ldconfig - %postun -n libatm%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) +%doc README AUTHORS ChangeLog NEWS THANKS BUGS %config(noreplace) %{_sysconfdir}/atmsigd.conf %config(noreplace) %{_sysconfdir}/hosts.atm %{_bindir}/* %{_sbindir}/* /lib/firmware/* -%doc README AUTHORS ChangeLog NEWS THANKS BUGS -%license COPYING COPYING.GPL COPYING.LGPL -%doc %{_mandir}/man*/*.gz +%{_mandir}/man*/*.gz %files -n libatm%{sover} -%defattr(-,root,root) +%license COPYING COPYING.GPL COPYING.LGPL %{_libdir}/libatm.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/atm*.h %{_libdir}/libatm.so