- added library and help files

- removed obsolete patch

Changed files:
    kicad.spec -> 1.10

diff --git a/kicad.spec b/kicad.spec
index ca7d77305e12c00e01a3cdbbcb2a0cac4acd3dd9..c26700e7bd9df6bd062fa8b404c7b80e698af5d9 100644 (file)
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,3 +1,5 @@
+%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
@@ -7,8 +9,11 @@ License:       GPL
 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
@@ -35,8 +40,11 @@ programów:
 - 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
@@ -61,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__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}
@@ -71,6 +81,12 @@ for loc in $RPM_BUILD_ROOT%{_localedir}/*; do
        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
@@ -83,4 +99,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*
+%{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop