rpms/xcircuit/devel xcircuit.desktop, 1.1, 1.2 xcircuit.spec, 1.3, 1.4 xcircuit-3.4.26-LIBTOOL.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sat Feb 3 13:23:04 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/xcircuit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23440/devel
Modified Files:
xcircuit.desktop xcircuit.spec
Removed Files:
xcircuit-3.4.26-LIBTOOL.patch
Log Message:
auto-import xcircuit-3.4.26-18 on branch devel from xcircuit-3.4.26-18.src.rpm
Index: xcircuit.desktop
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcircuit.desktop 26 Aug 2006 15:39:55 -0000 1.1
+++ xcircuit.desktop 3 Feb 2007 13:22:31 -0000 1.2
@@ -6,5 +6,5 @@
Type=Application
Terminal=false
GenericName=xcircuit
-Categories=Education;Science;X-Fedora;Engineering;
+Categories=Qt;KDE;Education;Science;
X-Desktop-File-Install-Version=0.10
\ No newline at end of file
Index: xcircuit.spec
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xcircuit.spec 30 Aug 2006 17:40:12 -0000 1.3
+++ xcircuit.spec 3 Feb 2007 13:22:31 -0000 1.4
@@ -1,6 +1,6 @@
Name: xcircuit
Version: 3.4.26
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Electronic circuit schematic drawing program
License: GPL
@@ -12,15 +12,11 @@
# http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64
Source2: %{name}.png
-Patch0: xcircuit-3.4.26-LIBTOOL.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcl-devel, tk-devel, desktop-file-utils, libtool, libXt-devel, zlib-devel, libXpm-devel
-Requires: tcl, tk
-Requires(post): %{_bindir}/gtk-update-icon-cache
-Requires(post): %{_bindir}/update-desktop-database
-Requires(postun): %{_bindir}/gtk-update-icon-cache
-Requires(postun): %{_bindir}/update-desktop-database
+BuildRequires: tk-devel, desktop-file-utils, libtool, libXt-devel, m4
+BuildRequires: ghostscript-devel, ngspice, libXpm-devel, zlib-devel
+Requires: tk
%description
Xcircuit is a general-purpose drawing program and also a specific-purpose
@@ -28,7 +24,6 @@
%prep
%setup -q
-%patch0 -p0 -b configure.in
%build
%{__libtoolize} --force --copy
@@ -36,63 +31,91 @@
%{__automake} --add-missing
%{__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=%{_prefix}/lib$SUF \
+ --with-tk=%{_prefix}/lib$SUF \
+ --with-tcllibs=%{_prefix}/lib$SUF \
+ --with-tklibs=%{_prefix}/lib$SUF
+
+
%{__make} %{?_smp_mflags}
+
%install
%{__rm} -rf %{buildroot}
%{__rm} %{_builddir}/%{name}
-%{__make} DESTDIR=%{buildroot} install
+
+%{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
%{__make} install-man mandir="%{buildroot}%{_mandir}"
+
%{__rm} -rf examples/win32
+
+#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.26/examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.36/examples/.xcircuitrc
%{__rm} examples/.%{name}rc
%{__rm} examples/python/.%{name}rc
-%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.4/man/%{name}.1
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+
+#%{__rm} %{buildroot}%{_prefix}/lib*/%{name}-3.6/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}%{_prefix}/lib*/%{name}-3.4/console.tcl
-desktop-file-install --vendor fedora \
- --add-category Engineering \
- --add-category X-Fedora \
+%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/
+
+
+desktop-file-install --vendor "" \
+ --add-category Engineering \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
+
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database %{_datadir}/applications
+
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database %{_datadir}/applications
+
%files
%defattr(-,root,root,-)
-%doc CHANGES COPYRIGHT README* TODO examples/
+%doc CHANGES COPYRIGHT README* TODO
%{_bindir}/%{name}
%{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_mandir}/man1/%{name}.1.gz
+
%Changelog
+* Wed Jan 31 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-18
+- Fix presence in Gnome menu
+
* Wed Aug 30 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-17
- Rebuilt for FC6 devel
--- xcircuit-3.4.26-LIBTOOL.patch DELETED ---
More information about the scm-commits
mailing list