rpms/xcircuit/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xcircuit.desktop, 1.2, 1.3 xcircuit.spec, 1.4, 1.5

Sun Oct 21 21:26:42 UTC 2007

Author: chitlesh

Update of /cvs/extras/rpms/xcircuit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22255/FC-6

Modified Files:
	.cvsignore sources xcircuit.desktop xcircuit.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	26 Aug 2006 15:39:55 -0000	1.2
+++ .cvsignore	21 Oct 2007 21:26:08 -0000	1.3
@@ -1 +1 @@
-xcircuit-3.4.26.tgz
+xcircuit-3.4.27.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 15:39:55 -0000	1.2
+++ sources	21 Oct 2007 21:26:08 -0000	1.3
@@ -1 +1 @@
-ec6ec09e97d711f507e8f7c33c88b06b  xcircuit-3.4.26.tgz
+7b06f177807a5823476cb06e91e5e1a8  xcircuit-3.4.27.tgz


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/FC-6/xcircuit.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcircuit.desktop	3 Feb 2007 13:18:06 -0000	1.2
+++ xcircuit.desktop	21 Oct 2007 21:26:08 -0000	1.3
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=XCircuit
+Name=XCircuit Schematic
 Exec=xcircuit
 Icon=xcircuit
 Type=Application
 Terminal=false
-GenericName=xcircuit
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
\ No newline at end of file
+GenericName=Xcircuit Schematic
+Categories=Science;Engineering;


Index: xcircuit.spec
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/FC-6/xcircuit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xcircuit.spec	3 Feb 2007 13:18:06 -0000	1.4
+++ xcircuit.spec	21 Oct 2007 21:26:08 -0000	1.5
@@ -1,9 +1,9 @@
 Name:             xcircuit
-Version:          3.4.26
-Release:          18%{?dist}
+Version:          3.4.27
+Release:          1%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
-License:          GPL
+License:          GPLv2
 Group:            Applications/Engineering
 URL:              http://opencircuitdesign.com/xcircuit
 
@@ -16,16 +16,19 @@
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
-Requires:         tk
+Requires:         tk coreutils gtk2
 
 %description
 Xcircuit is a general-purpose drawing program and also a specific-purpose
 CAD program for circuit schematic drawing and schematic capture.
 
 %prep
-%setup -q
+# tarball includes unneeded symlink, so we firstly
+# create a directory and expand tarball there.
+%setup -q -T -c %{name}-%{version} -a 0
 
 %build
+cd %{name}-%{version}
 %{__libtoolize} --force --copy
 %{__aclocal}
 %{__automake} --add-missing
@@ -55,32 +58,26 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__rm} %{_builddir}/%{name}
-
 
+cd %{name}-%{version}
 %{__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.6/man/%{name}.1
+# They stay
+#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.27/examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir /usr/share/doc/xcircuit-3.4.37/examples/.xcircuitrc
 
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__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
 
-%{__cp} -pr examples/ %{buildroot}%{_prefix}/lib*/%{name}-3.4/
-
-
-desktop-file-install --vendor ""               \
+desktop-file-install --vendor fedora           \
     --add-category Engineering                 \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -92,29 +89,52 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYRIGHT README* TODO
+%doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
+%doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
 %{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
 %Changelog
+* 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
+
+* Fri Aug 24 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-23
+- mass rebuild for fedora 8 - ppc
+
+* Sun Aug 12 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-22
+- fix for x86_64
+
+* Sun Aug 12 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-21
+- dump release
+
+* Wed Aug 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-20
+- patch %{name}-3.4-memset.patch: Found memset with swapped arguments
+
+* Mon Feb 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-19
+- Rebuilt for rawhide
+
 * Wed Jan 31 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-18
-- Fix presence in Gnome menu
+- Fixed presence in Gnome menu
 
 * Wed Aug 30 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 3.4.26-17
 - Rebuilt for FC6 devel


