SPECS: gambas2.spec - - cleaning, install desktop & icon files

[twittner]

Author: twittner                     Date: Wed Aug 20 21:20:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- - cleaning, install desktop & icon files

---- Files affected:
SPECS:
   gambas2.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/gambas2.spec
diff -u SPECS/gambas2.spec:1.1 SPECS/gambas2.spec:1.2
--- SPECS/gambas2.spec:1.1	Sun Aug 17 22:59:19 2008
+++ SPECS/gambas2.spec	Wed Aug 20 23:20:47 2008
@@ -9,8 +9,6 @@
 Source0:	http://dl.sourceforge.net/gambas/%{name}-%{version}.tar.bz2
 # Source0-md5:	e77b7c8589facc6bd7af8d4cdbc16bce
 Source1:	%{name}.desktop
-Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-pdf_hack.patch
 URL:		http://gambas.sourceforge.net/
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	bzip2-devel
@@ -336,25 +334,21 @@
 
 %prep
 %setup -q
-#patch0 -p1
-#patch1 -p1
 
 %build
 ./reconf-all
-%configure \
-	--%{?debug:en}%{!?debug:dis}able-debug
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-#install app/src/gambas2/img/logo/gambas-48x48.png \
-#	$RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install -D app/src/gambas2/img/logo/new-logo.png \
+	$RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
@@ -636,8 +630,8 @@
 %attr(755,root,root) %{_bindir}/gambas2.gambas
 %attr(755,root,root) %{_bindir}/gambas2-database-manager.gambas
 %attr(755,root,root) %{_bindir}/gba2
-#{_desktopdir}/gambas.desktop
-#{_pixmapsdir}/gambas.png
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %files examples
 %defattr(644,root,root,755)
@@ -753,6 +747,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/08/20 21:20:47  twittner
+- - cleaning, install desktop & icon files
+
 Revision 1.1  2008/08/17 20:59:19  twittner
 - added, based on gambas.spec, NFY but builds & runs
 
================================================================

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