SPECS: odf-converter-integrator.spec - simplify; rel 1

[glen]

Author: glen                         Date: Mon Oct 20 19:11:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplify; rel 1

---- Files affected:
SPECS:
   odf-converter-integrator.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/odf-converter-integrator.spec
diff -u SPECS/odf-converter-integrator.spec:1.1 SPECS/odf-converter-integrator.spec:1.2
--- SPECS/odf-converter-integrator.spec:1.1	Tue Oct  7 12:13:06 2008
+++ SPECS/odf-converter-integrator.spec	Mon Oct 20 21:11:29 2008
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Convert Office 2007 (OOXML) files for OpenOffice.org
 Name:		odf-converter-integrator
 Version:	0.1.5
-Release:	0.1
+Release:	1
 License:	GPL v3
 Group:		Applications
 Source0:	http://katana.oooninja.com/f/software/%{name}-source-%{version}.tar.bz2
@@ -22,17 +22,19 @@
 types such as .docx, .xlsx, and .pptx so that Nautilus, Firefox, and
 other programs automatically recognize them.
 
-
 %prep
 %setup -q -n %{name}-source-%{version}
+mv linux/%{name}-%{version}/* .
+mv usr/bin/* .
+mv usr/share/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_datadir}/mime/packages,%{_datadir}/mimelnk/application}
-install linux/%{name}-%{version}/%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}
-install linux/%{name}-%{version}%{_desktopdir}/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install linux/%{name}-%{version}%{_datadir}/mime/packages/%{name}.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
-install linux/%{name}-%{version}%{_datadir}/mimelnk/application/%{name}*.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
+install %{name} $RPM_BUILD_ROOT%{_bindir}
+cp -a applications/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a mime/packages/%{name}.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
+cp -a mimelnk/application/%{name}*.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,6 +60,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/10/20 19:11:29  glen
+- simplify; rel 1
+
 Revision 1.1  2008/10/07 10:13:06  luzik
 - initial PLD release
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/odf-converter-integrator.spec?r1=1.1&r2=1.2&f=u