rpms/tix/FC-5 tix.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/tix/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19767

Modified Files:
	tix.spec 
Log Message:
Make sure libTix8.4.so is in /usr/lib/Tix8.4 and bump release to 4.



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/FC-5/tix.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tix.spec	11 Feb 2006 05:52:04 -0000	1.12
+++ tix.spec	27 Mar 2006 15:53:27 -0000	1.13
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 3.1
+Release: 4
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -65,17 +65,17 @@
 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 @@
 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 @@
 
 %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 @@
 
 %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 at redhat.com> - 1:8.4.0-4
+- Make sure libTix8.4.so is in /usr/lib/Tix8.4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:8.4.0-3.1
 - bump again for double-long bug on ppc(64)