rpms/xcircuit/EL-5 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 sources, 1.4, 1.5 xcircuit.desktop, 1.3, 1.4 xcircuit.spec, 1.6, 1.7

Sun Nov 15 23:26:57 UTC 2009

Author: chitlesh

Update of /cvs/pkgs/rpms/xcircuit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18882/EL-5

Modified Files:
	.cvsignore import.log sources xcircuit.desktop xcircuit.spec 
Log Message:
stable 3.6.163


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	10 Nov 2008 18:30:53 -0000	1.4
+++ .cvsignore	15 Nov 2009 23:26:57 -0000	1.5
@@ -1 +1 @@
-xcircuit-3.4.30.tgz
+xcircuit-3.6.163.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Nov 2008 18:30:53 -0000	1.1
+++ import.log	15 Nov 2009 23:26:57 -0000	1.2
@@ -1 +1,2 @@
 xcircuit-3_4_30-1_fc10:EL-5:xcircuit-3.4.30-1.fc10.src.rpm:1226341821
+xcircuit-3_6_163-1_fc12:EL-5:xcircuit-3.6.163-1.fc12.src.rpm:1258327537


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Nov 2008 18:30:53 -0000	1.4
+++ sources	15 Nov 2009 23:26:57 -0000	1.5
@@ -1 +1 @@
-adabfa8432ad4c95344d12a821902e81  xcircuit-3.4.30.tgz
+caf3a128c1e62c165a4d4364e4a05100  xcircuit-3.6.163.tgz


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/EL-5/xcircuit.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xcircuit.desktop	21 Oct 2007 21:26:08 -0000	1.3
+++ xcircuit.desktop	15 Nov 2009 23:26:57 -0000	1.4
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=XCircuit Schematic
+Comment=ASIC Schematic Editor
 Exec=xcircuit
 Icon=xcircuit
 Type=Application
 Terminal=false
 GenericName=Xcircuit Schematic
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;


Index: xcircuit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcircuit/EL-5/xcircuit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xcircuit.spec	10 Nov 2008 18:30:53 -0000	1.6
+++ xcircuit.spec	15 Nov 2009 23:26:57 -0000	1.7
@@ -1,5 +1,5 @@
 Name:             xcircuit
-Version:          3.4.30
+Version:          3.6.163
 Release:          1%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
@@ -16,10 +16,12 @@ BuildRoot:        %{_tmppath}/%{name}-%{
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
 BuildRequires:    ghostscript-devel, ngspice, libXpm-devel, zlib-devel
+BuildRequires:    chrpath
+
 Requires:         tk coreutils gtk2
 
 # Special FEL Gnome/KDE menu structure
-Requires: 		  electronics-menu
+Requires:         electronics-menu
 
 %description
 Xcircuit is a general-purpose drawing program and also a specific-purpose
@@ -41,17 +43,16 @@ cd %{name}-%{version}
 %{__autoconf}
 
 
-WISH=/usr/bin/wish
-export WISH
-
+export WISH=/usr/bin/wish
+export CFLAGS="$CFLAGS -g"
 
+#01/08/09 Without --enable-asg \ because it's broken
 %configure \
    --with-tcl=%{_libdir}      \
    --with-tk=%{_libdir}       \
    --with-tcllibs=%{_libdir}  \
    --with-tklibs=%{_libdir}
 
-
 %{__make} %{?_smp_mflags}
 
 
@@ -66,25 +67,25 @@ cd %{name}-%{version}
 %{__rm} -rf examples/win32
 
 # 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
+#W: xcircuit hidden-file-or-dir examples/python/.xcircuitrc
+#W: xcircuit hidden-file-or-dir examples/.xcircuitrc
 
-chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_prefix}/lib*/%{name}-3.6/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
+sed -i "s|# xcircuit::library| xcircuit::library|" %{buildroot}%{_prefix}/lib*/%{name}-3.6/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                  \
+desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
 
+# removing rpath
+chrpath --delete %{buildroot}%{_libdir}/%{name}-3.6/xcircexec
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -92,16 +93,12 @@ desktop-file-install --vendor fedora    
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications
 
 
@@ -110,13 +107,25 @@ fi
 %doc %{name}-%{version}/{CHANGES,COPYRIGHT,README*,TODO}
 %doc %{name}-%{version}/examples/
 %{_bindir}/%{name}
-%{_prefix}/lib*/%{name}-3.4/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_prefix}/lib*/%{name}-3.6/
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Sun Nov 15 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.6.163-1
+- new upstrea stable release 3.6.163
+
+* Sat Aug 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.6.161-1
+- new upstream release 3.6.161
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.30-1
 - new upstream release
 
@@ -149,7 +158,7 @@ fi
 - 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
+- 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


