rpms/kicad/devel kicad-2007.07.09.destdir.locale.rpmoptflags.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 kicad.desktop, 1.2, 1.3 kicad.spec, 1.10, 1.11 sources, 1.4, 1.5 kicad-2006.08.28.destdir.diff, 1.1, NONE kicad-2006.08.28.rpm.opt.flags.diff, 1.1, NONE kicad-2007.01.15.destdir.diff, 1.1, NONE kicad-2007.01.15.rpm.opt.flags.diff, 1.1, NONE
Alain Portal (dionysos)
fedora-extras-commits at redhat.com
Thu Oct 4 13:22:38 UTC 2007
- Previous message (by thread): rpms/gtk2/devel scale-button-grab.patch, NONE, 1.1 gtk2.spec, 1.259, 1.260
- Next message (by thread): rpms/kicad/F-7 kicad-2007.07.09.destdir.locale.rpmoptflags.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 kicad.desktop, 1.2, 1.3 kicad.spec, 1.8, 1.9 sources, 1.4, 1.5 kicad-2006.08.28.destdir.diff, 1.1, NONE kicad-2006.08.28.rpm.opt.flags.diff, 1.1, NONE kicad-2007.01.15.destdir.diff, 1.1, NONE kicad-2007.01.15.rpm.opt.flags.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dionysos
Update of /cvs/extras/rpms/kicad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969
Modified Files:
.cvsignore kicad.desktop kicad.spec sources
Added Files:
kicad-2007.07.09.destdir.locale.rpmoptflags.diff
Removed Files:
kicad-2006.08.28.destdir.diff
kicad-2006.08.28.rpm.opt.flags.diff
kicad-2007.01.15.destdir.diff
kicad-2007.01.15.rpm.opt.flags.diff
Log Message:
- New upstream version
- Merge previous patches
- Remove X-Fedora, Electronics and Engineering categories
- Update desktop file
kicad-2007.07.09.destdir.locale.rpmoptflags.diff:
--- NEW FILE kicad-2007.07.09.destdir.locale.rpmoptflags.diff ---
diff -ru kicad-dev/3d-viewer/makefile.gtk kicad-dev-fedora/3d-viewer/makefile.gtk
--- kicad-dev/3d-viewer/makefile.gtk 2007-07-02 15:53:40.000000000 +0200
+++ kicad-dev-fedora/3d-viewer/makefile.gtk 2007-08-27 17:04:26.000000000 +0200
@@ -3,7 +3,7 @@
include ../libs.linux
# Compiler flags.
-CPPFLAGS += -DPCBNEW -I../pcbnew -I ../include -I../common
+CPPFLAGS += -DPCBNEW -I../pcbnew -I ../include -I../common $(RPM_OPT_FLAGS)
TARGET = 3d-viewer
diff -ru kicad-dev/common/makefile.gtk kicad-dev-fedora/common/makefile.gtk
--- kicad-dev/common/makefile.gtk 2007-07-02 15:53:32.000000000 +0200
+++ kicad-dev-fedora/common/makefile.gtk 2007-08-27 17:04:46.000000000 +0200
@@ -5,7 +5,7 @@
include ../libs.linux
# Compiler flags.
-CPPFLAGS += -I./ -I../include
+CPPFLAGS += -I./ -I../include $(RPM_OPT_FLAGS)
EDACPPFLAGS = $(CPPFLAGS)
diff -ru kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk
--- kicad-dev/cvpcb/makefile.gtk 2007-07-02 15:53:42.000000000 +0200
+++ kicad-dev-fedora/cvpcb/makefile.gtk 2007-08-27 17:03:57.000000000 +0200
@@ -6,7 +6,7 @@
include ../libs.linux
# Compiler flags.
-CPPFLAGS +=
+CPPFLAGS += $(RPM_OPT_FLAGS)
EDACPPFLAGS = $(CPPFLAGS)
@@ -25,7 +25,7 @@
install: $(TARGET)
- cp -f $(TARGET) $(KICAD_BIN)
+ cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
rm -f *.o
diff -ru kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk
--- kicad-dev/eeschema/makefile.gtk 2007-07-02 15:53:36.000000000 +0200
+++ kicad-dev-fedora/eeschema/makefile.gtk 2007-08-27 17:05:31.000000000 +0200
@@ -5,7 +5,7 @@
# Additional compiler flags
-CPPFLAGS +=
+CPPFLAGS += $(RPM_OPT_FLAGS)
TARGET = eeschema
@@ -26,7 +26,7 @@
install: $(TARGET)
- cp $(TARGET) $(KICAD_BIN)
+ cp $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
diff -ru kicad-dev/eeschema/plugins/makefile.gtk kicad-dev-fedora/eeschema/plugins/makefile.gtk
--- kicad-dev/eeschema/plugins/makefile.gtk 2007-07-02 15:53:34.000000000 +0200
+++ kicad-dev-fedora/eeschema/plugins/makefile.gtk 2007-08-27 17:07:26.000000000 +0200
@@ -19,10 +19,10 @@
gcc -D__UNIX__ -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)
$(KICAD_PLUGINS):
- mkdir -p $(KICAD_PLUGINS)
+ mkdir -p $(DESTDIR)$(KICAD_PLUGINS)
install: $(KICAD_PLUGINS)
- cp netlist_form_pads-pcb $(KICAD_PLUGINS)
+ cp netlist_form_pads-pcb $(DESTDIR)$(KICAD_PLUGINS)
clean :
rm -f netlist_form_pads-pcb
diff -ru kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk
--- kicad-dev/gerbview/makefile.gtk 2007-07-02 15:53:42.000000000 +0200
+++ kicad-dev-fedora/gerbview/makefile.gtk 2007-08-27 17:08:05.000000000 +0200
@@ -4,7 +4,7 @@
include ../libs.linux
# Additional compiler flags.
-CPPFLAGS +=
+CPPFLAGS += $(RPM_OPT_FLAGS)
TARGET = gerbview
@@ -21,7 +21,7 @@
$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
install: $(TARGET)
- cp $(TARGET) $(KICAD_BIN)
+ cp $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
Seulement dans kicad-dev-fedora/internat: Makefile
diff -ru kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk
--- kicad-dev/kicad/makefile.gtk 2007-07-02 15:53:40.000000000 +0200
+++ kicad-dev-fedora/kicad/makefile.gtk 2007-08-27 17:08:38.000000000 +0200
@@ -4,7 +4,7 @@
include ../libs.linux
# Additional compiler flags
-CPPFLAGS +=
+CPPFLAGS += $(RPM_OPT_FLAGS)
FINAL = 1
@@ -22,7 +22,7 @@
$(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET)
install:$(TARGET)
- 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 2007-07-02 16:46:14.000000000 +0200
+++ kicad-dev-fedora/libs.linux 2007-10-04 13:50:37.000000000 +0200
@@ -12,15 +12,15 @@
STD_INSTALL = 1
-ifeq ($(STD_INSTALL), 1)
+ifeq ($(STD_INSTALL), 1)
PREFIX = /usr
-KICAD_BIN = $(PREFIX)/linux
-KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins
-KICAD_DOCS=$(PREFIX)/share/doc/kicad
+KICAD_BIN = $(PREFIX)/bin
+KICAD_PLUGINS = %{_libdir}/kicad/plugins
+KICAD_DOCS=$(DESTDIR)$(PREFIX)/share/doc/kicad
KICAD_DATA=$(PREFIX)/share/kicad
KICAD_MODULES=$(KICAD_DATA)/modules
KICAD_LIBRARY=$(KICAD_DATA)/library
-KICAD_INTERNAT=$(KICAD_DATA)/internat
+KICAD_INTERNAT=$(KICAD_DATA)/locale
KICAD_TEMPLATE=$(KICAD_DATA)/template
else
@@ -56,7 +56,7 @@
LDFLAGS = -g #-v
else
CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -fno-strict-aliasing
-LDFLAGS = -s #-v
+LDFLAGS = #-v
endif
@@ -66,17 +66,17 @@
# You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
# dynamic link is less difficult than static link and is what you would normally want
# to use if kicad is running only on your system or one with same level of libraries.
-ifndef KICAD_PYTHON
-ifeq ($(STD_INSTALL), 0)
-KICAD_STATIC_LINK = 1
-endif
-endif
+ifndef KICAD_PYTHON
+ifeq ($(STD_INSTALL), 0)
+KICAD_STATIC_LINK = 1
+endif
+endif
ifeq ($(KICAD_STATIC_LINK), 1)
LD = gcc
else
LD = g++
-endif
+endif
ifdef KICAD_PYTHON
PYTHON_VERSION=2.5
@@ -88,7 +88,7 @@
endif
# 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=`
@@ -153,11 +153,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) $(PYLIBS)
-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) $(PYLIBS)
Seulement dans kicad-dev-fedora: libs.linux~
diff -ru kicad-dev/makefile.gtk kicad-dev-fedora/makefile.gtk
--- kicad-dev/makefile.gtk 2007-07-02 15:53:30.000000000 +0200
+++ kicad-dev-fedora/makefile.gtk 2007-10-03 13:25:43.000000000 +0200
@@ -2,7 +2,7 @@
MAKEGTK = $(MAKE) -f makefile.gtk
KICAD_SUBDIRS = common 3d-viewer eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
-KICAD_SUBDIRS_RES = internat modules template library
+KICAD_SUBDIRS_RES = locale modules template library
KICAD_SUBDIRS_HELP = help
all:
diff -ru kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk
--- kicad-dev/pcbnew/makefile.gtk 2007-07-02 15:53:38.000000000 +0200
+++ kicad-dev-fedora/pcbnew/makefile.gtk 2007-08-27 17:09:56.000000000 +0200
@@ -4,7 +4,7 @@
include ../libs.linux
# Additional compiler flags
-CPPFLAGS +=
+CPPFLAGS += $(RPM_OPT_FLAGS)
TARGET = pcbnew
@@ -23,7 +23,7 @@
install: $(TARGET)
- cp $(TARGET) $(KICAD_BIN)
+ cp $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
diff -ru kicad-dev/template/makefile kicad-dev-fedora/template/makefile
--- kicad-dev/template/makefile 2007-06-18 17:39:22.000000000 +0200
+++ kicad-dev-fedora/template/makefile 2007-08-27 19:40:32.000000000 +0200
@@ -6,9 +6,9 @@
install: $(TARGETS)
$(KICAD_TEMPLATE):
- mkdir -p $(KICAD_TEMPLATE)
+ mkdir -p $(DESTDIR)$(KICAD_TEMPLATE)
$(TARGETS): $(KICAD_TEMPLATE)
- cp -R $@ $(KICAD_TEMPLATE)
+ cp -R $@ $(DESTDIR)$(KICAD_TEMPLATE)
.PHONY: $(TARGETS)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Feb 2007 13:21:04 -0000 1.4
+++ .cvsignore 4 Oct 2007 13:22:05 -0000 1.5
@@ -1,2 +1,2 @@
-kicad-sources-2007-01-15.zip
-kicad-src-extras-2007-01-15.tar.bz2
+kicad-sources--2007-07-09.zip
+kicad-src-extras-2007-07-09.tar.bz2
Index: kicad.desktop
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/kicad.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kicad.desktop 14 Feb 2007 10:11:06 -0000 1.2
+++ kicad.desktop 4 Oct 2007 13:22:05 -0000 1.3
@@ -1,20 +1,11 @@
[Desktop Entry]
-Categories=Qt;KDE;Education;Science;Engineering;X-Fedora;
-Comment=An open source software for the creation of electronic schematic diagrams and printed circuit board artwork
-Comment[fr]=Une suite logicielle intégrée pour la saisie de schémas et le routage de circuits imprimés
Encoding=UTF-8
-Exec=kicad
-GenericName=
-GenericName[fr]=
-Icon=kicad_icon.png
-MimeType=
Name=KiCad
Name[fr]=KiCad
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
+Comment=A software for the creation of electronic schematic diagrams and printed circuit board artwork
+Comment[fr]=Une suite logicielle intégrée pour la saisie de schémas et le routage de circuits imprimés
+Exec=kicad
+Icon=kicad_icon.png
Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+Terminal=false
+Categories=Application;Education;Electronics;Engineering;Science;
Index: kicad.spec
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/kicad.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kicad.spec 27 Aug 2007 14:07:14 -0000 1.10
+++ kicad.spec 4 Oct 2007 13:22:05 -0000 1.11
@@ -1,17 +1,16 @@
Name: kicad
-Version: 2007.01.15
-Release: 4%{?dist}
+Version: 2007.07.09
+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: GPLv2+
Url: http://www.lis.inpg.fr/realise_au_lis/kicad/
-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
+Source: ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources--2007-07-09.zip
+Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2007-07-09.tar.bz2
Source2: %{name}.desktop
-Patch: %{name}-%{version}.destdir.diff
-Patch1: %{name}-%{version}.rpm.opt.flags.diff
+Patch: %{name}-%{version}.destdir.locale.rpmoptflags.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: wxGTK
@@ -39,8 +38,8 @@
%prep
%setup -q -n kicad-dev -a 1
-%{__cp} -a kicad-src-extras-2007-01-15/* .
-%{__rm} -rf kicad-src-extras-2007-01-15
+%{__cp} -a kicad-src-extras-2007-07-09/* .
+%{__rm} -rf kicad-src-extras-2007-07-09
# Convert MSDOS EOL to Unix EOL before applying patches
@@ -54,7 +53,6 @@
done
%patch0 -p1
-%patch1 -p1
%build
@@ -199,11 +197,10 @@
# install desktop
mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor=fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category "Engineering" \
--add-category "Electronics" \
- --add-category "X-Fedora" \
%{SOURCE2}
# install icon
@@ -236,14 +233,19 @@
%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 news.txt version.txt
%{_bindir}/*
-%{_libdir}/%{name}/
%{_libdir}/%{name}/plugins/
%{_datadir}/%{name}/
%{_docdir}/%{name}/
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/kicad_icon.png
%changelog
+* Thu Oct 04 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.07.09-1
+ - New upstream version
+ - Merge previous patches
+ - Remove X-Fedora, Electronics and Engineering categories
+ - Update desktop file
+
* Mon Aug 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2007.01.15-4
- License tag clarification
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kicad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Feb 2007 13:21:04 -0000 1.4
+++ sources 4 Oct 2007 13:22:05 -0000 1.5
@@ -1,2 +1,2 @@
-61a0ba615b67af313d1214ed1a3d5a66 kicad-sources-2007-01-15.zip
-3263536df405f0d282a61d894feb6f05 kicad-src-extras-2007-01-15.tar.bz2
+bf9aaf5a85851fe5250d6c53f4b4c6be kicad-sources--2007-07-09.zip
+02389cd2983c834c8a4a5a1420513be8 kicad-src-extras-2007-07-09.tar.bz2
--- kicad-2006.08.28.destdir.diff DELETED ---
--- kicad-2006.08.28.rpm.opt.flags.diff DELETED ---
--- kicad-2007.01.15.destdir.diff DELETED ---
--- kicad-2007.01.15.rpm.opt.flags.diff DELETED ---
- Previous message (by thread): rpms/gtk2/devel scale-button-grab.patch, NONE, 1.1 gtk2.spec, 1.259, 1.260
- Next message (by thread): rpms/kicad/F-7 kicad-2007.07.09.destdir.locale.rpmoptflags.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 kicad.desktop, 1.2, 1.3 kicad.spec, 1.8, 1.9 sources, 1.4, 1.5 kicad-2006.08.28.destdir.diff, 1.1, NONE kicad-2006.08.28.rpm.opt.flags.diff, 1.1, NONE kicad-2007.01.15.destdir.diff, 1.1, NONE kicad-2007.01.15.rpm.opt.flags.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list