diff --git a/engauge-digitizer-with-name.svg b/engauge-digitizer-with-name.svg new file mode 100644 index 0000000..d758978 --- /dev/null +++ b/engauge-digitizer-with-name.svg @@ -0,0 +1,310 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + engauge + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/engauge-digitizer.appdata.xml b/engauge-digitizer.appdata.xml new file mode 100644 index 0000000..31f4417 --- /dev/null +++ b/engauge-digitizer.appdata.xml @@ -0,0 +1,48 @@ + + + + engauge-digitizer.desktop + CC0 + GPL-2.0+ + Engauge Digitizer + Convert an image file showing a graph or map into numbers + +

+ This open source digitizing software converts an image file + showing a graph or map into numbers. The image file can come + from a scanner, digital camera, or a screen-shot. The numbers + can be read on the screen and written or copied to a + spreadsheet. 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. +

+

+ Here are some real-life examples: +

+ + + + http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-points-save-as.png + http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-axis-point.png + http://in.waw.pl/~zbyszek/fedora/engauge-screenshots/engauge-screenshot-map-points.png + + http://digitizer.sourceforge.net/ + zbyszek@in.waw.pl + diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec index fa1c9af..cc03262 100644 --- a/engauge-digitizer.spec +++ b/engauge-digitizer.spec @@ -8,17 +8,25 @@ Name: engauge-digitizer Summary: Convert graphs or map files into numbers Version: 5.2 -Release: 6.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 7.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} Group: Applications/Engineering License: GPLv2+ URL: http://digitizer.sourceforge.net/ Source0: http://sourceforge.net/code-snapshots/git/d/di/digitizer/code.git/digitizer-code-%{checkout}.zip +## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409 +Source1: %{name}.appdata.xml +Source2: %{name}.svg +Source3: %{name}-with-name.svg + ## Main building BuildRequires: qt-devel >= 1:4.6.0, fftw-devel, desktop-file-utils ## BR for 'transpose' building BuildRequires: qt3-devel, byacc, flex + +%if 0%{?fedora} BuildRequires: libappstream-glib +%endif %description This open source, digitizing software converts an image file @@ -67,8 +75,8 @@ 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}%{_datadir}/appdata mkdir -p %{buildroot}%{_bindir} install -p -m 755 bin/engauge %{buildroot}%{_bindir} @@ -78,52 +86,68 @@ install -p -m 644 samples/* %{buildroot}%{_datadir}/%{name}-%{version}/samples 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 +install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps +install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps +%if 0%{?fedora} +install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata +%endif ## Desktop file installation -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 +%if 0%{?fedora} +desktop-file-edit \ + --set-key=Exec --set-value="env ENGAUGE_BROWSER=firefox engauge -manual %{_datadir}/%{name}-%{version}/usermanual" \ + --set-icon=%{name}-with-name ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%else +sed -e \ + 's|Exec=engauge %F|Exec=env ENGAUGE_BROWSER=firefox engauge -manual %{_datadir}/%{name}-%{version}/usermanual|g' \ + -i ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + +sed -e \ + 's|Icon=%{_datadir}/pixmaps/%{name}.xpm|Icon=%{name}-with-name|g' \ + -i ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +%endif + +%if 0%{?fedora} %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml +%endif %post -/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/%{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/%{name} &>/dev/null || : - - %files %doc README RELEASE +%if 0%{?fedora} %license LICENSE +%else +%doc LICENSE +%endif %{_bindir}/engauge -%{_datadir}/icons/%{name}/ -%{_datadir}/pixmaps/digitizer.svg -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/pixmaps/%{name}*.svg +%if 0%{?fedora} +%{_datadir}/appdata/*.appdata.xml +%endif %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}-%{version}/ %files transpose %doc utility/transpose/README -%license LICENSE +%if 0%{?fedora} +%license LICENSE +%else +%doc LICENSE +%endif %{_bindir}/transpose %changelog +* Thu Jan 15 2015 Antonio Trande - 5.2-7.20150115git28de7d +- Included files proposed in bz#1182409 + * Thu Jan 15 2015 Antonio Trande - 5.2-6.20150115git28de7d - Update to commit 28de7d - Package appdata and SVG files diff --git a/engauge-digitizer.svg b/engauge-digitizer.svg new file mode 100644 index 0000000..b0ce585 --- /dev/null +++ b/engauge-digitizer.svg @@ -0,0 +1,299 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +