- updated to 1.6.6

[packages/Xaw3d.git] / Xaw3d.spec

diff --git a/Xaw3d.spec b/Xaw3d.spec
index d9bc2c5d9eec52af07a3c8d8dde24e0940e5fc0c..6d021d32031b1aa413ca62fb850ff572c2c3af06 100644 (file)
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -9,21 +9,25 @@ Summary(ru.UTF-8):    Версия MIT Athena widget set для X
 Summary(tr.UTF-8):     3D X Athena arayüz elemanları (widgets)
 Summary(uk.UTF-8):     Версія MIT Athena widget set для X
 Name:          Xaw3d
-Version:       1.6
+Version:       1.6.6
 Release:       1
 License:       MIT
 Group:         X11/Libraries
-Source0:       http://xorg.freedesktop.org/releases/individual/lib/lib%{name}-%{version}.tar.bz2
-# Source0-md5: db88f0c5afc5f285e046d84e15ad30de
-URL:           http://www.freedesktop.org/
+Source0:       https://xorg.freedesktop.org/releases/individual/lib/lib%{name}-%{version}.tar.xz
+# Source0-md5: 411e44d066d8b2ca07619211124d7d02
+URL:           https://xorg.freedesktop.org/
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: xorg-cf-files
+BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
-BuildRequires: xorg-util-imake
+BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xorg-util-util-macros >= 1.8
+BuildRequires: xz
 Requires:      fileutils
-Obsoletes:     libXaw3d7
+Obsoletes:     libXaw3d7 < 1.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -84,9 +88,12 @@ Summary(tr.UTF-8):   Xaw3d kitaplığını kullanan programlar geliştirmek için
 Summary(uk.UTF-8):     Файли для розробки програм, які використовують Xaw3d
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      xorg-lib-libX11-devel
+Requires:      xorg-lib-libXext-devel
 Requires:      xorg-lib-libXmu-devel
 Requires:      xorg-lib-libXpm-devel
-Obsoletes:     libXaw3d7-devel
+Requires:      xorg-lib-libXt-devel
+Obsoletes:     libXaw3d7-devel < 1.6
 
 %description devel
 Xaw3d is an enhanced version of the MIT Athena Widget set for X Window
@@ -199,7 +206,12 @@ Widget для X Window, придающая приложениям "трехме
 %setup -q -n %{orgname}-%{version}
 
 %build
-%configure
+%configure \
+       --disable-silent-rules \
+       --enable-arrow-scrollbars \
+       --enable-gray-stipples \
+       --enable-internationalization \
+       --enable-multiplane-bitmaps
 
 %{__make}
 
@@ -209,9 +221,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -s X11/Xaw3d $RPM_BUILD_ROOT%{_includedir}/Xaw3d
+ln -sf X11/Xaw3d $RPM_BUILD_ROOT%{_includedir}/Xaw3d
 
-rm $RPM_BUILD_ROOT%{_libdir}/libXaw3d.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXaw3d.la
+
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/libXaw3d/README.XAW3D
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -219,10 +234,18 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%pretrans devel
+# migration from Xaw3d 1.5E (where X11/Xaw3d was symlink to ../Xaw3d)
+if [ -d %{_includedir}/Xaw3d -a -L %{_includedir}/X11/Xaw3d ]; then
+       rm -f %{_includedir}/X11/Xaw3d
+       mv -f %{_includedir}/Xaw3d %{_includedir}/X11/Xaw3d
+       ln -snf X11/Xaw3d %{_includedir}/Xaw3d
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog
-%attr(755,root,root) %{_libdir}/libXaw3d.so.*.*
+%doc COPYING ChangeLog README.md src/README.XAW3D
+%attr(755,root,root) %{_libdir}/libXaw3d.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libXaw3d.so.8
 
 %files devel