packages: lazarus/lazarus.spec - rel 1

[arekm]

Author: arekm                        Date: Thu Jan 14 21:33:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1

---- Files affected:
packages/lazarus:
   lazarus.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/lazarus/lazarus.spec
diff -u packages/lazarus/lazarus.spec:1.15 packages/lazarus/lazarus.spec:1.16
--- packages/lazarus/lazarus.spec:1.15	Thu Jan 14 22:18:38 2010
+++ packages/lazarus/lazarus.spec	Thu Jan 14 22:33:16 2010
@@ -4,15 +4,13 @@
 Summary(pl.UTF-8):	Lazarus - biblioteka komponentów i IDE
 Name:		lazarus
 Version:	0.9.28.2
-Release:	0.1
+Release:	1
 License:	GPL and modified LGPL
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/lazarus/%{name}-%{version}-src.tar.bz2
 # Source0-md5:	52dc157fa1e83e90b5331820bd616d81
 URL:		http://www.lazarus.freepascal.org/
 Patch0:		%{name}-desktop.patch
-# heavily broken: binaries in datadir
-BuildRequires:	FHS-fix
 BuildRequires:	fpc >= 2.4.0
 BuildRequires:	gdk-pixbuf-devel
 BuildRequires:	gtk+-devel
@@ -41,26 +39,27 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/lazarus/docs,%{_pixmapsdir},%{_desktopdir},%{_bindir}} \
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_libdir}/lazarus/docs,%{_pixmapsdir},%{_desktopdir},%{_bindir}} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 for i in components doceditor ide lcl units converter debugger ideintf languages localize.bat startlazarus \
 designer images lazarus localize.sh packager tools ; do
-cp -a $i $RPM_BUILD_ROOT%{_datadir}/lazarus
+cp -a $i $RPM_BUILD_ROOT%{_libdir}/lazarus
 done
 
-cp -a docs/*.html $RPM_BUILD_ROOT%{_datadir}/lazarus/docs
-cp -a docs/html $RPM_BUILD_ROOT%{_datadir}/lazarus/docs
-cp -a docs/images $RPM_BUILD_ROOT%{_datadir}/lazarus/docs
-cp -a docs/xml $RPM_BUILD_ROOT%{_datadir}/lazarus/docs
-install docs/Contributors.txt $RPM_BUILD_ROOT%{_datadir}/lazarus/docs
+cp -a docs/*.html $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
+cp -a docs/html $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
+cp -a docs/images $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
+cp -a docs/xml $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
+install docs/Contributors.txt $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
 
 install images/ide_icon48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/lazarus.png
 install install/lazarus.desktop $RPM_BUILD_ROOT%{_desktopdir}/lazarus.desktop
 ln -sf %{lazdir}/lazarus $RPM_BUILD_ROOT%{_bindir}/lazarus
 ln -sf %{lazdir}/startlazarus $RPM_BUILD_ROOT%{_bindir}/startlazarus
+ln -s %{_libdir}/lazarus $RPM_BUILD_ROOT%{_datadir}/lazarus
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,8 +70,23 @@
 %attr(755,root,root) %{_bindir}/lazarus
 %attr(755,root,root) %{_bindir}/startlazarus
 %{_datadir}/lazarus
-%attr(755,root,root) %{_datadir}/lazarus/lazarus
-%attr(755,root,root) %{_datadir}/lazarus/startlazarus
+%dir %{_libdir}/lazarus
+%{_libdir}/lazarus/components
+%{_libdir}/lazarus/converter
+%{_libdir}/lazarus/debugger
+%{_libdir}/lazarus/designer
+%{_libdir}/lazarus/doceditor
+%{_libdir}/lazarus/docs
+%{_libdir}/lazarus/ide
+%{_libdir}/lazarus/ideintf
+%{_libdir}/lazarus/images
+%{_libdir}/lazarus/languages
+%{_libdir}/lazarus/lcl
+%{_libdir}/lazarus/packager
+%{_libdir}/lazarus/tools
+%{_libdir}/lazarus/units
+%attr(755,root,root) %{_libdir}/lazarus/lazarus
+%attr(755,root,root) %{_libdir}/lazarus/startlazarus
 %{_pixmapsdir}/lazarus.png
 %{_desktopdir}/lazarus.desktop
 %{_examplesdir}/%{name}-%{version}
@@ -83,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/01/14 21:33:16  arekm
+- rel 1
+
 Revision 1.15  2010/01/14 21:18:38  arekm
 - up to 0.9.28.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lazarus/lazarus.spec?r1=1.15&r2=1.16&f=u