rpms/xcircuit/devel xcircuit-3.4-memset.patch, NONE, 1.1 xcircuit.desktop, 1.2, 1.3 xcircuit.spec, 1.6, 1.7

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	xcircuit.desktop xcircuit.spec 
Added Files:
	xcircuit-3.4-memset.patch 
Log Message:


xcircuit-3.4-memset.patch:

--- NEW FILE xcircuit-3.4-memset.patch ---
--- xcircuit-3.4.26/netlist.c	2007-08-08 12:41:04.000000000 +0200
+++ netlist.c_memset	2007-08-08 12:38:48.000000000 +0200
@@ -4096,7 +4096,7 @@
    /* have a calloc() function (2/6/04))				*/
 
    netsdone = (char *)malloc(2 + netmax(cschem));
-   memset((void *)netsdone, 2 + netmax(cschem), 0);
+   memset((void *)netsdone, 0, 2 + netmax(cschem));
 
    /* Write the name (key value pair) */
    Tcl_ListObjAppendElement(xcinterp, subckt, Tcl_NewStringObj("name", 4));


Index: xcircuit.desktop
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcircuit.desktop	3 Feb 2007 13:22:31 -0000	1.2
+++ xcircuit.desktop	11 Aug 2007 22:56:05 -0000	1.3
@@ -6,5 +6,5 @@
 Type=Application
 Terminal=false
 GenericName=xcircuit
-Categories=Qt;KDE;Education;Science;
-X-Desktop-File-Install-Version=0.10
\ No newline at end of file
+Categories=Qt;KDE;Education;Science;Engineering;
+X-Desktop-File-Install-Version=0.10


Index: xcircuit.spec
===================================================================
RCS file: /cvs/extras/rpms/xcircuit/devel/xcircuit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xcircuit.spec	26 Feb 2007 18:56:37 -0000	1.6
+++ xcircuit.spec	11 Aug 2007 22:56:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             xcircuit
 Version:          3.4.26
-Release:          20%{?dist}
+Release:          21%{?dist}
 Summary:          Electronic circuit schematic drawing program
 
 License:          GPL
@@ -11,7 +11,7 @@
 Source1:          %{name}.desktop
 # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64
 Source2:          %{name}.png
-
+Patch1:           %{name}-3.4-memset.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    tk-devel, desktop-file-utils, libtool, libXt-devel, m4
@@ -27,6 +27,8 @@
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+%patch1 -p0 -b .memset
+
 %build
 cd %{name}-%{version}
 %{__libtoolize} --force --copy
@@ -66,19 +68,19 @@
 
 %{__rm} -rf examples/win32
 
+# They stay
 #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
 
-chmod -x %{buildroot}/usr/lib*/%{name}-3.4/console.tcl
+chmod -x %{buildroot}%{_libdir}/%{name}-3.4/console.tcl
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 %{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 
-desktop-file-install --vendor ""               \
+desktop-file-install --vendor fedora           \
+    --add-category X-Fedora                    \
     --add-category Engineering                 \
     --dir %{buildroot}%{_datadir}/applications \
     %{SOURCE1}
@@ -106,14 +108,17 @@
 %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
-* Mon Feb 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 3.4.26-20
-- Rebuilt fo rawhide (minor 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