rpms/qtoctave/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 qtoctave.spec, 1.1, 1.2 sources, 1.2, 1.3

[Claudio Tomasoni]

Author: claudiotomasoni

Update of /cvs/pkgs/rpms/qtoctave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17915/devel

Modified Files:
	.cvsignore import.log qtoctave.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jun 2008 18:04:41 -0000	1.2
+++ .cvsignore	1 Sep 2008 21:23:18 -0000	1.3
@@ -1,2 +1 @@
-qtoctave-0.7.4.tar.gz
-qtoctave-icon.tar.gz
+qtoctave-0.8.1-20080823.svn165.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jun 2008 18:04:41 -0000	1.1
+++ import.log	1 Sep 2008 21:23:18 -0000	1.2
@@ -1 +1,2 @@
 qtoctave-0_7_4-3_fc9:HEAD:qtoctave-0.7.4-3.fc9.src.rpm:1212688486
+qtoctave-0_8_1-0_20080823_svn165_fc9:HEAD:qtoctave-0.8.1-0.20080823.svn165.fc9.src.rpm:1220304102


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtoctave.spec	5 Jun 2008 18:04:41 -0000	1.1
+++ qtoctave.spec	1 Sep 2008 21:23:18 -0000	1.2
@@ -1,13 +1,16 @@
 Name:           qtoctave
-Version:        0.7.4
-Release:        3%{?dist}
+Version:        0.8.1
+Release:        0.20080823.svn165%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://qtoctave.wordpress.com/
-Source0:        https://forja.rediris.es/frs/download.php/744/qtoctave-0.7.4.tar.gz
-Source1:        %{name}-icon.tar.gz
+# The source for this package was checked out from svn trunk.
+# Use the following command to generate the tarball:
+#  svn checkout https://forja.rediris.es/svn/csl-qtoctave/trunk/qtoctave
+#  tar -czvf qtoctave-0.8.1-20080823.svn165.tar.gz qtoctave
+Source0:        %{name}-%{version}-20080823.svn165.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, octave-devel
@@ -20,8 +23,11 @@
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
-%setup -q -a 1
+%setup -q -n %{name}
 dos2unix readme.txt
+for SVNDIR in $(find . -type d -name .svn)
+   do rm -rf $SVNDIR 
+done
 find src/ -type f -exec chmod a-x {} \;
 
 
@@ -30,47 +36,51 @@
        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DQT_NO_DEBUG" \
        -DCMAKE_SKIP_RPATH:STRING="ON"                   \
        .
-make %{?_smp_mflags}
-
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=QtOctave
-Comment=Frontend for Octave
-Exec=qtoctave
-Icon=qtoctave.png
-Categories=Math;Science;
-Terminal=false
-Type=Application
-EOF
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                      --vendor "fedora" \
-                     %{name}.desktop
-install -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+                     --delete-original \
+                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt icon/
+%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Thu Aug 14 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.8.1-0.20080823.svn165
+- bump to svn version pre 0.8.1
+- fixes on icon and desktop file
+
 * Sat May 24 2008 Claudio Tomasoni <claudio at claudiotomasoni.it> 0.7.4-3
 - fixed SOURCE1 setup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jun 2008 18:04:41 -0000	1.2
+++ sources	1 Sep 2008 21:23:18 -0000	1.3
@@ -1,2 +1 @@
-ac6fbfecd1e1ca5b07f1131701d92186  qtoctave-0.7.4.tar.gz
-7718cf0d600d30bce77de341ef314355  qtoctave-icon.tar.gz
+ea7aeeaa1eb180007c9a53fbe566a727  qtoctave-0.8.1-20080823.svn165.tar.gz