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
This commit is contained in:
Marcus Meissner 2019-12-13 17:13:12 +00:00 committed by Git OBS Bridge
parent f0f041da97
commit d4dfde6371
2 changed files with 17 additions and 22 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 6 11:26:11 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- 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 <jslaby@suse.com> Thu Jul 11 06:03:18 UTC 2019 - Jiri Slaby <jslaby@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package linux-atm # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,15 +16,14 @@
# #
%global sover 1
Name: linux-atm Name: linux-atm
Version: 2.5.2 Version: 2.5.2
Release: 0 Release: 0
%global sover 1
Summary: Tools for ATM Summary: Tools for ATM
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Networking/Other 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 Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM linux-atm-2.5.2_fdleak.patch # PATCH-FIX-UPSTREAM linux-atm-2.5.2_fdleak.patch
Patch0: 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 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 # 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 Patch4: fix-build-after-y2038-changes-in-glibc.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Tools to support ATM (Asynchronous Transfer Mode) networking. Tools to support ATM (Asynchronous Transfer Mode) networking.
%package -n libatm%{sover} %package -n libatm%{sover}
Summary: Libraries for ATM Summary: Libraries for ATM
Group: System/Libraries Group: System/Libraries
%description -n libatm%{sover} %description -n libatm%{sover}
Libraries for ATM (Asynchronous Transfer Mode) networking. Libraries for ATM (Asynchronous Transfer Mode) networking.
%package devel %package devel
Summary: Development for ATM Summary: Development for ATM
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -64,40 +58,34 @@ Requires: libatm%{sover} = %{version}
Libraries and header files for ATM (Asynchronous Transfer Mode) Libraries and header files for ATM (Asynchronous Transfer Mode)
networking. networking.
%prep %prep
%setup -q %autosetup -p1
%autopatch -p1
%build %build
%configure --disable-static %configure --disable-static
%{__make} %{?_smp_mflags} %make_build
%install %install
%{__make} install DESTDIR=%{buildroot} %make_install
%{__rm} -rf %{buildroot}%{_libdir}/*.la find %{buildroot} -type f -name "*.la" -delete -print
%post -n libatm%{sover} -p /sbin/ldconfig %post -n libatm%{sover} -p /sbin/ldconfig
%postun -n libatm%{sover} -p /sbin/ldconfig %postun -n libatm%{sover} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %doc README AUTHORS ChangeLog NEWS THANKS BUGS
%config(noreplace) %{_sysconfdir}/atmsigd.conf %config(noreplace) %{_sysconfdir}/atmsigd.conf
%config(noreplace) %{_sysconfdir}/hosts.atm %config(noreplace) %{_sysconfdir}/hosts.atm
%{_bindir}/* %{_bindir}/*
%{_sbindir}/* %{_sbindir}/*
/lib/firmware/* /lib/firmware/*
%doc README AUTHORS ChangeLog NEWS THANKS BUGS %{_mandir}/man*/*.gz
%license COPYING COPYING.GPL COPYING.LGPL
%doc %{_mandir}/man*/*.gz
%files -n libatm%{sover} %files -n libatm%{sover}
%defattr(-,root,root) %license COPYING COPYING.GPL COPYING.LGPL
%{_libdir}/libatm.so.%{sover}* %{_libdir}/libatm.so.%{sover}*
%files devel %files devel
%defattr(-,root,root)
%{_includedir}/atm*.h %{_includedir}/atm*.h
%{_libdir}/libatm.so %{_libdir}/libatm.so