|
|
@@ -1,17 +1,23 @@
|
|
|
-%define majorver 8.4
|
|
|
-%define minorver 19
|
|
|
+%define majorver 8.5
|
|
|
+%define minorver 7
|
|
|
Summary: A Tcl/Tk development environment: tk
|
|
|
Summary(ja): Tcl/Tk 開発環境: tk
|
|
|
Name: tk
|
|
|
Version: %{majorver}.%{minorver}
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Group: Development/Languages
|
|
|
-License: BSD
|
|
|
+License: TCL
|
|
|
URL: http://tcl.sourceforge.net/
|
|
|
Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
|
|
|
-Patch2: tk-8.4.12-lib-perm.patch
|
|
|
-Patch3: tk-8.4-lastevent.patch
|
|
|
-Patch4: tk-8.4.18-tkBind.patch
|
|
|
+# patches from Red Hat Enterprise Linux tk-8.5.7-6.el6
|
|
|
+Patch101: tk8.5-make.patch
|
|
|
+Patch102: tk8.5-conf.patch
|
|
|
+# this patch isn't needed since tk8.6b1
|
|
|
+Patch103: tk-seg_input.patch
|
|
|
+# this patch is tracked in tk tracker
|
|
|
+Patch104: tk-8.5.7-color.patch
|
|
|
+# fixes sigsegv if there is no font seen by fontconfig (#606671)
|
|
|
+Patch105: tk-8.5.7-nofont-sigsegv.patch
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: tcl = %{version}, autoconf
|
|
|
@@ -40,39 +46,42 @@ System のウィジェットセットです。 テキストベースのインタ
|
|
|
|
|
|
%prep
|
|
|
%setup -n %{name}%{version} -q
|
|
|
-%patch2 -p1 -b .rolib
|
|
|
-%patch3 -p0 -b .lastevent
|
|
|
-#%%patch4 -p1 -b .tkbind
|
|
|
-cd unix
|
|
|
-autoconf
|
|
|
|
|
|
+%patch101 -p1 -b .make
|
|
|
+%patch102 -p1 -b .conf
|
|
|
+%patch103 -p1 -b .seg
|
|
|
+%patch104 -p1 -b .color
|
|
|
+%patch105 -p1 -b .nofont-sigsegv
|
|
|
|
|
|
%build
|
|
|
cd unix
|
|
|
-%configure \
|
|
|
- --with-tcl=%{_libdir} --enable-shared \
|
|
|
- --enable-threads --enable-64bit --with-x
|
|
|
-
|
|
|
-make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/tk%{majorver}
|
|
|
+autoconf
|
|
|
+%configure
|
|
|
+make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/tk%{majorver}
|
|
|
-ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
|
|
|
|
|
|
-# for linking with -ltk
|
|
|
-ln -s libtk%{majorver}.so %{buildroot}%{_libdir}/libtk.so
|
|
|
+make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_datadir}/%{name}%{majorver}
|
|
|
|
|
|
-mkdirhier %buildroot/%{_includedir}/tk-private/{generic,unix}
|
|
|
-cp -p generic/{default,tkInt,tkIntDecls,tkPort}.h %buildroot/%{_includedir}/tk-private/generic
|
|
|
-cp -p unix/tkUnix{Default,Port}.h %buildroot/%{_includedir}/tk-private/unix
|
|
|
+ln -s wish%{majorver} $RPM_BUILD_ROOT%{_bindir}/wish
|
|
|
|
|
|
-# Fix up the include files.
|
|
|
-cp generic/*.h $RPM_BUILD_ROOT%{_includedir}/tk-private/generic
|
|
|
-cp unix/*.h $RPM_BUILD_ROOT%{_includedir}/tk-private/unix
|
|
|
+# for linking with -l%{name}
|
|
|
+ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
|
|
|
+
|
|
|
+mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic/ttk,unix}
|
|
|
+find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
|
|
|
+( cd $RPM_BUILD_ROOT/%{_includedir}
|
|
|
+ for i in *.h ; do
|
|
|
+ [ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
|
|
|
+ done
|
|
|
+)
|
|
|
|
|
|
# remove buildroot traces
|
|
|
-perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/tk-private|" %buildroot/%{_libdir}/tkConfig.sh
|
|
|
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
|
|
|
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tkAppInit.c
|
|
|
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/prolog.ps
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -85,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc
|
|
|
+%doc README changes license.terms
|
|
|
%{_bindir}/wish*
|
|
|
%{_datadir}/tk%{majorver}
|
|
|
%{_libdir}/libtk%{majorver}.so
|
|
|
@@ -99,6 +108,22 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_mandir}/mann/*
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jan 4 2013 IWAI, Masaharu <iwai@alib.jp> 8.5.7-1
|
|
|
+- update to 5.8.7: sync Red Hat Enterprise Linux 6 tk-8.4.19-4vl6
|
|
|
+- update License: TCL
|
|
|
+- drop obsolete patches
|
|
|
+ - lib-perm patch (Patch2)
|
|
|
+ - lastevent patch (Patch3)
|
|
|
+ - tkBind patch (Patch4)
|
|
|
+- add some patches from RHEL tk-8.5.7-6.el6
|
|
|
+ - make patch (Patch101)
|
|
|
+ - conf patch (Patch102)
|
|
|
+ - seg_input patch (Patch103)
|
|
|
+ - color patch (Patch104)
|
|
|
+ - nofont sigsegv patch (Patch105)
|
|
|
+- add some documents
|
|
|
+- update build and install section: sync RHEL tk-8.5.7-6.el6
|
|
|
+
|
|
|
* Thu Apr 21 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.4.19-4
|
|
|
- added "BuildRequires: imake".
|
|
|
|
iwaim