rpms/tkdnd/devel tkdnd-1.0-64bit.patch, NONE, 1.1 tkdnd-1.0-rpmoptflags.patch, NONE, 1.1 tkdnd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sander Hoentjen (tjikkun) fedora-extras-commits at redhat.com
Fri Jun 9 05:09:47 UTC 2006


Author: tjikkun

Update of /cvs/extras/rpms/tkdnd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tkdnd-1.0-64bit.patch tkdnd-1.0-rpmoptflags.patch tkdnd.spec 
Log Message:
auto-import tkdnd-1.0a2-6 on branch devel from tkdnd-1.0a2-6.src.rpm

tkdnd-1.0-64bit.patch:

--- NEW FILE tkdnd-1.0-64bit.patch ---
--- tkdnd-1.0a2~/unix/tcl.m4	2006-06-01 14:49:37.000000000 +0200
+++ tkdnd-1.0a2/unix/tcl.m4	2006-06-02 07:21:04.000000000 +0200
@@ -68,7 +68,9 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -160,7 +162,9 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`
--- tkdnd-1.0a2~/unix/configure	2006-06-01 14:49:37.000000000 +0200
+++ tkdnd-1.0a2/unix/configure	2006-06-02 07:22:37.000000000 +0200
@@ -1251,7 +1251,9 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -1369,7 +1371,9 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`

tkdnd-1.0-rpmoptflags.patch:

--- NEW FILE tkdnd-1.0-rpmoptflags.patch ---
--- tkdnd~/unix/Makefile.in	2004-02-03 20:02:17.000000000 -0800
+++ tkdnd/unix/Makefile.in	2006-03-28 12:23:54.000000000 -0800
@@ -170,7 +170,7 @@
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 AR = ar
-CFLAGS = @CFLAGS@
+CFLAGS = @TCL_EXTRA_CFLAGS@ @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@


--- NEW FILE tkdnd.spec ---
Name:           tkdnd
Version:        1.0a2
Release:        6%{?dist}
Summary:        Tk extension that adds native drag & drop capabilities

Group:          Development/Libraries
License:        BSD
URL:            http://tkdnd.sourceforge.net/
Source0:        http://dl.sourceforge.net/tkdnd/tkdnd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tk-devel, libXext-devel
Patch1: tkdnd-1.0-rpmoptflags.patch       
Patch2: tkdnd-1.0-64bit.patch

%description
Tk Drag & Drop: tkdnd is an extension that adds native drag & drop capabilities
to the tk toolkit. It can be used with any tk version equal or greater to 8.4.
Under unix the drag & drop protocol in use is the XDND protocol version 4
(also used by the QT toolkit, KDE & GNOME Desktops).

%prep
%setup -q

%patch1 -p1 -b .1-rpmoptflags
%patch2 -p1 -b .2-64bit
%{__sed} -i 's/\r//' doc/XDND_Protocol/drop_no_xdnd.html doc/XDND_Protocol/examples.html doc/XDND_Protocol/dragging_files.html doc/XDND_Protocol/xdnd.html

%build
cd unix
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
cd unix
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{version}
install -p -m 0755 ../lib/tkdnd/*.so $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{version}
install -p -m 0644 ../lib/tkdnd/*.tcl $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/*
%{_libdir}/%{name}-%{version}/


%changelog
* Fri Jun 08 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-6
- Removed the extra directory in %_doc by adding a wildcard
- Moved the "rm -rf $RPM_BUILD_ROOT" to the very first line in %_install

* Fri Jun 08 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-5
- dropped sed magic, install files by hand instead

* Fri Jun 02 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-4
- 64bit patch for tk headers too now

* Thu Jun 01 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-3
- added 64bit patch
- sed magic instead of passing libdir to configure and rm libtkdnd.dll

* Wed May 31 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-2
- fixed W: tkdnd unstripped-binary-or-object /usr/lib/tkdnd/libtkdnd.so (thanks Paul Howard)
- removed tcl-devel als buildreq since it is required by tk-devel

* Tue May 30 2006 Sander Hoentjen <sander at hoentjen.eu> - 1.0a2-1
- created


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkdnd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jun 2006 05:08:39 -0000	1.1
+++ .cvsignore	9 Jun 2006 05:09:47 -0000	1.2
@@ -0,0 +1 @@
+tkdnd-1.0a2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkdnd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jun 2006 05:08:39 -0000	1.1
+++ sources	9 Jun 2006 05:09:47 -0000	1.2
@@ -0,0 +1 @@
+43c91da595aade4978e2e5e820ab0fc9  tkdnd-1.0a2.tar.gz




More information about the scm-commits mailing list