Re: kicad.spec

[Daniel Dawid Majewski]

W odpowiedzi na wiadomość z dnia 03.01.2011 00:07, od Daniel Dawid Majewski:
> No to jeszcze raz komplecik i to bardziej dopieszczony...
Trzeba będzie pamiętać żeby przy dopisywaniu Source2-md5 nie było to
Source1-md5...

-- 
Pozdrawiam,
Daniel Dawid Majewski
jabber:light-i/pld-users.org

--- kicad.spec.old	2010-08-28 15:25:15.000000000 +0200
+++ kicad.spec	2011-01-03 00:12:07.000000000 +0100
@@ -1,40 +1,53 @@
 # $Revision: 1.11 $, $Date: 2009/11/30 01:30:33 $
-%define	libver 1.0
-%define	docver 1.1
+%define	snaprev 2684
+%define	snapshoot %{version}bzr%{snaprev}
+%define	doc_rev 142
+%define	lib_rev 109
 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:	20090216
+Version:	20101223
 Release:	1
-License:	GPL
+License:	GNU GPL v2, GNU LGPL v2.1
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/kicad/%{name}-%{version}.tar.bz2
-# Source0-md5:	fa3d3e0d7e2793073581cf46f23cca8d
-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/
+Source0:	ftp://iut-tice.ujf-grenoble.fr/cao/%{name}-sources-%{snapshoot}-stable.tar.bz2
+# Source0-md5:
+##How To Get Source0:
+##	bzr export -r%{snaprev} --format=tbz2 %{name}-sources-%{snapshoot}-stable.tar.bz2 lp:kicad/stable
+Source1:	%{name}-doc-r%{doc_rev}.tar.bz2
+# Source1-md5:
+##How To Get Source1:
+##	bzr export -r%{doc_rev} --format=tbz2 doc.tar.bz2 lp:~kicad-developers/kicad/doc
+##	mv doc.tar.bz2 kicad-doc-r%{doc_rev}.tar.bz2
+Source2:	%{name}-lib-r%{lib_rev}.tar.bz2
+# Source2-md5:
+##How To Get Source2:
+##	bzr export -r%{lib_rev} --format=tbz2 lib.tar.bz2 lp:~kicad-lib-committers/kicad/library
+##	mv lib.tar.bz2 kicad-lib-r%{lib_rev}.tar.bz2
+Patch0:		%{name}-doc-lib-cmake.patch
+Patch1:		%{name}-desktop.patch
+URL:		https://launchpad.net/kicad
 BuildRequires:	boost-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	which
 BuildRequires:	wxGTK2-unicode-devel
 BuildRequires:	wxGTK2-unicode-gl-devel
 BuildRequires:	wxWidgets-devel
+Requires:	minizip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-KiCad consists of a project manager and four main programs:
+KiCad consists of a project manager and five main programs:
 - kicad - the project manager.
 - eeschema - the schematic editor.
 - cvpcb - the footprint selector for components used in the circuit
   design.
 - pcbnew - the PCB layout program.
 - gerbview - the Gerber (photoplotter documents) viewer.
+- bitmap2component - tool for creating logotypes from bitmaps.
 
 %description -l pl.UTF-8
-KiCad składa się z menadżera projektów oraz czterych głównych
+KiCad składa się z menadżera projektów oraz pięciu głównych
 programów:
 - kicad - menadżer projektów.
 - eeschema - edytor schematów.
@@ -42,28 +55,82 @@
   projektowaniu płytek drukowanych.
 - pcbnew - program do projektowania płytek drukowanych.
 - gerbview - przeglądarka plików Gerber (dokumentów dla fotoplotera).
+- bitmap2component - narzędzie do tworzenia logotypów z map bitowych.
 
-%prep
-%setup -q -a1 -a2 -n %{name}
-mv kicad/doc/help .
-mv kicad-library/library .
-mv kicad-library/modules .
+%package help-doc
+Summary:	Additonal documentation and tutorial files for KiCad.
+Summary(pl.UTF-8):	Dodatkowe pliki dokumentacji i pomocy dla  KiCad-a.
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
 
