Hello community, here is the log from the commit of package xaw3d checked in at Sun Jul 30 12:00:45 CEST 2006. -------- --- xaw3d/xaw3d.changes 2006-02-27 18:01:08.000000000 +0100 +++ xaw3d/xaw3d.changes 2006-07-28 17:15:45.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 17:15:37 CEST 2006 - werner@suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xaw3d.spec ++++++ --- /var/tmp/diff_new_pack.D1vkEM/_old 2006-07-30 12:00:09.000000000 +0200 +++ /var/tmp/diff_new_pack.D1vkEM/_new 2006-07-30 12:00:09.000000000 +0200 @@ -17,7 +17,7 @@ Provides: Xaw3d Autoreqprov: on Version: 1.5E -Release: 231 +Release: 240 Summary: 3D Athena Widgets Url: http://www.visi.com/~hawkeyd/xaw3d.html Source: Xaw3d-1.5E.tar.bz2 @@ -31,6 +31,11 @@ Patch7: Xaw3d-1.5E-fontset.patch Patch8: Xaw3d-1.5E-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _includedir %{_exec_prefix}/include +%endif %description This is a library that can be used instead of the standard @@ -126,23 +131,23 @@ %install cd lib/Xaw3d -make DESTDIR=$RPM_BUILD_ROOT install SOXAWREV=6.1 -rm -rf $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d -rm -rf $RPM_BUILD_ROOT/usr/X11R6/include/Xaw3d -ln -sf X11/Xaw3d $RPM_BUILD_ROOT/usr/X11R6/include/Xaw3d -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man -mkdir -p $RPM_BUILD_ROOT%{_docdir}/xaw3d -install -c -m 0444 README.XAW3D $RPM_BUILD_ROOT%{_docdir}/xaw3d -rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/Xaw3d/libXaw.so -install -c -m 0444 NOTE $RPM_BUILD_ROOT%{_docdir}/xaw3d/README.SuSE -ln -sf %{_docdir}/xaw3d/README.SuSE $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/Xaw3d/NOTE +make DESTDIR=%{buildroot} install SOXAWREV=6.1 +rm -rf %{buildroot}%{_includedir}/X11/Xaw3d +mkdir -p %{buildroot}%{_includedir}X11/Xaw3d +rm -rf %{buildroot}%{_includedir}/Xaw3d +ln -sf X11/Xaw3d %{buildroot}%{_includedir}/Xaw3d +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install.man +mkdir -p %{buildroot}%{_docdir}/xaw3d +install -c -m 0444 README.XAW3D %{buildroot}%{_docdir}/xaw3d +rm -f %{buildroot}%{_libdir}/Xaw3d/libXaw.so +install -c -m 0444 NOTE %{buildroot}%{_docdir}/xaw3d/README.SuSE +ln -sf %{_docdir}/xaw3d/README.SuSE %{buildroot}%{_libdir}/Xaw3d/NOTE # removing unwanted file -rm -f $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d/Template.c +rm -f %{buildroot}%{_includedir}/Xaw3d/Template.c %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -154,29 +159,31 @@ %files %defattr(-,root,root) -%dir /usr/X11R6/include/X11/Xaw3d +%dir %{_includedir}/X11/Xaw3d %dir %{_docdir}/xaw3d -/usr/X11R6/include/Xaw3d -/usr/X11R6/include/X11/Xaw3d/*.h -/usr/X11R6/%{_lib}/libXaw3d.a -/usr/X11R6/%{_lib}/libXaw3d.so -/usr/X11R6/%{_lib}/libXaw3d.so.6 -/usr/X11R6/%{_lib}/libXaw3d.so.6.1 -/usr/X11R6/%{_lib}/libXaw3d.so.8 -/usr/X11R6/%{_lib}/libXaw3d.so.8.0 +%{_includedir}/Xaw3d +%{_includedir}/X11/Xaw3d/*.h +%{_libdir}/libXaw3d.a +%{_libdir}/libXaw3d.so +%{_libdir}/libXaw3d.so.6 +%{_libdir}/libXaw3d.so.6.1 +%{_libdir}/libXaw3d.so.8 +%{_libdir}/libXaw3d.so.8.0 %{_docdir}/xaw3d/README.XAW3D %files -n xaw3dd %defattr(-,root,root) -%dir /usr/X11R6/%{_lib}/Xaw3d -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.6 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.6.1 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.8 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.8.0 -%doc /usr/X11R6/%{_lib}/Xaw3d/NOTE +%dir %{_libdir}/Xaw3d +%{_libdir}/Xaw3d/libXaw.so.6 +%{_libdir}/Xaw3d/libXaw.so.6.1 +%{_libdir}/Xaw3d/libXaw.so.8 +%{_libdir}/Xaw3d/libXaw.so.8.0 +%doc %{_libdir}/Xaw3d/NOTE %{_docdir}/xaw3d/README.SuSE %changelog -n xaw3d +* Fri Jul 28 2006 - werner@suse.de +- Make it build with X11R7 * Mon Feb 27 2006 - schwab@suse.de - Run ldconfig also in xaw3dd package. * Wed Jan 25 2006 - mls@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org