diff --git a/.gitignore b/.gitignore index 3e9ca8f..7136654 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libXp-1.0.0.tar.bz2 printproto-1.0.3.tar.bz2 /libXp-1.0.2.tar.bz2 +/libXp-1.0.3.tar.bz2 diff --git a/libXp.spec b/libXp.spec index 8d34255..be56bf8 100644 --- a/libXp.spec +++ b/libXp.spec @@ -5,19 +5,17 @@ # refrain from using this library in new software, and should migrate # software which currently uses libXp to another printing interface such # as gnome-print. We may decide to stop shipping the development headers -# prior to removing libXp from the OS, which is what "without_devel" -# is for. -%define without_devel 0 +# prior to removing libXp from the OS. Summary: X.Org X11 libXp runtime library Name: libXp -Version: 1.0.2 -Release: 11%{?dist} +Version: 1.0.3 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -31,7 +29,6 @@ Patch0: add-proto-files.patch %description X.Org X11 libXp runtime library -%if ! %{without_devel} %package devel Summary: X.Org X11 libXp development package Group: Development/Libraries @@ -43,7 +40,6 @@ BuildRequires: xorg-x11-proto-devel %description devel X.Org X11 libXp development package -%endif %prep %setup -q @@ -64,15 +60,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%if %{without_devel} -{ - rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.a - rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.so - rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig - rm -rf $RPM_BUILD_ROOT%{_mandir} -} -%endif - # Don't encourage people to use the deprecated Xprint APIs. rm -rf $RPM_BUILD_ROOT%{_mandir} @@ -83,27 +70,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %ldconfig_postun %files -%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/libXp.so.6 %{_libdir}/libXp.so.6.2.0 -%if ! %{without_devel} %files devel -%defattr(-,root,root,-) %{_includedir}/X11/extensions/Print.h %{_includedir}/X11/extensions/Printstr.h %{_libdir}/pkgconfig/printproto.pc -# FIXME: Should we remove the shared lib during deprecation, so that things -# that keep linking to libXp, will always get the static lib and not break -# when we eventually drop libXp? %{_libdir}/libXp.so %{_libdir}/pkgconfig/xp.pc -#%dir %{_mandir}/man3x -#%{_mandir}/man3/*.3x* -%endif %changelog +* Thu Jul 05 2018 Adam Jackson - 1.0.3-1 +- libXp 1.0.3 + * Fri Jun 29 2018 Adam Jackson - 1.0.2-11 - Use ldconfig scriptlet macros diff --git a/sources b/sources index bfc1a55..00fcf1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb038577c7f4e42a1b675fa6451bc4aa libXp-1.0.2.tar.bz2 +SHA512 (libXp-1.0.3.tar.bz2) = 502a2500ec0f519dae69ac035bf93c65c47e3bc301604aacb350e90043455f3485626194db45208e5521300b282843825e08b7f7c412a7497ffa02f5f1560c8d