Browse Source

tix-8.4.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2747 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 13 years ago
parent
commit
8954b85ca1
1 changed files with 28 additions and 16 deletions
  1. 28 16
      t/tix/tix-vl.spec

+ 28 - 16
t/tix/tix-vl.spec

@@ -2,12 +2,15 @@
 %define tk_major	8.4
 %define thread_major	2.6
 %define tix_major	8.4
-%define tixversion	%{tix_major}.2
+%define tixversion	%{tix_major}.3
+## can't find all provides
+#define _use_internal_dependency_generator 0
+
 Summary: A Tcl/Tk development environment: tix
 Summary(ja): Tcl/Tk 開発環境: tix
 Name: tix
 Version: %{tixversion}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: BSD
 URL: http://tix.sourceforge.net/
@@ -22,7 +25,7 @@ Requires: tk >= %{tk_major}
 Requires: thread >= %{thread_major}
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
-%description -n tix
+%description
 Tix (Tk Interface Extension), an add-on for the Tk widget set, is an
 extensive set of over 40 widgets.  In general, Tix widgets are more
 complex and more capable than the widgets provided in Tk.  Tix widgets
@@ -33,7 +36,7 @@ directory tree and a file manager.
 Install the tix package if you want to try out more complicated widgets
 for Tk.  You'll also need to have the tcl and tk packages installed.
 
-%description -n tix -l ja
+%description -l ja
 Tk ウィジェットセットのためのアドオンである、Tix (Tk Interface Extension)
 は 40 ウィジェットを超える拡張セットです。Tix ウィジェットの多くが、
 Tk から供給されるウィジェットよりも高機能です。Tix ウィジェットは
@@ -47,8 +50,8 @@ Tk で、より複雑ななウィジェットを試したい時には、tix パ
 
 %prep
 %setup -q -n Tix%{tixversion}
-%patch20 -p1 -b .perf
-%patch22 -p1 -b .dirtree
+#patch20 -p1 -b .perf
+#patch22 -p1 -b .dirtree
 
 %build
 # make the libraries reentrant
@@ -57,7 +60,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_REENTRANT"
 	--with-tcl=%{_libdir} \
 	--with-tk=%{_libdir} \
 	--enable-shared \
-	--enable-threads \
+	--disable-threads \
+	;
 
 make %{?_smp_mflags} all
 
@@ -71,7 +75,9 @@ ln -sf ../$SOFILE $RPM_BUILD_ROOT%{_libdir}/Tix%{version}/$SOFILE
 ln -sf ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libTix.so
 ln -sf ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libTix%{tix_major}.so
 ln -sf ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libtix.so
-ln -sf ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libtix%{tix_major}.so
+## internal_dependency_generator can't find provides
+#ln -sf ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libtix%{tix_major}.so
+cp -p ./$SOFILE $RPM_BUILD_ROOT%{_libdir}/libtix%{tix_major}.so
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -d $RPM_BUILD_ROOT%{_mandir}/mann
@@ -128,25 +134,31 @@ cp -a tests $SHAREDDIR
 ## perl -pi -e 's|(^%{_mandir}/man.*$)|\1\*|' *.files
 
 
-%post -p /sbin/ldconfig -n tix
-
-%postun -p /sbin/ldconfig -n tix
-
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n tix
+%files
 %defattr(-,root,root,-)
-%doc ChangeLog README.txt man/html man/index.html
-%{_libdir}/lib*.so
+%{_libdir}/libTix*.so
+%{_libdir}/libtix*.so
 %{_libdir}/Tix%{version}
-%{_datadir}/tix-8.4.2
+%{_datadir}/tix-%{tixversion}
 %{_mandir}/man1/tixwish.1.gz
 %{_mandir}/mann/*.n.gz
 %{_includedir}/*.h
+%doc ChangeLog README.txt man/html man/index.html
 
 
 %changelog
+* Tue Feb 22 2011 Shu KONNO <owa@bg.wakwak.com> 8.4.3-1
+- updated tix to 8.4.3
+- dropt tix-8.1.4-perf.patch
+- dropt tix-8.2.0b1-dirtree.patch
+- added "cp -p libTix8.4.3.so libtix8.4.so"
+- rebuilt with file-5.05-2
+
 * Tue Jun 29 2010 Shu KONNO <owa@bg.wakwak.com> 8.4.2-2
 - rebuilt with tcl/tk-8.4.19-2