X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdime.git;a=blobdiff_plain;f=dime.spec;h=15328be65bee904362ed795a604afba7d93049db;hp=3bc55d3dadf5fdff4b05b4c7b63ebeacf6543fa9;hb=1facb55ad671b7fb9612ed65aad353c1cc693d60;hpb=765dd100e88ffbe6762d9c30ce542897375b0c69

diff --git a/dime.spec b/dime.spec
index 3bc55d3..15328be 100644
--- a/dime.spec
+++ b/dime.spec
@@ -5,9 +5,12 @@ Version:	0.9.1
 Release:	3
 License:	GPL
 Group:		Libraries
-Source0:	ftp://ftp.sim.no/pub/dime/%{name}-%{version}-src.tar.bz2
+# Old site:	ftp://ftp.sim.no/pub/dime/
+# New site(?):	http://download.berlios.de/cad2octree/
+Source0:	%{name}-%{version}-src.tar.bz2
 # Source0-md5:	142af240cd35508d606917a38164c759
-Source1:	ftp://ftp.sim.no/pub/dime/%{name}-%{version}-doc.tar.bz2
+Source1:	%{name}-%{version}-doc.tar.bz2
+# Source1-md5:	994706320ce7d222a1597913ba0cbee0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,16 +55,16 @@ Bibliotek obs
   pamiêci±, dziêki którym mo¿na znacznie zwiêkszyæ wydajno¶æ.
 
 %package devel
-Summary:	DIME devel
+Summary:	DIME - development files
 Summary(pl):	DIME - czê¶æ dla programistów
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
 
 %description devel
-Dime developement files.
+Dime development files.
 
 %description devel -l pl
-Pliki developerskie do dime.
+Pliki dime przeznaczone dla programistów.
 
 %package documentation
 Summary:	DIME doc
@@ -79,23 +82,23 @@ Dokumentacja dime.
 %setup -q -D -b1
 
 %build
-cd build
-%{__make} RPM_OPT_FLAGS="%{rpmcflags}"
-cd ../docs/latex
-%{__make} refman.ps
+%{__make} -C build \
+	CC="%{__cxx}" \
+	OPT="%{rpmcflags}"
+
+%{__make} -C docs/latex refman.ps
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
-
-install -d $RPM_BUILD_ROOT/%{datadir}/doc/%name-documentation-%version/{latex,html}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}} \
+	$RPM_BUILD_ROOT%{datadir}/doc/%{name}-documentation-%{version}/{latex,html}
 
 cp -rp include/* $RPM_BUILD_ROOT%{_includedir}
 install build/libdime.a $RPM_BUILD_ROOT%{_libdir}
-cp -rp docs/latex/*.tex $RPM_BUILD_ROOT/%{datadir}/doc/%name-documentation-%version/latex
-cp -rp docs/latex/*.sty $RPM_BUILD_ROOT/%{datadir}/doc/%name-documentation-%version/latex
+cp -rp docs/latex/*.tex $RPM_BUILD_ROOT%{datadir}/doc/%{name}-documentation-%{version}/latex
+cp -rp docs/latex/*.sty $RPM_BUILD_ROOT%{datadir}/doc/%{name}-documentation-%{version}/latex
 
-cp -rp docs/latex/* $RPM_BUILD_ROOT/%{datadir}/doc/%name-documentation-%version/html
+cp -rp docs/latex/* $RPM_BUILD_ROOT%{datadir}/doc/%{name}-documentation-%{version}/html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,15 +106,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README TODO ChangeLog
-%attr(644,root,root) %{_libdir}/libdime.a
+%{_libdir}/libdime.a
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/latex/refman.ps ChangeLog.gz README.gz TODO.gz
-%{_includedir}/dime/
+%doc docs/latex/refman.ps ChangeLog README TODO
+%{_includedir}/dime
 
 %files documentation
 %defattr(644,root,root,755)
 #%doc docs/html/* docs/latex/*.tex docs/latex/*.sty
-%attr(644,root,root) /%{datadir}/doc/%name-documentation-%version/latex
-%attr(644,root,root) /%{datadir}/doc/%name-documentation-%version/html
+%dir %{_docdir}/%{name}-documentation-%{version}
+%{_docdir}/%{name}-documentation-%{version}/latex
+%{_docdir}/%{name}-documentation-%{version}/html