packages: qtfm/qtfm.spec - missing dir, pass cxx/cxxflags; cleanup

glen glen at pld-linux.org
Wed May 16 21:47:36 CEST 2012


Author: glen                         Date: Wed May 16 19:47:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- missing dir, pass cxx/cxxflags; cleanup

---- Files affected:
packages/qtfm:
   qtfm.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/qtfm/qtfm.spec
diff -u packages/qtfm/qtfm.spec:1.4 packages/qtfm/qtfm.spec:1.5
--- packages/qtfm/qtfm.spec:1.4	Sat May 12 12:39:40 2012
+++ packages/qtfm/qtfm.spec	Wed May 16 21:47:31 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Menedzer plików Qt
 Name:		qtfm
 Version:	5.4
-Release:	1
+Release:	2
 License:	GPL
 URL:		http://www.qtfm.org/
 Source0:	http://www.qtfm.org/%{name}-%{version}.tar.gz
@@ -28,12 +28,16 @@
 
 %build
 qmake-qt4
-%{__make}
+%{__make} \
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=$RPM_BUILD_ROOT
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,16 +54,17 @@
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/%{name}*.desktop
 %{_pixmapsdir}/%{name}.png
-%lang(da) %{_datadir}/qtfm/qtfm_da.qm
-%lang(de) %{_datadir}/qtfm/qtfm_de.qm
-%lang(es) %{_datadir}/qtfm/qtfm_es.qm
-%lang(fr) %{_datadir}/qtfm/qtfm_fr.qm
-%lang(it) %{_datadir}/qtfm/qtfm_it.qm
-%lang(pl) %{_datadir}/qtfm/qtfm_pl.qm
-%lang(ru) %{_datadir}/qtfm/qtfm_ru.qm
-%lang(sr) %{_datadir}/qtfm/qtfm_sr.qm
-%lang(zh) %{_datadir}/qtfm/qtfm_zh.qm
-%lang(zh_TH) %{_datadir}/qtfm/qtfm_zh_TW.qm
+%dir %{_datadir}/qtfm
+%lang(da) %{_datadir}/%{name}/qtfm_da.qm
+%lang(de) %{_datadir}/%{name}/qtfm_de.qm
+%lang(es) %{_datadir}/%{name}/qtfm_es.qm
+%lang(fr) %{_datadir}/%{name}/qtfm_fr.qm
+%lang(it) %{_datadir}/%{name}/qtfm_it.qm
+%lang(pl) %{_datadir}/%{name}/qtfm_pl.qm
+%lang(ru) %{_datadir}/%{name}/qtfm_ru.qm
+%lang(sr) %{_datadir}/%{name}/qtfm_sr.qm
+%lang(zh) %{_datadir}/%{name}/qtfm_zh.qm
+%lang(zh_TH) %{_datadir}/%{name}/qtfm_zh_TW.qm
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/05/16 19:47:31  glen
+- missing dir, pass cxx/cxxflags; cleanup
+
 Revision 1.4  2012/05/12 10:39:40  blekot
 - up to 5.4
 - added lang files
@@ -79,4 +87,3 @@
 
 Revision 1.1  2011/07/29 01:21:21  evil
 - initial release
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/qtfm/qtfm.spec?r1=1.4&r2=1.5



More information about the pld-cvs-commit mailing list