[engauge-digitizer] Update to commit 28de7d.

Thu Jan 15 17:19:44 UTC 2015

commit 2dd4fc1b91b7c2e8b64d94fd76c3cda2df944d80
Author: sagitter <sagitterATfedoraprojectDOTorg>
Date:   Thu Jan 15 18:20:00 2015 +0100

    Update to commit 28de7d.

 .gitignore                |    1 +
 engauge-digitizer.desktop |    8 -----
 engauge-digitizer.spec    |   64 +++++++++++++++++++++++++-------------------
 sources                   |    2 +-
 4 files changed, 38 insertions(+), 37 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 508d904..430e1a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /engauge_5.2.tgz
+/digitizer-code-28de7dcffa2585192e3118a4861e9232fbb5a09b.zip
diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec
index e4cfbc7..fa1c9af 100644
--- a/engauge-digitizer.spec
+++ b/engauge-digitizer.spec
@@ -1,3 +1,6 @@
+%global  checkout   28de7dcffa2585192e3118a4861e9232fbb5a09b
+%global  date       20150115
+
 ## Define the Qt3/Qt4 qmake 
 %global qmake %{_libdir}/qt-3.3/bin/qmake
 %global qmake4 %{_libdir}/qt4/bin/qmake-qt4
@@ -5,21 +8,17 @@
 Name:    engauge-digitizer
 Summary: Convert graphs or map files into numbers
 Version: 5.2
-Release: 5%{?dist}
+Release: 6.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
 Group:   Applications/Engineering
 License: GPLv2+
 URL:     http://digitizer.sourceforge.net/
-Source0: http://sourceforge.net/projects/digitizer/files/Engauge%20Digitizer/digitizer-%{version}/engauge_%{version}.tgz
-
-## Desktop file
-Source1:  %{name}.desktop
+Source0: http://sourceforge.net/code-snapshots/git/d/di/digitizer/code.git/digitizer-code-%{checkout}.zip
 
 ## Main building
 BuildRequires: qt-devel >= 1:4.6.0, fftw-devel, desktop-file-utils
 ## BR for 'transpose' building
 BuildRequires: qt3-devel, byacc, flex
-
-Requires:  %{name}-data = %{version}-%{release}
+BuildRequires: libappstream-glib
 
 %description
 This open source, digitizing software converts an image file 
@@ -31,13 +30,6 @@ The process starts with an image file containing a graph or map.
 The final result is digitized data that can be used by other tools 
 such as Gnumeric.
 
-%package data
-Summary:   The %{name} data files
-Group:     Applications/Engineering
-BuildArch: noarch
-%description data
-Data files of %{name} application.
-
 %package transpose
 Summary: The %{name} transpose utility
 Group:   Applications/Engineering
@@ -47,7 +39,7 @@ output of Engauge Digitizer. Specifically, this utility can transpose the output
 matrices found in the export files.
 
 %prep
-%setup -q -n engauge-%{version}
+%setup -q -n digitizer-code-%{checkout}
 
 ## Fix 'src/pointset.cpp' compilation error.
 sed -i '36a #include <algorithm>' src/digitdoc.cpp
@@ -70,13 +62,13 @@ make %{?_smp_mflags}
 popd
 
 %install
-
 mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples
 mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/animation
 mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img
 mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/usermanual
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/icons/%{name}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
 mkdir -p %{buildroot}%{_bindir}
 
 install -p -m 755 bin/engauge %{buildroot}%{_bindir}
@@ -87,41 +79,57 @@ install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img
 install -p -m 644 usermanual/* %{buildroot}%{_datadir}/%{name}-%{version}/usermanual
 install -p -m 644 animation/* %{buildroot}%{_datadir}/%{name}-%{version}/animation
 install -p -m 644 src/img/digitizer.ico %{buildroot}%{_datadir}/icons/%{name}
+install -p -m 644 src/img/digitizer.svg %{buildroot}%{_datadir}/pixmaps
+install -Dm0644 %{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
 ## Desktop file installation
-desktop-file-install                                    \
---dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
-%{SOURCE1} 
+desktop-file-edit \
+ --set-key=Exec --set-value="env ENGAUGE_BROWSER=firefox engauge -manual %{_datadir}/%{name}-%{version}/usermanual" \
+ --set-icon=digitizer \
+%{name}.desktop
+
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
 %post
-/bin/touch --no-create %{_datadir}/icons &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/%{name} &>/dev/null || :
 
 
 %files
-%doc LICENSE README RELEASE Doxyfile 
+%doc README RELEASE
+%license LICENSE
 %{_bindir}/engauge
 %{_datadir}/icons/%{name}/
+%{_datadir}/pixmaps/digitizer.svg
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-
-%files data
-%doc LICENSE
 %{_datadir}/%{name}-%{version}/
 
 %files transpose
 %doc utility/transpose/README
-%doc LICENSE 
+%license LICENSE 
 %{_bindir}/transpose
 
 %changelog
+* Thu Jan 15 2015 Antonio Trande <sagitter at fedoraproject.org> - 5.2-6.20150115git28de7d
+- Update to commit 28de7d
+- Package appdata and SVG files
+- data sub-package incorporated in the main one
+- Used the new macro %%license
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index a597ff6..ea3fa3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fbd9c81fa9e910f871560767bbb52bc  engauge_5.2.tgz
+d8d5a7aae0e4072c7215ffb34e11da06  digitizer-code-28de7dcffa2585192e3118a4861e9232fbb5a09b.zip
