- Renamed libXp_deprecated rpm macro to "with_devel" to avoid confusion.
This library is still deprecated, we just decided to remove the word "deprecated" from the package name for library naming consistency.
This commit is contained in:
parent
9bc835113d
commit
cdfe5102a1
24
libXp.spec
24
libXp.spec
@ -1,9 +1,18 @@
|
|||||||
%define libXp_deprecated 0
|
# NOTE: This library has been deprecated in RHEL and Fedora Core for some
|
||||||
|
# time now. While we have removed the word "deprecated" from the package
|
||||||
|
# name in modular X, the library does remain deprecated and will be
|
||||||
|
# removed from a future OS release at some point. Developers should
|
||||||
|
# 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
|
||||||
|
|
||||||
Summary: X.Org X11 libXp runtime library
|
Summary: X.Org X11 libXp runtime library
|
||||||
Name: libXp
|
Name: libXp
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Release: 3
|
Release: 4
|
||||||
License: MIT/X11
|
License: MIT/X11
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
@ -23,7 +32,7 @@ Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
|
|||||||
%description
|
%description
|
||||||
X.Org X11 libXp runtime library
|
X.Org X11 libXp runtime library
|
||||||
|
|
||||||
%if ! %{libXp_deprecated}
|
%if ! %{without_devel}
|
||||||
%package devel
|
%package devel
|
||||||
Summary: X.Org X11 libXp development package
|
Summary: X.Org X11 libXp development package
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -57,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
%if %{libXp_deprecated}
|
%if %{without_devel}
|
||||||
{
|
{
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.a
|
rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.a
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.so
|
rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.so
|
||||||
@ -83,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libXp.so.6
|
%{_libdir}/libXp.so.6
|
||||||
%{_libdir}/libXp.so.6.2.0
|
%{_libdir}/libXp.so.6.2.0
|
||||||
|
|
||||||
%if ! %{libXp_deprecated}
|
%if ! %{without_devel}
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%if %{with_static}
|
%if %{with_static}
|
||||||
@ -99,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 10 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-4
|
||||||
|
- Renamed libXp_deprecated rpm macro to "with_devel" to avoid confusion. This
|
||||||
|
library is still deprecated, we just decided to remove the word "deprecated"
|
||||||
|
from the package name for library naming consistency.
|
||||||
|
|
||||||
* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-3
|
* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-3
|
||||||
- Replace "makeinstall" with "make install DESTDIR=..."
|
- Replace "makeinstall" with "make install DESTDIR=..."
|
||||||
- Added "Requires: xorg-x11-proto-devel" to devel for xp.pc
|
- Added "Requires: xorg-x11-proto-devel" to devel for xp.pc
|
||||||
|
Loading…
Reference in New Issue
Block a user