rpms/xcircuit/F-7 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xcircuit.spec, 1.7, 1.8
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Thu Apr 17 21:34:54 UTC 2008
Author: chitlesh
Update of /cvs/pkgs/rpms/xcircuit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15623/F-7
Modified Files:
.cvsignore sources xcircuit.spec
Log Message:
fixing tcl 8.5 related bugs
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 21 Oct 2007 21:27:58 -0000 1.3
+++ .cvsignore 17 Apr 2008 21:34:07 -0000 1.4
@@ -1 +1 @@
-xcircuit-3.4.27.tgz
+xcircuit-3.4.28.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 21 Oct 2007 21:27:58 -0000 1.3
+++ sources 17 Apr 2008 21:34:07 -0000 1.4
@@ -1 +1 @@
-7b06f177807a5823476cb06e91e5e1a8 xcircuit-3.4.27.tgz
+e9d33d7f8cb660091cb76271167f7913 xcircuit-3.4.28.tgz
Index: xcircuit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/F-7/xcircuit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xcircuit.spec 21 Oct 2007 21:27:58 -0000 1.7
+++ xcircuit.spec 17 Apr 2008 21:34:07 -0000 1.8
@@ -1,5 +1,5 @@
Name: xcircuit
-Version: 3.4.27
+Version: 3.4.28
Release: 1%{?dist}
Summary: Electronic circuit schematic drawing program
@@ -18,6 +18,9 @@
BuildRequires: ghostscript-devel, ngspice, libXpm-devel, zlib-devel
Requires: tk coreutils gtk2
+# Special FEL Gnome/KDE menu structure
+Requires: electronics-menu
+
%description
Xcircuit is a general-purpose drawing program and also a specific-purpose
CAD program for circuit schematic drawing and schematic capture.
@@ -27,6 +30,9 @@
# create a directory and expand tarball there.
%setup -q -T -c %{name}-%{version} -a 0
+#439604: TCL 8.5.1
+sed -i "s|package require -exact|package require|" %{name}-%{version}/lib/tcl/tkcon.tcl
+
%build
cd %{name}-%{version}
%{__libtoolize} --force --copy
@@ -35,22 +41,15 @@
%{__autoconf}
-if [ -d %{_prefix}/lib64 ] ; then
- SUF=64
-else
- SUF=
-fi
-
-
WISH=/usr/bin/wish
export WISH
%configure \
- --with-tcl=%{_prefix}/lib$SUF \
- --with-tk=%{_prefix}/lib$SUF \
- --with-tcllibs=%{_prefix}/lib$SUF \
- --with-tklibs=%{_prefix}/lib$SUF
+ --with-tcl=%{_libdir} \
+ --with-tk=%{_libdir} \
+ --with-tcllibs=%{_libdir} \
+ --with-tklibs=%{_libdir}
%{__make} %{?_smp_mflags}
@@ -76,9 +75,13 @@
%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.4/xcstartup.tcl
+sed -i '7 a\export TCLLIBPATH=%{_libdir}' %{buildroot}%{_bindir}/xcircuit
+
desktop-file-install --vendor fedora \
--add-category Engineering \
+ --add-category Electronics \
+ --remove-category Science \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -113,7 +116,22 @@
%{_mandir}/man1/%{name}.1.gz
-%Changelog
+%changelog
+* Sun Apr 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.28-1
+- closed #440387
+- new upstream release
+- opting the FEL related menu structure
+- fixed and closed #439604: TCL 8.5.1
+
+* Fri Apr 04 2008 Trond Danielsen <trondd at fedoraproject.org> - 3.4.27-2
+- Added fix for bug #440387.
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.4.27-3
+- Autorebuild for GCC 4.3
+
+* Sat Jan 5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.4.27-2
+- Rebuild for new Tcl 8.5
+
* Sun Oct 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.27-1
- new upstream release
- added coreutils and gtk as requires: #339771
More information about the fedora-extras-commits
mailing list