diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..3c53ef9 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* unmanaged"); diff --git a/xosd.spec b/xosd.spec index 1766432..477f23f 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,18 +1,23 @@ Name: xosd Version: 2.2.14 -Release: 27%{?dist} +Release: 28%{?dist} Summary: On-screen display library for X -Group: System Environment/Libraries License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ Source: http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz Patch0: %{name}-aclocal18.patch Patch1: %{name}-2.2.14-Do-not-install-some-manual-pages-twice.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: coreutils +# glibc-common for iconv +BuildRequires: glibc-common +BuildRequires: libtool BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel -# Update config.sub to support aarch64, bug #926836 -BuildRequires: autoconf automake libtool +BuildRequires: make +BuildRequires: perl-interpreter # As of 2.2.14, the default font *must* be found, even if not used (#183971) Requires: xorg-x11-fonts-base # XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in. @@ -26,7 +31,6 @@ the effect of an On Screen Display, like your TV/VCR etc. %package devel Summary: Development files for the XOSD on-screen display library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libX11-devel Requires: libXext-devel @@ -40,9 +44,10 @@ on-screen display. %setup -q %patch0 -p0 %patch1 -p1 -# Update config.sub to support aarch64, bug #926836 +# XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in. sed -i -e '/AM_PATH_GTK/,+1 d' -e '/AM_PATH_XMMS/,+1 d' \ -e '/AM_PATH_GDK_PIXBUF/,+1 d' configure.ac +# Update config.sub to support aarch64, bug #926836 autoreconf -i -f for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do iconv -f iso-8859-1 -t utf-8 "$f" > "${f}.utf8" @@ -50,7 +55,6 @@ for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}. mv "${f}.utf8" "$f" done - %build %configure --disable-dependency-tracking --disable-static \ --disable-gtktest --disable-gdk_pixbuftest \ @@ -58,8 +62,7 @@ done --disable-beep_media_player_plugin\ --enable-xinerama make %{?_smp_mflags} -%{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config - +perl -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config %install make install DESTDIR=$RPM_BUILD_ROOT @@ -67,14 +70,11 @@ rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la # Pixmaps are needed only by unsupported XMMS plug-in. rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - +%ldconfig_scriptlets %files -%doc AUTHORS ChangeLog COPYING README TODO +%license COPYING +%doc AUTHORS ChangeLog README TODO %{_bindir}/osd_cat %{_libdir}/libxosd.so.* %{_mandir}/man1/osd_cat.1* @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Mar 23 2018 Petr Pisar - 2.2.14-28 +- Modernize a spec file + * Fri Feb 09 2018 Fedora Release Engineering - 2.2.14-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild