diff --git a/libdvdnav-strict-aliasing.patch b/libdvdnav-strict-aliasing.patch deleted file mode 100644 index 58f69c5..0000000 --- a/libdvdnav-strict-aliasing.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig 2014-09-29 09:17:41.211405435 +0200 -+++ Makefile.am 2014-12-17 23:19:33.173493347 +0100 -@@ -1,6 +1,6 @@ - ACLOCAL_AMFLAGS = -Im4 - --AM_CPPFLAGS = -I$(top_srcdir)/src $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/src $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) -fno-strict-aliasing - - dist_doc_DATA = AUTHORS ChangeLog COPYING README TODO - diff --git a/libdvdnav.changes b/libdvdnav.changes index 25e6e07..797e040 100644 --- a/libdvdnav.changes +++ b/libdvdnav.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 14 08:05:41 UTC 2019 - Tomáš Chvátal + +- Format with spec-cleaner +- Remove not really needed patch: + * libdvdnav-strict-aliasing.patch + ------------------------------------------------------------------- Mon Apr 15 18:11:05 UTC 2019 - olaf@aepfle.de diff --git a/libdvdnav.spec b/libdvdnav.spec index 344e879..9006172 100644 --- a/libdvdnav.spec +++ b/libdvdnav.spec @@ -1,7 +1,7 @@ # # spec file for package libdvdnav # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,76 +12,72 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define libname libdvdnav4 Name: libdvdnav -Summary: DVD Navigation Library -License: GPL-2.0+ -Group: Productivity/Multimedia/Other -Url: https://www.videolan.org/developers/libdvdnav.html Version: 6.0.0 Release: 0 +Summary: DVD Navigation Library +License: GPL-2.0-or-later +Group: Productivity/Multimedia/Other +URL: https://www.videolan.org/developers/libdvdnav.html Source0: http://download.videolan.org/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: http://download.videolan.org/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2.asc Source1000: baselibs.conf Patch0: libdvdnav-dvdread.patch -Patch1: libdvdnav-strict-aliasing.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libdvdread-devel >= 5.0.3 BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig %description This library contains functions to display DVD video menus. -%package -n libdvdnav4 +%package -n %{libname} Summary: A DVD Navigation Library Group: Productivity/Multimedia/Other -Provides: %{name} = %{version} -Obsoletes: %{name} <= 0.1.10 +Provides: %{name} +Obsoletes: %{name} -%description -n libdvdnav4 +%description -n %{libname} This library contains functions to display DVD video menus. %package devel Summary: Development Environment for libdvdnav Group: Development/Libraries/C and C++ -Requires: libdvdnav4 = %{version} +Requires: %{libname} = %{version} %description devel This library contains functions to display DVD video menus. %prep -%setup -q +%setup -q %patch0 -p1 -%patch1 %build -autoreconf -f -i -v -%configure --disable-static --with-pic --docdir=%{_docdir}/libdvdnav4 -%__make %{?_smp_mflags} +autoreconf -fvi +%configure \ + --disable-silent-rules \ + --disable-static +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -%__rm -f %{buildroot}%{_libdir}/*.la - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%make_install +rm -r %{buildroot}%{_datadir}/doc/libdvdnav/ +find %{buildroot} -type f -name "*.la" -delete -print %post -n libdvdnav4 -p /sbin/ldconfig - %postun -n libdvdnav4 -p /sbin/ldconfig -%files -n libdvdnav4 -%defattr(-,root,root) +%files -n %{libname} %{_libdir}/libdvdnav.so.4 %{_libdir}/libdvdnav.so.4.* -%doc AUTHORS ChangeLog COPYING README TODO +%license COPYING +%doc AUTHORS ChangeLog README TODO %files devel -%defattr(-,root,root) %{_includedir}/dvdnav %{_libdir}/libdvdnav.so %{_libdir}/pkgconfig/dvdnav.pc