rpms/tk-tktreectrl/devel tktreectrl-2.2.3-pkgdir.patch, NONE, 1.1 tk-tktreectrl.spec, 1.3, 1.4

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sun Jan 6 18:05:52 UTC 2008


Author: wart

Update of /cvs/extras/rpms/tk-tktreectrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1471

Modified Files:
	tk-tktreectrl.spec 
Added Files:
	tktreectrl-2.2.3-pkgdir.patch 
Log Message:
Add patch to install package into the correct directory



tktreectrl-2.2.3-pkgdir.patch:

--- NEW FILE tktreectrl-2.2.3-pkgdir.patch ---
--- tktreectrl-2.2.3/Makefile.in.orig	2008-01-06 09:55:07.000000000 -0800
+++ tktreectrl-2.2.3/Makefile.in	2008-01-06 09:54:45.000000000 -0800
@@ -79,7 +79,7 @@
 
 PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_PATCHLEVEL)
 pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl at TCL_VERSION@/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .


Index: tk-tktreectrl.spec
===================================================================
RCS file: /cvs/extras/rpms/tk-tktreectrl/devel/tk-tktreectrl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tk-tktreectrl.spec	4 Jan 2008 20:56:18 -0000	1.3
+++ tk-tktreectrl.spec	6 Jan 2008 18:05:02 -0000	1.4
@@ -3,13 +3,14 @@
 
 Name:           tk-tktreectrl
 Version:        2.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Flexible listbox widget for Tk
 
 Group:          Development/Libraries
 License:        TCL
 URL:            http://tktreectrl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/tktreectrl/tktreectrl-%{version}.tar.gz
+Patch0:         tktreectrl-2.2.3-pkgdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tk-devel
@@ -21,20 +22,21 @@
 
 %prep
 %setup -q -n tktreectrl-%{version}
+%patch0 -p1
 chmod -x doc/* README.txt license.terms ChangeLog
 chmod -x generic/*.c generic/*.h
 sed -i -e 's/\r//' doc/W*.html
 
 
 %build
-%configure --libdir=%{tcl_sitearch}
+%configure
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}/treectrl%{version}/htmldoc
+rm -rf $RPM_BUILD_ROOT%{tcl_sitearch}/treectrl%{version}/htmldoc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +50,9 @@
 
 
 %changelog
+* Sun Jan 6 2008 Wart <wart at kobold.org> - 2.2.3-4
+- Add patch to install package into the correct directory
+
 * Fri Jan 4 2008 Wart <wart at kobold.org> - 2.2.3-3
 - Rebuild for Tcl 8.5
 




More information about the fedora-extras-commits mailing list