auto-import libXaw-0.99.2-1 on branch devel from libXaw-0.99.2-1.src.rpm

.cvsignore

@@ -1 +1 @@
-libXaw-0.99.1.tar.bz2
+libXaw-0.99.2.tar.bz2

libXaw.spec

@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
-Version: 0.99.1
+Version: 0.99.2
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -17,7 +17,7 @@ BuildRequires: libXpm-devel
 # without it.
 BuildRequires: libXext-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXaw runtime library
@@ -28,7 +28,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libXmu-devel
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXaw development package
@@ -52,6 +52,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 
+# Fix library names and symlinks
+#{
+#    pushd $RPM_BUILD_ROOT%{_libdir}
+#    rm -f libXaw6.so.6 libXaw7.so.7
+#    mv libXaw6.so.6.0.1 libXaw.so.6.0.1
+#    mv libXaw7.so.7.0.0 libXaw.so.7.0.0
+#    ln -s libXaw.so.6.0.1 libXaw.so.6
+#    ln -s libXaw.so.6.0.1 libXaw.so
+#    popd
+#}
+
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -65,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
+%{_libdir}/libXaw.so.6
+#%{_libdir}/libXaw.so.6.0.1
+%{_libdir}/libXaw.so.7
+#%{_libdir}/libXaw.so.7.0.0
 %{_libdir}/libXaw6.so.6
 %{_libdir}/libXaw6.so.6.0.1
 %{_libdir}/libXaw7.so.7
@@ -161,7 +176,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_mandir}/man3x
 %{_mandir}/man3x/*.3x*
 
+#- Install the libraries as libXaw.so.[67]* instead of libXaw[67].so.[67]*
+
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libXaw to version 0.99.2 from X11R7 RC2
+
 * Mon Oct 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
 - Updated libXaw to version 0.99.1 from X11R7 RC1
 - Update file manifest to find manpages in "man3x"

sources

@@ -1 +1 @@
-9d03504b6725cf461945d10b13844272  libXaw-0.99.1.tar.bz2
+c139324a5c636e6a659ddd33d3647192  libXaw-0.99.2.tar.bz2