SPECS: Xaw3d.spec - pass rpmldflags, don't use unneeded libXp
qboosh
qboosh at pld-linux.org
Tue Oct 17 23:13:50 CEST 2006
Author: qboosh Date: Tue Oct 17 21:13:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- pass rpmldflags, don't use unneeded libXp
---- Files affected:
SPECS:
Xaw3d.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/Xaw3d.spec
diff -u SPECS/Xaw3d.spec:1.46 SPECS/Xaw3d.spec:1.47
--- SPECS/Xaw3d.spec:1.46 Fri Feb 17 22:12:01 2006
+++ SPECS/Xaw3d.spec Tue Oct 17 23:13:45 2006
@@ -29,8 +29,8 @@
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-util-imake
Requires: fileutils
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: libXaw3d7
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Xaw3d is an enhanced version of the MIT Athena Widget set for X
@@ -211,22 +211,22 @@
%patch5
%build
-export PATH=%{_bindir}:$PATH
cd xc/lib/Xaw3d
xmkmf
mkdir X11; ln -s `pwd` X11/Xaw3d
+# kill unneeded -lXp from EXTRAXAWREQS
%{__make} \
CC="%{__cc}" \
CDEBUGFLAGS="%{rpmcflags}" \
- CXXDEBUGFLAGS="%{rpmcflags}" \
- EXTRA_INCLUDES=-I.
+ SHLIBGLOBALSFLAGS="%{rpmldflags}" \
+ EXTRA_INCLUDES=-I. \
+ EXTRAXAWREQS=
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_includedir}/X11
-cd xc/lib/Xaw3d
-%{__make} install \
+%{__make} -C xc/lib/Xaw3d install \
DESTDIR=$RPM_BUILD_ROOT
mv -f $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d \
@@ -242,17 +242,17 @@
%files
%defattr(644,root,root,755)
%doc xc/lib/Xaw3d/README.XAW3D
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw3d.so.*.*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libXaw3d.so
%{_includedir}/Xaw3d
%{_includedir}/X11/Xaw3d
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libXaw3d.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -260,6 +260,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2006/10/17 21:13:45 qboosh
+- pass rpmldflags, don't use unneeded libXp
+
Revision 1.46 2006/02/17 21:12:01 wolf
- fixes, fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/Xaw3d.spec?r1=1.46&r2=1.47&f=u
More information about the pld-cvs-commit
mailing list