packages: avogadro/avogadro.spec - more fixes

[shadzik]

Author: shadzik                      Date: Fri Jul 30 21:53:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more fixes

---- Files affected:
packages/avogadro:
   avogadro.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/avogadro/avogadro.spec
diff -u packages/avogadro/avogadro.spec:1.2 packages/avogadro/avogadro.spec:1.3
--- packages/avogadro/avogadro.spec:1.2	Fri Jul 30 23:46:16 2010
+++ packages/avogadro/avogadro.spec	Fri Jul 30 23:53:21 2010
@@ -12,6 +12,7 @@
 # fix build with sip 4.10
 URL:		http://avogadro.openmolecules.net/
 Patch0:		%{name}-sip.patch
+Patch1:		%{name}-linguist.patch
 BuildRequires:	boost-devel >= 1.35
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	desktop-file-utils
@@ -51,7 +52,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .sip410
+%patch0 -p1
+%patch1 -p0
 
 %build
 install -d build
@@ -64,17 +66,13 @@
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DLIB_INSTALL_DIR=%{_libdir} \
 	..
-cd ..
-%{__make} -C %{_target_platform}
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-
-# system menu entry
-desktop-file-install --vendor=""                 \
-  --dir=$RPM_BUILD_ROOT%{_desktopdir}  \
-  $RPM_BUILD_ROOT%{_desktopdir}/avogadro.desktop
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -108,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/07/30 21:53:21  shadzik
+- more fixes
+
 Revision 1.2  2010/07/30 21:46:16  shadzik
 - pldization
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avogadro/avogadro.spec?r1=1.2&r2=1.3&f=u