rpms/blt/devel blt2.4z-destdir.patch,NONE,1.1 blt.spec,1.19,1.20
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Mon Jan 7 07:11:21 UTC 2008
Author: wart
Update of /cvs/pkgs/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14858
Modified Files:
blt.spec
Added Files:
blt2.4z-destdir.patch
Log Message:
Clean up spec file by creating patch for broken Makefile stanzas
blt2.4z-destdir.patch:
--- NEW FILE blt2.4z-destdir.patch ---
--- blt2.4z/library/Makefile.in.orig 2008-01-06 20:06:26.000000000 -0800
+++ blt2.4z/library/Makefile.in 2008-01-06 21:41:15.000000000 -0800
@@ -58,15 +58,15 @@
for i in $(miscFiles) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
mkdirs:
@for i in $(instdirs) ; do \
if test -d $(INSTALL_ROOT)$$i ; then \
: ; \
else \
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
--- blt2.4z/configure.in.orig 2008-01-06 22:48:37.000000000 -0800
+++ blt2.4z/configure.in 2008-01-06 22:49:57.000000000 -0800
@@ -976,7 +976,9 @@
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
# Add BLT to the run path
-libdir=${exec_prefix}/lib
+if test "x${libdir}" == "x" ; then
+ libdir=${exec_prefix}/lib
+fi
if test "x${libdir}" != "x" -a \
"${libdir}" != "/usr/lib" -a \
--- blt2.4z/demos/Makefile.in.orig 2008-01-06 20:11:25.000000000 -0800
+++ blt2.4z/demos/Makefile.in 2008-01-06 22:02:50.000000000 -0800
@@ -6,7 +6,7 @@
exec_prefix = @exec_prefix@
version = @BLT_VERSION@
libdir = @libdir@
-scriptdir = $(prefix)/lib/blt$(version)
+scriptdir = @BLT_LIBRARY@
destdir = $(scriptdir)/demos
srcdir = @srcdir@
--- blt2.4z/configure.orig 2008-01-06 22:48:41.000000000 -0800
+++ blt2.4z/configure 2008-01-06 22:49:57.000000000 -0800
@@ -3756,7 +3756,9 @@
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
# Add BLT to the run path
-libdir=${exec_prefix}/lib
+if test "x${libdir}" == "x" ; then
+ libdir=${exec_prefix}/lib
+fi
if test "x${libdir}" != "x" -a \
"${libdir}" != "/usr/lib" -a \
--- blt2.4z/Makefile.in.orig 2008-01-06 13:27:01.000000000 -0800
+++ blt2.4z/Makefile.in 2008-01-06 22:03:26.000000000 -0800
@@ -13,7 +13,7 @@
includedir = @includedir@
libdir = @libdir@
version = @BLT_VERSION@
-scriptdir = $(prefix)/lib/blt$(version)
+scriptdir = @BLT_LIBRARY@
instdirs = $(prefix) \
$(exec_prefix) \
@@ -28,7 +28,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_ROOT =
+INSTALL_ROOT = @INSTALL_ROOT@
SHELL = /bin/sh
RM = rm -f
@@ -47,17 +47,17 @@
(cd library; $(MAKE) install)
(cd man; $(MAKE) install)
(cd demos; $(MAKE) install)
- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
mkdirs:
@for i in $(instdirs) ; do \
if test -d $(INSTALL_ROOT)$$i ; then \
: ; \
else \
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
--- blt2.4z/src/Makefile.in.orig 2008-01-06 22:27:58.000000000 -0800
+++ blt2.4z/src/Makefile.in 2008-01-06 22:28:06.000000000 -0800
@@ -22,7 +22,7 @@
bindir = $(exec_prefix)/bin
exec_prefix = @exec_prefix@
-incdir = $(prefix)/include
+incdir = @includedir@
libdir = @libdir@
scriptdir = $(exec_prefix)/lib
--- blt2.4z/man/Makefile.in.orig 2008-01-06 20:09:02.000000000 -0800
+++ blt2.4z/man/Makefile.in 2008-01-06 22:57:34.000000000 -0800
@@ -10,9 +10,9 @@
instdirs = $(mandir) $(mandir)/mann $(mandir)/man3
-MAN_N = BLT.n barchart.n beep.n bgexec.n bitmap.n \
+MAN_N = BLT.n barchart.n beep.n bgexec.n bltbitmap.n \
bltdebug.n busy.n container.n cutbuffer.n \
- dragdrop.n eps.n graph.n hierbox.n \
+ dragdrop.n eps.n bltgraph.n hierbox.n \
hiertable.n htext.n spline.n stripchart.n \
table.n tabset.n tile.n tree.n treeview.n vector.n \
watch.n winop.n
@@ -51,8 +51,8 @@
if test -d $(INSTALL_ROOT)$$i ; then \
: ; \
else \
- echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
Index: blt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- blt.spec 7 Jan 2008 00:12:04 -0000 1.19
+++ blt.spec 7 Jan 2008 07:10:38 -0000 1.20
@@ -5,7 +5,7 @@
Summary: BLT widget extension to Tcl/Tk scripting language development
Name: blt
Version: 2.4
-Release: 22%{?dist}
+Release: 23%{?dist}
License: MIT
Group: Development/Libraries
@@ -14,6 +14,7 @@
Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2
Patch1: http://jfontain.free.fr/blt2.4z-patch-64
Patch2: blt2.4-tk8.5.patch
+Patch3: blt2.4z-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
Provides: tk-blt = %{version}-%{release}
@@ -39,7 +40,7 @@
Requires: %{name} = %{version}-%{release}
%description devel
-BLT is an extension to the Tk toolkiy. BLT's most useful feature is the
+BLT is an extension to the Tk toolkit. BLT's most useful feature is the
provision of more widgets for Tk, but it also provides more geometry managers
and miscellaneous other commands. Note that you won't need to any patching
of the Tcl or Tk source file to use BLT, but you will need to have Tcl/Tk
@@ -52,26 +53,31 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+
+# Fix bad interpreter path
+sed -i -e 's#/usr/local/bin/tclsh#/usr/bin/tclsh#' demos/scripts/page.tcl
+
+# Rename a couple of files that conflict with other packages
+mv man/graph.mann man/bltgraph.mann
+mv man/bitmap.mann man/bltbitmap.mann
%build
-%configure --with-tcl=%{_libdir} --with-tk=%{_libdir}
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --with-blt=%{tcl_sitelib} --includedir=%{_includedir}/%{name}
cd src/shared
-%__make SHLIB_LD_FLAGS=-shared # no _smp_mflags; race conditions.
+# no _smp_mflags; race conditions.
+make SHLIB_LD_FLAGS=-shared
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}
-mkdir -p $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
-
-install -m 755 -p src/shared/libBLT24.so $RPM_BUILD_ROOT%{_libdir}
-install -m 755 -p src/shared/libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}
-install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
-install -m 644 -p src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-echo 'package ifneeded BLT 2.4 "if {[llength [info commands tk]] > 0} {load [file join "%{_libdir}" libBLT24.so]} else {load [file join "%{_libdir}" libBLTlite24.so] BLT}"' > $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}/pkgIndex.tcl
-cp -p -r library/dd_protocols $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
-rm -f html/Makefile.vc
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
+# Fedora policy is not to generate new shells for Tcl extensions
+rm -f $RPM_BUILD_ROOT%{_bindir}/bltsh*
+rm -f $RPM_BUILD_ROOT%{_bindir}/bltwish*
+# Remove static libraries
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+# Remove some doc files from the script area
+rm -f $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/{README,NEWS,PROBLEMS}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,14 +90,18 @@
%defattr(-,root,root,0755)
%doc README INSTALL PROBLEMS html/
%{_libdir}/*.so
-%{tcl_sitearch}/*
-%{tcl_sitelib}/*
+%{tcl_sitelib}/%{name}%{version}
+%{_mandir}/man3/*
+%{_mandir}/mann/*
%files devel
%defattr(-,root,root,-)
-%{_includedir}/blt/*
+%{_includedir}/%{name}
%changelog
+* Mon Jan 07 2008 Wart <wart at kobold.org> 2.4-23
+- Clean up spec file by creating patch for broken Makefile stanzas
+
* Mon Jan 07 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-22
- Debug files in debug package (bug #427681)
More information about the fedora-extras-commits
mailing list