-%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_con...@g" libs.linux
+%description help-doc
+This package includes Help and Tutorial files.
+
+%description help-doc -l pl.UTF-8
+Ten pakiet zawiera pliki pomocy i nakuki obługi programu.
+
+%package library
+Summary:	Library project files for KiCad.
+Summary(pl.UTF-8):	Biblioteka projektowa dla KiCad-a.
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description library
+Library of design electronics elements for KiCad.
+
+%description library -l pl.UTF-8
+Biblioteka projektowa elementów elektronicznych dla KiCad-a.
+
+%prep
+%setup -q -a1 -a2 -n %{name}-sources-%{snapshoot}-stable
+%patch0 -p0
+%patch1 -p0
+mkdir build
 
 %build
-export WX_CONFIG="`which wx-gtk2-unicode-config`"
-%{__make} -f makefile.gtk \
+cd build
+ln -s `which wx-gtk2-unicode-config` wx-config
+%ifarch %{x8664}
+%{__cmake} -DCMAKE_VERBOSE_MAKEFILE=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CXX_FLAGS="-m64" \
+-DwxUSE_UNICODE=ON \
+-DKICAD_KEEPCASE=ON \
+-DKICAD_MINIZIP=OFF \
+-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+-DCMAKE_SYSTEM_LIBRARY_PATH=%{_libdir} \
+-DKICAD_INTERNAT="%{_localedir}" \
+-DKICAD_PLUGINS="%{_datadir}/%{name}/plugins" \
+-DKICAD_DATA="%{_datadir}/%{name}" \
+-DKICAD_DOCS="%{_datadir}/%{name}/doc" \
+-DKICAD_HELP="%{_datadir}/%{name}/help" \
+-DKICAD_MODULES="%{_datadir}/%{name}/modules" \
+-DKICAD_LIBRARY="%{_datadir}/%{name}/library" \
+ ../
+%else
+%{__cmake} -DCMAKE_VERBOSE_MAKEFILE=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DwxUSE_UNICODE=ON \
+-DKICAD_KEEPCASE=ON \
+-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+-DCMAKE_SYSTEM_LIBRARY_PATH=%{_libdir} \
+-DKICAD_INTERNAT="%{_localedir}" \
+-DKICAD_PLUGINS="%{_libdir}/%{name}/plugins" \
+-DKICAD_DATA="%{_datadir}/%{name}" \
+-DKICAD_DOCS="%{_datadir}/%{name}/doc" \
+-DKICAD_HELP="%{_datadir}/%{name}/help" \
+-DKICAD_MODULES="%{_datadir}/%{name}/modules" \
+-DKICAD_LIBRARY="%{_datadir}/%{name}/library" \
+ ../
+%endif
+export WX_CONFIG=`which wx-gtk2-unicode-config`
+%{__make}  \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	LD="%{__cxx}" \
 	CLAGS="%{rpmcflags}" \
 	CXXLAGS="%{rpmcxxflags}" \
-	LDFLAGS="%{rpmldflags} %{rpmcxxflags}" \
+	LDFLAGS="%{rpmldflags}" \
 	WXXFLAGS="`$WX_CONFIG --cxxflags`" \
 	WXPATH=%{_libdir} \
 	PREFIX_WX_LIBS="lib`$WX_CONFIG --basename`" \
@@ -76,41 +143,44 @@
 %install
 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}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-
+cd build
+%{__make} install \
+	DESTDIR="$RPM_BUILD_ROOT" \
+	PREFIX="$RPM_BUILD_ROOT%{_prefix}"
+ln -s %{_datadir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/help
 for loc in $RPM_BUILD_ROOT%{_localedir}/*; do
 	install -d $loc/LC_MESSAGES
 	mv $loc/*.mo $loc/LC_MESSAGES
+	rm $loc/*.po
 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
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f build/%{name}.lang
 %defattr(644,root,root,755)
-%doc change_log.txt regex_doc.txt todo.txt version.txt
+%doc CHANGELOG.txt AUTHORS.txt TODO.txt version.txt Documentation/*
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*
-%{_datadir}/%{name}
-%{_desktopdir}/%{name}.desktop
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/demos
+%{_datadir}/%{name}/plugins
+%{_datadir}/%{name}/template
+%{_iconsdir}/*
+%{_desktopdir}/*.desktop
+%{_datadir}/mimelnk/application/*%{name}*.desktop
+%{_datadir}/mime/packages/%{name}.xml
+
+%files help-doc
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/doc
+%{_datadir}/%{name}/help
+
+%files library
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/modules
+%{_datadir}/%{name}/library
+
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog

_______________________________________________
pld-devel-pl mailing list
pld-devel-pl@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl