rpms/xcircuit/devel xcircuit.spec,1.1,1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xcircuit.spec 
Log Message:
fix tk and tcl dir


Index: xcircuit.spec
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcircuit.spec	26 Aug 2006 15:39:55 -0000	1.1
+++ xcircuit.spec	27 Aug 2006 04:57:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             xcircuit
 Version:          3.4.26
-Release:          8%{?dist}
+Release:          16%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPL
@@ -35,7 +35,16 @@
 %{__aclocal}
 %{__automake} --add-missing
 %{__autoconf}
-%configure
+
+if [ -d %{_prefix}/lib64 ] ; then
+   SUF=64
+else
+   SUF=
+fi
+
+%configure \
+   --with-tcl=%{_prefix}/lib$SUF --with-tk=%{_prefix}/lib$SUF \
+   --with-tcllibs=%{_prefix}/lib$SUF --with-tklibs=%{_prefix}/lib$SUF
 %{__make} %{?_smp_mflags}
 
 %install
@@ -48,12 +57,12 @@
 %{__rm} -rf examples/win32
 %{__rm} examples/.%{name}rc
 %{__rm} examples/python/.%{name}rc
-%{__rm} %{buildroot}%{_libdir}/%{name}-3.4/man/%{name}.1
+%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.4/man/%{name}.1
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-chmod -x %{buildroot}%{_libdir}/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
 
 desktop-file-install --vendor fedora \
     --add-category Engineering \
@@ -78,12 +87,33 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYRIGHT README* TODO examples/
 %{_bindir}/%{name}
-%{_libdir}/%{name}-3.4/
+%{_prefix}/lib*/%{name}-3.4/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 %Changelog
+* Sun Aug 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.4.26-16
+- Again.
+
+* Sun Aug 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.4.26-15
+- Fix tk and tcl libdir.
+
+* Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-13
+- Minor fixes to build properly under x86_64
+
+* Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-12
+- Minor fixes to build properly under x86_64
+
+* Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-11
+- Minor fixes to build properly under x86_64
+
+* Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-10
+- Opted %%{_prefix}/lib* prior to %%{_libdir}
+
+* Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-9
+- Added --libdir=%%{_libdir} to solve build error on x86_64
+
 * Sat Aug 26 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-8
 - Use of %%{__cp} -p to keep timestamp