From 39eda3e33252fabbf80b8e0b35018cd2e4f5d0d0 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Mon, 27 Mar 2006 16:11:04 +0000
Subject: [PATCH] Move libTix8.4.so to /usr/lib/Tix8.4

---
 tix.spec | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tix.spec b/tix.spec
index 8c97ca7..b19d3b6 100644
--- a/tix.spec
+++ b/tix.spec
@@ -5,7 +5,7 @@ Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 3.1
+Release: 5
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -65,17 +65,17 @@ make all %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# devel symlinks
+( cd $RPM_BUILD_ROOT%{_libdir}
+  rm -f libtix.so libTix.so
+  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libtix.so
+  ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libTix.so
+)
+
 # install demo scripts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
 cp -a demos $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
 
-# move shared lib
-mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
-( cd $RPM_BUILD_ROOT%{_libdir}
-  ln -sf libTix%{tixmajor}.so libTix.so
-  ln -sf libTix%{tixmajor}.so libtix.so
-)
-
 # the header and man pages were in the previous package, keeping for now...
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 install -m 0644 generic/tix.h $RPM_BUILD_ROOT%{_includedir}/tix.h
@@ -91,7 +91,6 @@ find docs -name .cvsignore -exec rm '{}' ';'
 rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/README.txt
 rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/license.terms
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,11 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libTix%{tixmajor}.so
 %dir %{_libdir}/Tix%{tixmajor}
+%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so
 %{_libdir}/Tix%{tixmajor}/*.tcl
 %{_libdir}/Tix%{tixmajor}/bitmaps
 %{_libdir}/Tix%{tixmajor}/pref
@@ -112,17 +110,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/tix.h
-%{_libdir}/libtix.so
 %{_libdir}/libTix.so
+%{_libdir}/libtix.so
+%{_includedir}/tix.h
 %{_mandir}/mann
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/*
 
-
 %changelog
+* Mon Mar 27 2006 David Cantrell <dcantrell@redhat.com> - 1:8.4.0-5
+- Make sure libTix8.4.so is in /usr/lib/Tix8.4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:8.4.0-3.1
 - bump again for double-long bug on ppc(64)