rpms/kicad/FC-6 kicad-2006.08.28.rpm.opt.flags.diff, NONE, 1.1 kicad.spec, 1.4, 1.5

[Alain Portal (dionysos)]

Author: dionysos

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

Modified Files:
	kicad.spec 
Added Files:
	kicad-2006.08.28.rpm.opt.flags.diff 
Log Message:
  - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS
    Contribution of Ville Skyttä <ville[DOT]skytta[AT]iki[DOT]fi>
    Fix #227757
  - Fix typo in french summary


kicad-2006.08.28.rpm.opt.flags.diff:

--- NEW FILE kicad-2006.08.28.rpm.opt.flags.diff ---
--- kicad-dev/eeschema/makefile.gtk~	2007-02-07 23:33:48.000000000 +0200
+++ kicad-dev/eeschema/makefile.gtk	2007-02-08 00:13:19.000000000 +0200
@@ -6,14 +6,14 @@
 FINAL = 1
 
 
-LDFLAGS =  -s
+LDFLAGS =
 
 include ../libs.linux
 
 TARGET = eeschema
 
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS)
 
 
 all: $(TARGET)
--- kicad-dev/common/makefile.gtk~	2006-06-02 13:45:44.000000000 +0300
+++ kicad-dev/common/makefile.gtk	2007-02-08 00:13:05.000000000 +0200
@@ -2,7 +2,7 @@
 CC = gcc
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 -I./ -I../include `wx-config --cflags`
+CPPFLAGS =  -Wall -O2 -I./ -I../include `wx-config --cflags` $(RPM_OPT_FLAGS)
 
 EDACPPFLAGS = $(CPPFLAGS)
 
--- kicad-dev/pcbnew/makefile.gtk~	2007-02-07 23:33:48.000000000 +0200
+++ kicad-dev/pcbnew/makefile.gtk	2007-02-08 00:13:00.000000000 +0200
@@ -4,9 +4,9 @@
 
 # Compiler flags.
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS)
 
-LDFLAGS = -s
+LDFLAGS =
 
 include ../libs.linux
 
--- kicad-dev/cvpcb/makefile.gtk~	2007-02-07 23:33:48.000000000 +0200
+++ kicad-dev/cvpcb/makefile.gtk	2007-02-08 00:12:50.000000000 +0200
@@ -8,9 +8,9 @@
 
 # Compiler flags.
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS)
 
-LDFLAGS =  -s
+LDFLAGS =
 
 EDACPPFLAGS = $(CPPFLAGS)
 
--- kicad-dev/kicad/makefile.gtk~	2007-02-07 23:33:48.000000000 +0200
+++ kicad-dev/kicad/makefile.gtk	2007-02-08 00:12:43.000000000 +0200
@@ -7,8 +7,8 @@
 FINAL = 1
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
-LDFLAGS =  -s
+CPPFLAGS =  -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS)
+LDFLAGS =
 
 include ../libs.linux
 
--- kicad-dev/gerbview/makefile.gtk~	2007-02-07 23:33:48.000000000 +0200
+++ kicad-dev/gerbview/makefile.gtk	2007-02-08 00:12:35.000000000 +0200
@@ -3,9 +3,9 @@
 LD = gcc
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS =  -Wall -O2 `wx-config --cxxflags` $(RPM_OPT_FLAGS)
 
-LDFLAGS = -s
+LDFLAGS =
 
 include ../libs.linux
 
--- kicad-dev/3d-viewer/makefile.gtk~	2006-06-02 13:45:52.000000000 +0300
+++ kicad-dev/3d-viewer/makefile.gtk	2007-02-08 00:12:26.000000000 +0200
@@ -4,7 +4,7 @@
 # Compiler flags.
 
 CPPFLAGS =  -Wall -O2 -DPCBNEW  -I../pcbnew -I ../include -I../common\
-	  `wx-config --cxxflags`
+	  `wx-config --cxxflags` $(RPM_OPT_FLAGS)
 
 
 include ../libs.linux


Index: kicad.spec
===================================================================
RCS file: /cvs/extras/rpms/kicad/FC-6/kicad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kicad.spec	4 Oct 2006 22:28:36 -0000	1.4
+++ kicad.spec	8 Feb 2007 12:18:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		kicad
 Version:	2006.08.28
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary: 	Electronic schematic diagrams and printed circuit board artwork
 Summary(fr): 	Saisie de schéma électronique et tracé de cicrcuit imprimé
 
@@ -11,6 +11,7 @@
 Source1:	http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2
 Source2:	%{name}.desktop
 Patch:		%{name}-%{version}.destdir.diff
+Patch1:		%{name}-%{version}.rpm.opt.flags.diff
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	wxGTK
@@ -53,6 +54,7 @@
 done
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -243,6 +245,12 @@
 %{_datadir}/pixmaps/kicad_icon.png
 
 %changelog
+* Thu Feb  8 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.08.28-3
+  - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS
+    Contribution of Ville Skyttä <ville[DOT]skytta[AT]iki[DOT]fi>
+    Fix #227757
+  - Fix typo in french summary
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.08.28-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21