SPECS (PEDRITO): psi.spec - works
wolf
wolf at pld-linux.org
Mon Nov 21 16:46:09 CET 2005
Author: wolf Date: Mon Nov 21 15:46:09 2005 GMT
Module: SPECS Tag: PEDRITO
---- Log message:
- works
---- Files affected:
SPECS:
psi.spec (1.73.2.29.2.14 -> 1.73.2.29.2.15)
---- Diffs:
================================================================
Index: SPECS/psi.spec
diff -u SPECS/psi.spec:1.73.2.29.2.14 SPECS/psi.spec:1.73.2.29.2.15
--- SPECS/psi.spec:1.73.2.29.2.14 Mon Nov 21 10:51:26 2005
+++ SPECS/psi.spec Mon Nov 21 16:46:04 2005
@@ -76,14 +76,14 @@
%prep
%setup -q -n %{name}-pedrito-%{_snap}
-%setup -q -D -a 2 -n %{name}-pedrito-%{_snap}
%patch0 -p1
#%patch1 -p0
-cd psi
%{__tar} jxf %{SOURCE1}
-
+cd psi-pedrito-2005-11-18-data
+cp -r * ..
cd ..
+
rm -rf `find . -type d -name CVS`
%build
@@ -98,8 +98,6 @@
QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \
QMAKE_RPATH=
-lrelease lang/*.ts
-
%{__make}
%install
@@ -107,22 +105,20 @@
export QTDIR=%{_prefix}
-cd psi
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
-cd ..
install -d \
$RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-install psi/psi.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install psi/iconsets/system/default/icon_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi.png
-install psi/iconsets/roster/stellar-icq/online.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi-stellar.png
+install psi.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install iconsets/system/default/icon_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi.png
+install iconsets/roster/stellar-icq/online.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi-stellar.png
#install psi/lang/*.qm $RPM_BUILD_ROOT%{_datadir}/psi
-install psi/*.qm $RPM_BUILD_ROOT%{_datadir}/psi
+install *.qm $RPM_BUILD_ROOT%{_datadir}/psi
install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/psi/iconsets/system/default/
-install psi/libpsi/psiwidgets/*.so $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer
+install libpsi/psiwidgets/*.so $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer
rm -rf $RPM_BUILD_ROOT%{_datadir}/psi/COPYING $RPM_BUILD_ROOT%{_datadir}/psi/README
rm -rf $RPM_BUILD_ROOT%{_datadir}/psi/designer
@@ -132,7 +128,7 @@
%files
%defattr(644,root,root,755)
-%doc psi/README psi/TODO psi/ChangeLog psi-pedrito.txt
+%doc README TODO ChangeLog psi-pedrito.txt
%attr(755,root,root) %{_bindir}/*
%dir %{_datadir}/psi
%{_datadir}/psi/certs
@@ -165,7 +161,7 @@
%files -n qt-designer-psiwidgets
%defattr(644,root,root,755)
-%doc psi/libpsi/psiwidgets/README
+%doc libpsi/psiwidgets/README
%attr(755,root,root) %{_libdir}/qt/plugins-mt/designer/libpsiwidgets.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -174,6 +170,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.73.2.29.2.15 2005/11/21 15:46:04 wolf
+- works
+
Revision 1.73.2.29.2.14 2005/11/21 09:51:26 djrzulf
- swap patches (1 needs to be updated),
- clean at %%build,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/psi.spec?r1=1.73.2.29.2.14&r2=1.73.2.29.2.15&f=u
More information about the pld-cvs-commit
mailing list