SPECS: kicad.spec - added library and help files - removed obsolete patch

lkrotowski lkrotowski at pld-linux.org
Sat Sep 27 19:34:46 CEST 2008


Author: lkrotowski                   Date: Sat Sep 27 17:34:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added library and help files
- removed obsolete patch

---- Files affected:
SPECS:
   kicad.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/kicad.spec
diff -u SPECS/kicad.spec:1.9 SPECS/kicad.spec:1.10
--- SPECS/kicad.spec:1.9	Sat Sep 27 18:00:51 2008
+++ SPECS/kicad.spec	Sat Sep 27 19:34:40 2008
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+%define	libver 1.0
+%define	docver 1.1
 Summary:	KiCad - is a GPL'd suite of programs for EDA
 Summary(pl.UTF-8):	KiCad - zestaw programów na licencji GPL zaliczany do kategorii EDA
 Name:		kicad
@@ -8,8 +10,11 @@
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/kicad/%{name}-%{version}.tar.bz2
 # Source0-md5:	fa3d3e0d7e2793073581cf46f23cca8d
-Source1:	%{name}.desktop
-Patch0:		%{name}-makefile.patch
+Source1:	http://dl.sourceforge.net/kicad/%{name}-library-%{libver}.tar.bz2
+# Source1-md5:	9c91940aa5f5563bb86c52ff07e8f99a
+Source2:	http://dl.sourceforge.net/kicad/%{name}-doc-%{docver}.tar.bz2
+# Source2-md5:	fcfbc94f675a19db51370e97b88803b1
+Source3:	%{name}.desktop
 URL:		http://kicad.sourceforge.net/
 BuildRequires:	sed >= 4.0
 BuildRequires:	wxGTK2-unicode-devel
@@ -36,8 +41,11 @@
 - gerbview - przeglądarka plików Gerber (dokumentów dla fotoplotera).
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -a1 -a2 -n %{name}
+mv kicad/doc/help .
+mv kicad-library/library .
+mv kicad-library/modules .
+
 %if "%{_lib}" != "lib"
 	%{__sed} -i -e "s@/lib/@/%{_lib}/@g" libs.linux
 %endif
@@ -62,6 +70,8 @@
 %{__make} -f makefile.gtk install \
 	KICAD_INTERNAT=$RPM_BUILD_ROOT%{_localedir} \
 	KICAD_PLUGINS=$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
+	KICAD_DATA=$RPM_BUILD_ROOT%{_datadir}/%{name} \
+	KICAD_DOCS=$RPM_BUILD_ROOT%{_datadir}/%{name}/help \
 	DESTDIR=$RPM_BUILD_ROOT \
 	PREFIX=$RPM_BUILD_ROOT%{_prefix}
 install -d $RPM_BUILD_ROOT%{_desktopdir}
@@ -72,6 +82,12 @@
 	mv $loc/*.mo $loc/LC_MESSAGES
 done
 
+for loc in $RPM_BUILD_ROOT%{_datadir}/%{name}/help/*; do
+	if [ -d $loc/docs_src ]; then
+		rm -rf $loc/docs_src; 
+	fi
+done
+
 %find_lang %{name}
 
 %clean
@@ -84,6 +100,7 @@
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*
+%{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -92,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008/09/27 17:34:40  lkrotowski
+- added library and help files
+- removed obsolete patch
+
 Revision 1.9  2008/09/27 16:00:51  lkrotowski
 - up to 20080825
 - i18n
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kicad.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list