wish8.5 is here again for back compatibility
This commit is contained in:
Marcela Mašláňová
parent
462e507e23
commit
4c32bd54c0
7
tk.spec
7
tk.spec
|
|
@ -3,7 +3,7 @@
|
|||
Summary: The graphical toolkit for the Tcl scripting language
|
||||
Name: tk
|
||||
Version: %{majorver}.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Epoch: 1
|
||||
License: TCL
|
||||
Group: Development/Languages
|
||||
|
|
@ -64,7 +64,7 @@ make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
|
|||
rm -rf %{buildroot}
|
||||
make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
|
||||
|
||||
#ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
|
||||
ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
|
||||
|
||||
# for linking with -l%{name}
|
||||
ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
|
||||
|
|
@ -111,6 +111,9 @@ rm -rf %{buildroot}
|
|||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Tue Jan 15 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.0-3
|
||||
- wish8.5 is here again for back compatibility
|
||||
|
||||
* Sat Jan 5 2008 Marcela Maslanova <mmaslano@redhat.com> - 1:8.5.0-2
|
||||
- Obsolete the tile package that has been incorporated into the core
|
||||
tk source.
|
||||
|
|
|
|||
|
|
@ -1,31 +1,7 @@
|
|||
diff -up tk8.5.0/unix/configure.in.make tk8.5.0/unix/configure.in
|
||||
--- tk8.5.0/unix/configure.in.make 2007-12-20 12:13:46.000000000 +0100
|
||||
+++ tk8.5.0/unix/configure.in 2007-12-20 12:15:22.000000000 +0100
|
||||
@@ -563,7 +563,7 @@ PRIVATE_INCLUDE_DIR='$(includedir)'
|
||||
HTML_DIR='$(DISTDIR)/html'
|
||||
TK_PKG_DIR='tk$(VERSION)'
|
||||
TK_RSRC_FILE='tk$(VERSION).rsrc'
|
||||
-WISH_RSRC_FILE='wish$(VERSION).rsrc'
|
||||
+WISH_RSRC_FILE='wish.rsrc'
|
||||
|
||||
# Note: in the following variable, it's important to use the absolute
|
||||
# path name of the Tcl directory rather than "..": this is because
|
||||
@@ -616,9 +616,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
|
||||
EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
|
||||
if test $tk_aqua = yes; then
|
||||
EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing ${TK_RSRC_FILE} to $(LIB_INSTALL_DIR)/Resources" && mkdir -p "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) "${TK_RSRC_FILE}" "$(LIB_INSTALL_DIR)/Resources"'
|
||||
- EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing wish$(VERSION) script to $(INSTALL_ROOT)/'"${bindir}"'" && mkdir -p "$(INSTALL_ROOT)/'"${bindir}"'" && printf > "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)" "#!/bin/sh\n\"\$$(dirname \$$0)'"`eval d="${bindir}"; echo "$d" | sed -e 's#/[^/][^/]*#/..#g'`"'$(bindir)/Wish\" \"\$$@\"" && chmod +x "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)"'
|
||||
+ EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing wish script to $(INSTALL_ROOT)/'"${bindir}"'" && mkdir -p "$(INSTALL_ROOT)/'"${bindir}"'" && printf > "$(INSTALL_ROOT)/'"${bindir}"'/wish" "#!/bin/sh\n\"\$$(dirname \$$0)'"`eval d="${bindir}"; echo "$d" | sed -e 's#/[^/][^/]*#/..#g'`"'$(bindir)/Wish\" \"\$$@\"" && chmod +x "$(INSTALL_ROOT)/'"${bindir}"'/wish"'
|
||||
bindir="${libdir}/Resources/Wish.app/Contents/MacOS"
|
||||
- EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Info.plist to $(BIN_INSTALL_DIR)/.." && $(INSTALL_DATA) Wish-Info.plist "$(BIN_INSTALL_DIR)/../Info.plist" && mv -f "$(BIN_INSTALL_DIR)/wish$(VERSION)" "$(BIN_INSTALL_DIR)/Wish"'
|
||||
+ EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Info.plist to $(BIN_INSTALL_DIR)/.." && $(INSTALL_DATA) Wish-Info.plist "$(BIN_INSTALL_DIR)/../Info.plist" && mv -f "$(BIN_INSTALL_DIR)/wish" "$(BIN_INSTALL_DIR)/Wish"'
|
||||
EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && mkdir -p "$(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.icns" "$(BIN_INSTALL_DIR)/../Resources"'
|
||||
EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing ${WISH_RSRC_FILE} to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "${WISH_RSRC_FILE}" "$(BIN_INSTALL_DIR)/../Resources"'
|
||||
fi
|
||||
diff -up tk8.5.0/unix/Makefile.in.make tk8.5.0/unix/Makefile.in
|
||||
--- tk8.5.0/unix/Makefile.in.make 2007-12-20 12:11:33.000000000 +0100
|
||||
+++ tk8.5.0/unix/Makefile.in 2007-12-20 12:19:20.000000000 +0100
|
||||
@@ -715,14 +715,14 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
|
||||
diff -up tk8.5.0/unix/Makefile.in.old tk8.5.0/unix/Makefile.in
|
||||
--- tk8.5.0/unix/Makefile.in.old 2007-12-17 18:57:25.000000000 +0100
|
||||
+++ tk8.5.0/unix/Makefile.in 2008-01-15 15:00:15.000000000 +0100
|
||||
@@ -715,7 +715,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
|
||||
fi
|
||||
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
||||
@@INSTALL_LIB@
|
||||
|
|
@ -34,32 +10,3 @@ diff -up tk8.5.0/unix/Makefile.in.make tk8.5.0/unix/Makefile.in
|
|||
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
|
||||
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
||||
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
||||
$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
|
||||
fi
|
||||
- @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
|
||||
- @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
||||
+ @echo "Installing wish as $(BIN_INSTALL_DIR)/wish"
|
||||
+ @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish
|
||||
@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
|
||||
@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
|
||||
@if test "$(STUB_LIB_FILE)" != "" ; then \
|
||||
@@ -801,7 +801,7 @@ install-demos:
|
||||
@for i in $(TOP_DIR)/library/demos/*; \
|
||||
do \
|
||||
if [ -f $$i ] ; then \
|
||||
- sed -e '3 s|exec wish|exec wish$(VERSION)|' \
|
||||
+ sed -e '3 s|exec wish|exec wish|' \
|
||||
$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
|
||||
fi; \
|
||||
done;
|
||||
@@ -1732,8 +1732,8 @@ package-common:
|
||||
mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin
|
||||
sed -e "s/TCLVERSION/$(TCLVERSION)/g" \
|
||||
-e "s/TKVERSION/$(VERSION)/g" < $(UNIX_DIR)/wish.sh \
|
||||
- > $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
|
||||
- chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
|
||||
+ > $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish
|
||||
+ chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish
|
||||
|
||||
#
|
||||
# Build and install the architecture specific files in the dist directory.
|
||||
|
|
|
|||
Loading…
Reference in New Issue