From f2cfce2fdfc7d2388e479f72eeb94e19d1a183fc Mon Sep 17 00:00:00 2001 From: Alain Portal Date: Feb 08 2007 13:25:10 +0000 Subject: New upstream version --- diff --git a/.cvsignore b/.cvsignore index 6cc8759..a24a241 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -kicad-sources-2006-08-28.zip -kicad-src-extras-2006-08-28.tar.bz2 +kicad-sources-2007-01-15.zip +kicad-src-extras-2007-01-15.tar.bz2 diff --git a/kicad-2007.01.15.destdir.diff b/kicad-2007.01.15.destdir.diff new file mode 100644 index 0000000..4d7603d --- /dev/null +++ b/kicad-2007.01.15.destdir.diff @@ -0,0 +1,116 @@ +diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk +--- kicad-dev/cvpcb/makefile.gtk 2006-05-09 08:42:12.000000000 +0200 ++++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 +@@ -31,9 +31,9 @@ + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET) + + +-install: +- cp -f $(TARGET) $(KICAD_BIN) +- ++install: ++ cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) ++ + clean: + rm *.o + rm $(TARGET) +diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk +--- kicad-dev/eeschema/makefile.gtk 2006-06-02 13:45:48.000000000 +0200 ++++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 +@@ -31,7 +31,7 @@ + + + install: +- cp $(TARGET) $(KICAD_BIN) ++ cp $(TARGET) $(DESTDIR)$(KICAD_BIN) + + + clean: +diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk +--- kicad-dev/gerbview/makefile.gtk 2006-06-02 13:45:54.000000000 +0200 ++++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 +@@ -21,10 +21,10 @@ + + + $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux +- $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) +- ++ $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) ++ + install: +- cp $(TARGET) $(KICAD_BIN) ++ cp $(TARGET) $(DESTDIR)$(KICAD_BIN) + + + clean: +diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk +--- kicad-dev/kicad/makefile.gtk 2006-10-16 13:34:02.000000000 +0200 ++++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 +@@ -26,7 +26,7 @@ + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + + install: +- cp -f $(TARGET) $(KICAD_BIN) ++ cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN) + + clean: + rm -f *.o; +diff -ru kicad-dev/libs.linux kicad-dev-fedora/libs.linux +--- kicad-dev/libs.linux 2006-11-14 16:01:20.000000000 +0100 ++++ kicad-dev-fedora/libs.linux 2007-02-07 17:03:43.000000000 +0100 +@@ -1,6 +1,6 @@ + + #Configuration for build kicad +-KICAD_BIN = /usr/local/kicad/linux ++KICAD_BIN = /usr/bin + + + SRCSUFF = .cpp +@@ -11,10 +11,10 @@ + # You must comment or uncomment this line for dynamic or static link + # dynamic link is less difficult than static link + # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. +-KICAD_STATIC_LINK = 1 ++# KICAD_STATIC_LINK = 1 + + # path and version definition for wxWidgets and mesa libs +-MESALIBSPATH = /usr/local/lib ++MESALIBSPATH = /usr/lib + WXPATH = `wx-config --prefix`/lib + PREFIX_WX_LIBS = lib`wx-config --basename` + SUFFIX_WX_LIBSTD = `wx-config --utility=` +@@ -69,11 +69,11 @@ + endif + + +-# attention � l'ordre des libairies +-LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ ++# attention �l'ordre des libairies ++LIBS = -L/usr/lib -L/usr/X11R6/lib\ + $(EXTRALIBS) $(WXSYSLIB)\ + $(LIBSTDC) + +-LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ ++LIBS_WITH_GL = -L/usr/lib -L/usr/X11R6/lib\ + $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ + $(LIBSTDC) +Seulement dans kicad-dev-fedora: libs.linux~ +diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk +--- kicad-dev/pcbnew/makefile.gtk 2006-06-02 13:45:50.000000000 +0200 ++++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 +@@ -23,11 +23,11 @@ + + $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\ +- -o $(TARGET) +- +- ++ -o $(TARGET) ++ ++ + install: +- cp $(TARGET) $(KICAD_BIN) ++ cp $(TARGET) $(DESTDIR)$(KICAD_BIN) + + + clean: diff --git a/kicad-2007.01.15.rpm.opt.flags.diff b/kicad-2007.01.15.rpm.opt.flags.diff new file mode 100644 index 0000000..493eac8 --- /dev/null +++ b/kicad-2007.01.15.rpm.opt.flags.diff @@ -0,0 +1,103 @@ +diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk +--- kicad-dev/3d-viewer/makefile.gtk 2006-06-02 13:45:52.000000000 +0200 ++++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-02-08 13:53:45.000000000 +0100 +@@ -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 +diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk +--- kicad-dev/common/makefile.gtk 2006-06-02 13:45:44.000000000 +0200 ++++ kicad-dev-fedora/common/makefile.gtk 2007-02-08 13:54:14.000000000 +0100 +@@ -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) + +diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk +--- kicad-dev/cvpcb/makefile.gtk 2007-02-07 16:39:09.000000000 +0100 ++++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-02-08 13:54:41.000000000 +0100 +@@ -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) + +diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk +--- kicad-dev/eeschema/makefile.gtk 2007-02-07 16:39:35.000000000 +0100 ++++ kicad-dev-fedora/eeschema/makefile.gtk 2007-02-08 13:55:06.000000000 +0100 +@@ -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) +diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk +--- kicad-dev/gerbview/makefile.gtk 2007-02-07 16:39:47.000000000 +0100 ++++ kicad-dev-fedora/gerbview/makefile.gtk 2007-02-08 13:55:23.000000000 +0100 +@@ -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 + +diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk +--- kicad-dev/kicad/makefile.gtk 2007-02-07 16:40:08.000000000 +0100 ++++ kicad-dev-fedora/kicad/makefile.gtk 2007-02-08 13:55:39.000000000 +0100 +@@ -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 + +diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk +--- kicad-dev/pcbnew/makefile.gtk 2007-02-07 16:40:27.000000000 +0100 ++++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-02-08 13:56:01.000000000 +0100 +@@ -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 + diff --git a/kicad.spec b/kicad.spec index 5a2fdb9..d79a560 100644 --- a/kicad.spec +++ b/kicad.spec @@ -1,14 +1,14 @@ Name: kicad -Version: 2006.08.28 -Release: 3%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de schéma électronique et tracé de circuit imprimé Group: Applications/Engineering License: GPL Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2006-08-28.zip -Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-08-28.tar.bz2 +Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2007-01-15.zip +Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-01-15.tar.bz2 Source2: %{name}.desktop Patch: %{name}-%{version}.destdir.diff Patch1: %{name}-%{version}.rpm.opt.flags.diff @@ -39,8 +39,8 @@ Kicad est un ensemble de quatres logiciels et un gestionnaire de projet : %prep %setup -q -n kicad-dev -a 1 -%{__cp} -a kicad-src-extras-2006-08-28/* . -%{__rm} -rf kicad-src-extras-2006-08-28 +%{__cp} -a kicad-src-extras-2007-01-15/* . +%{__rm} -rf kicad-src-extras-2007-01-15 # Convert MSDOS EOL to Unix EOL before applying patches @@ -59,18 +59,18 @@ done %build # These files are not scripts -for f in {copyright,gpl,licendoc,README,version}.txt +for f in {copyright,gpl,licendoc,version}.txt do %{__chmod} -x $f done # Convert MSDOS EOL to Unix EOL -for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc,README}.txt +for f in {author,contrib,copyright,doc_conv_orcad*,gpl,licendoc}.txt do %{__sed} -i -e 's/\r$//' $f done -for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb.pdf,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} +for f in help/fr/{contents.hhc,kicad.hhp,cvpcb/cvpcb-fr.html,eeschema/eeschema.html,eeschema/eeschema.pdf,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad.html,pcbnew/pcbnew.html} do %{__sed} -i -e 's/\r$//' $f done @@ -85,7 +85,7 @@ do %{__sed} -i -e 's/\r$//' $f done -for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html} +for f in help/pt/{contents.hhc,kicad.hhp,cvpcb/cvpcb-pt.html,eeschema/eeschema-pt.html,eeschema/eeschema_pt_BR.html,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,kicad/kicad-pt.html,pcbnew/pcbnew.html,pcbnew/pcbnew_pt_BR.html} do %{__sed} -i -e 's/\r$//' $f done @@ -234,8 +234,7 @@ fi %files -f %{name}.lang %defattr(-,root,root) %doc author.txt contrib.txt copyright.txt doc_conv_orcad_to_kicad_spanish.txt -%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt lisezmoi.txt news.txt -%doc README.txt version.txt +%doc doc_conv_orcad_to_kicad.txt gpl.txt licendoc.txt news.txt version.txt %{_bindir}/* %{_libdir}/%{name}/ %{_libdir}/%{name}/plugins/ @@ -245,6 +244,9 @@ fi %{_datadir}/pixmaps/kicad_icon.png %changelog +* Thu Feb 8 2007 Alain Portal 2007.01.15-1 + - New upstream version + * Thu Feb 8 2007 Alain Portal 2006.08.28-3 - Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS Contribution of Ville Skyttä diff --git a/sources b/sources index c6cecc7..a671944 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip -d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2 +61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip +3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2