- up to 20080825

- i18n
- fixed short-circuit build

Changed files:
    kicad.spec -> 1.9

diff --git a/kicad.spec b/kicad.spec
index 0ee822570cd6f01de647403dcad2f4b440ce385f..ca7d77305e12c00e01a3cdbbcb2a0cac4acd3dd9 100644 (file)
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,14 +1,14 @@
-%define                _release        r304
 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
-Version:       20071004
-Release:       2
+Version:       20080825
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://dl.sourceforge.net/kicad/%{name}-%{version}-%{_release}.tar.bz2
+Source0:       http://dl.sourceforge.net/kicad/%{name}-%{version}.tar.bz2
+# Source0-md5: fa3d3e0d7e2793073581cf46f23cca8d
 Source1:       %{name}.desktop
-# Source0-md5: 8ef6310123e9361c5780d321ec07cc8b
+Patch0:                %{name}-makefile.patch
 URL:           http://kicad.sourceforge.net/
 BuildRequires: sed >= 4.0
 BuildRequires: wxGTK2-unicode-devel
@@ -36,9 +36,12 @@ programów:
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 %if "%{_lib}" != "lib"
        %{__sed} -i -e "s@/lib/@/%{_lib}/@g" libs.linux
 %endif
+export WX_CONFIG="`which wx-gtk2-unicode-config`"
+%{__sed} -i -e "s@wx-config@$WX_CONFIG@g" libs.linux
 
 %build
 export WX_CONFIG="`which wx-gtk2-unicode-config`"
@@ -56,19 +59,28 @@ export WX_CONFIG="`which wx-gtk2-unicode-config`"
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -f makefile.gtk install \
+       KICAD_INTERNAT=$RPM_BUILD_ROOT%{_localedir} \
+       KICAD_PLUGINS=$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
        DESTDIR=$RPM_BUILD_ROOT \
        PREFIX=$RPM_BUILD_ROOT%{_prefix}
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
+for loc in $RPM_BUILD_ROOT%{_localedir}/*; do
+       install -d $loc/LC_MESSAGES
+       mv $loc/*.mo $loc/LC_MESSAGES
+done
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc change_log.txt news.txt regex_doc.txt todo.txt version.txt
+%doc change_log.txt regex_doc.txt todo.txt version.txt
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%{_libdir}/%{name}
-%{_docdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*
 %{_desktopdir}/%{name}.desktop