rpms/kicad/FC-5 kicad-2006.08.28.destdir.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kicad.spec, 1.1, 1.2 sources, 1.2, 1.3 kicad-2006.06.26.destdir.diff, 1.1, NONE
Alain Portal (dionysos)
fedora-extras-commits at redhat.com
Fri Sep 22 14:00:19 UTC 2006
- Previous message: rpms/kicad/FC-4 kicad-2006.08.28.destdir.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kicad.spec, 1.1, 1.2 sources, 1.2, 1.3 kicad-2006.06.26.destdir.diff, 1.1, NONE
- Next message: kadischi/linuxrc livecd-linuxrc,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dionysos
Update of /cvs/extras/rpms/kicad/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14529
Modified Files:
.cvsignore kicad.spec sources
Added Files:
kicad-2006.08.28.destdir.diff
Removed Files:
kicad-2006.06.26.destdir.diff
Log Message:
New upstream version
kicad-2006.08.28.destdir.diff:
--- NEW FILE kicad-2006.08.28.destdir.diff ---
diff -ur kicad-dev/cvpcb/makefile.gtk kicad-dev-fedora/cvpcb/makefile.gtk
--- kicad-dev/cvpcb/makefile.gtk 2006-03-20 13:31:36.000000000 +0100
+++ kicad-dev-fedora/cvpcb/makefile.gtk 2006-05-22 09:43:55.000000000 +0200
@@ -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:
-erase *.o
diff -ur kicad-dev/eeschema/makefile.gtk kicad-dev-fedora/eeschema/makefile.gtk
--- kicad-dev/eeschema/makefile.gtk 2005-09-09 12:22:04.000000000 +0200
+++ kicad-dev-fedora/eeschema/makefile.gtk 2006-05-22 09:44:19.000000000 +0200
@@ -31,7 +31,7 @@
install:
- cp $(TARGET) $(KICAD_BIN)
+ cp $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
diff -ur kicad-dev/eeschema/plugins/makefile.gtk kicad-dev-fedora/eeschema/plugins/makefile.gtk
--- kicad-dev/eeschema/plugins/makefile.gtk 2005-09-09 12:31:20.000000000 +0200
+++ kicad-dev-fedora/eeschema/plugins/makefile.gtk 2006-05-22 09:46:58.000000000 +0200
@@ -19,7 +19,7 @@
gcc -D__UNIX__ -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)
install:
- cp -v netlist_form_pads-pcb $(KICAD_BIN)/plugins/
+ cp -v netlist_form_pads-pcb $(DESTDIR)/usr/lib/kicad/plugins/
clean :
rm -f netlist_form_pads-pcb
diff -ur kicad-dev/gerbview/makefile.gtk kicad-dev-fedora/gerbview/makefile.gtk
--- kicad-dev/gerbview/makefile.gtk 2005-12-05 09:48:00.000000000 +0100
+++ kicad-dev-fedora/gerbview/makefile.gtk 2006-05-22 09:45:13.000000000 +0200
@@ -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 -ur kicad-dev/kicad/makefile.gtk kicad-dev-fedora/kicad/makefile.gtk
--- kicad-dev/kicad/makefile.gtk 2005-07-29 13:13:38.000000000 +0200
+++ kicad-dev-fedora/kicad/makefile.gtk 2006-05-22 09:45:50.000000000 +0200
@@ -24,9 +24,9 @@
$(TARGET): $(OBJECTS) makefile.gtk $(EXTRALIBS) ../libs.linux
$(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET)
-
-install:
- cp -f $(TARGET) $(KICAD_BIN)
+
+install:
+ cp -f $(TARGET) $(DESTDIR)$(KICAD_BIN)
clean:
rm -f *.o; rm -f *~; rm core; rm *.bak
diff -ur kicad-dev/libs.linux kicad-dev-fedora/libs.linux
--- kicad-dev/libs.linux 2006-04-04 12:54:20.000000000 +0200
+++ kicad-dev-fedora/libs.linux 2006-05-22 09:43:09.000000000 +0200
@@ -1,6 +1,6 @@
#Configuration for build kicad
-KICAD_BIN = /usr/local/kicad/linux
+KICAD_BIN = /usr/bin
SRCSUFF = .cpp
@@ -14,7 +14,7 @@
# 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)
diff -ur kicad-dev/pcbnew/makefile.gtk kicad-dev-fedora/pcbnew/makefile.gtk
--- kicad-dev/pcbnew/makefile.gtk 2006-03-20 13:31:34.000000000 +0100
+++ kicad-dev-fedora/pcbnew/makefile.gtk 2006-05-22 09:43:35.000000000 +0200
@@ -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:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kicad/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Jul 2006 15:18:15 -0000 1.2
+++ .cvsignore 22 Sep 2006 14:00:19 -0000 1.3
@@ -1,2 +1,2 @@
-kicad-sources-2006-06-26.zip
-kicad-src-extras-2006-06-26.tar.bz2
+kicad-sources-2006-08-28.zip
+kicad-src-extras-2006-08-28.tar.bz2
Index: kicad.spec
===================================================================
RCS file: /cvs/extras/rpms/kicad/FC-5/kicad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kicad.spec 11 Jul 2006 15:18:15 -0000 1.1
+++ kicad.spec 22 Sep 2006 14:00:19 -0000 1.2
@@ -1,14 +1,14 @@
Name: kicad
-Version: 2006.06.26
-Release: 5%{?dist}
+Version: 2006.08.28
+Release: 1%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et tracé de cicrcuit 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-06-26.zip
-Source1: http://linuxelectronique.free.fr/download/kicad-src-extras-2006-06-26.tar.bz2
+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
Source2: %{name}.desktop
Patch: %{name}-%{version}.destdir.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,8 +38,8 @@
%prep
%setup -q -n kicad-dev -a 1
-%{__cp} -a kicad-src-extras/* .
-%{__rm} -rf kicad-src-extras
+%{__cp} -a kicad-src-extras-2006-08-28/* .
+%{__rm} -rf kicad-src-extras-2006-08-28
# Convert MSDOS EOL to Unix EOL before applying patches
@@ -57,13 +57,13 @@
%build
# These files are not scripts
-for f in {copyright,gpl,licendoc,readme,version}.txt
+for f in {copyright,gpl,licendoc,README,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,README}.txt
do
%{__sed} -i -e 's/\r$//' $f
done
@@ -83,7 +83,7 @@
%{__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.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,file_formats/file_formats.html,gerbview/gerbview.html,kicad/kicad_pt_BR.html,pcbnew/pcbnew.html}
do
%{__sed} -i -e 's/\r$//' $f
done
@@ -96,112 +96,117 @@
make -f makefile.gtk %{?_smp_mflags}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
-install -d $RPM_BUILD_ROOT%{_datadir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d %{buildroot}%{_datadir}
+install -d %{buildroot}%{_datadir}/%{name}
# install demos files
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/demos
+install -d %{buildroot}%{_datadir}/%{name}/demos
for dir in electric interf_u microwave pic_programmer pspice sonde_xilinx test_xil_95108 video
do
- install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/demos/${dir}
+ install -d %{buildroot}%{_datadir}/%{name}/demos/${dir}
for f in demos/${dir}/*
do
- install -m 644 ${f} $RPM_BUILD_ROOT%{_datadir}/%{name}/${f}
+ install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
done
done
# install help files
-install -d $RPM_BUILD_ROOT%%{_docdir}
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/
+install -d %{buildroot}%%{_docdir}
+install -d %{buildroot}%{_docdir}/%{name}/
for dir in en es fr pt
do
- install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}
+ install -d %{buildroot}%{_docdir}/%{name}/${dir}
for subdir in cvpcb eeschema file_formats gerbview kicad pcbnew
do
- install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/${subdir}
+ install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
cd help
- install -m 644 ${dir}/kicad.hhp $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/kicad.hhp
- install -m 644 ${dir}/contents.hhc $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/contents.hhc
+ install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
+ install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
for f in ${dir}/${subdir}/*
do
- install -m 644 ${f} $RPM_BUILD_ROOT%{_docdir}/%{name}/${f}
+ install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
done
cd ..
done
done
# install ru help files
-install -d $RPM_BUILD_ROOT%%{_docdir}
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/
+install -d %{buildroot}%%{_docdir}
+install -d %{buildroot}%{_docdir}/%{name}/
for dir in ru
do
- install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}
+ install -d %{buildroot}%{_docdir}/%{name}/${dir}
for subdir in eeschema pcbnew
do
- install -d $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/${subdir}
+ install -d %{buildroot}%{_docdir}/%{name}/${dir}/${subdir}
cd help
- install -m 644 ${dir}/kicad.hhp $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/kicad.hhp
- install -m 644 ${dir}/contents.hhc $RPM_BUILD_ROOT%{_docdir}/%{name}/${dir}/contents.hhc
+ install -m 644 ${dir}/kicad.hhp %{buildroot}%{_docdir}/%{name}/${dir}/kicad.hhp
+ install -m 644 ${dir}/contents.hhc %{buildroot}%{_docdir}/%{name}/${dir}/contents.hhc
for f in ${dir}/${subdir}/*
do
- install -m 644 ${f} $RPM_BUILD_ROOT%{_docdir}/%{name}/${f}
+ install -m 644 ${f} %{buildroot}%{_docdir}/%{name}/${f}
done
cd ..
done
done
# install librairies
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/library
+install -d %{buildroot}%{_datadir}/%{name}/library
for f in library/*
do
- install -m 644 ${f} $RPM_BUILD_ROOT%{_datadir}/%{name}/${f}
+ install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
done
# install localization
-install -d $RPM_BUILD_ROOT%{_datadir}/locale
+install -d %{buildroot}%{_datadir}/locale
cd locale
-for dir in es fr hu it ko pl pt sl
+for dir in de es fr hu it ko pl pt sl
do
- install -d $RPM_BUILD_ROOT%{_datadir}/locale/${dir}
- install -m 644 ${dir}/%{name}.mo $RPM_BUILD_ROOT%{_datadir}/locale/${dir}/%{name}.mo
+ install -d %{buildroot}%{_datadir}/locale/${dir}
+ install -m 644 ${dir}/%{name}.mo %{buildroot}%{_datadir}/locale/${dir}/%{name}.mo
done
cd ..
# install modules
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/packages3d
+install -d %{buildroot}%{_datadir}/%{name}/modules
+install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d
for dir in conn_DBxx connectors conn_europe device dil discret divers pga pin_array smd support
do
- install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/packages3d/${dir}
+ install -d %{buildroot}%{_datadir}/%{name}/modules/packages3d/${dir}
for f in modules/packages3d/${dir}/*
do
- install -m 644 ${f} $RPM_BUILD_ROOT%{_datadir}/%{name}/${f}
+ install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
done
done
+for f in modules/*.*
+do
+ install -m 644 ${f} %{buildroot}%{_datadir}/%{name}/${f}
+done
+
# install template
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/template
-install -m 644 template/%{name}.pro $RPM_BUILD_ROOT%{_datadir}/%{name}/template
+install -d %{buildroot}%{_datadir}/%{name}/template
+install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
# install binaries
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-make -f makefile.gtk install DESTDIR=$RPM_BUILD_ROOT
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_libdir}/%{name}/plugins
+make -f makefile.gtk install DESTDIR=%{buildroot}
# install desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category "Engineering" \
--add-category "Electronics" \
--add-category "X-Fedora" \
%{SOURCE2}
# install icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 644 kicad_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kicad_icon.png
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 644 kicad_icon.png %{buildroot}%{_datadir}/pixmaps/kicad_icon.png
%find_lang %{name}
@@ -222,13 +227,13 @@
fi
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%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 README.txt version.txt
%{_bindir}/*
%{_libdir}/%{name}/
%{_libdir}/%{name}/plugins/
@@ -238,6 +243,14 @@
%{_datadir}/pixmaps/kicad_icon.png
%changelog
+* Fri Sep 22 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.08.28-1
+ - New upstream version
+ - Use macro style instead of variable style
+ - Install missing modules. Fix #206602
+
+* Fri Sep 1 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.06.26-6
+ - FE6 rebuild
+
* Mon Jul 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 2006.06.26-5
- Removing backup files is no more needed.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kicad/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jul 2006 15:18:15 -0000 1.2
+++ sources 22 Sep 2006 14:00:19 -0000 1.3
@@ -1,2 +1,2 @@
-336d04c10d18ea8da60f53d6e5f2d746 kicad-sources-2006-06-26.zip
-442e4b467e14a6bcd137e64d310d12e6 kicad-src-extras-2006-06-26.tar.bz2
+0695942d01c3d22f474728ba9081e559 kicad-sources-2006-08-28.zip
+d85926d89becfcc344e299c81e91d293 kicad-src-extras-2006-08-28.tar.bz2
--- kicad-2006.06.26.destdir.diff DELETED ---
- Previous message: rpms/kicad/FC-4 kicad-2006.08.28.destdir.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kicad.spec, 1.1, 1.2 sources, 1.2, 1.3 kicad-2006.06.26.destdir.diff, 1.1, NONE
- Next message: kadischi/linuxrc livecd-linuxrc,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list