Accepting request 459056 from home:Mailaender:branches:Publishing

spec file overhaul

OBS-URL: https://build.opensuse.org/request/show/459056
OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=129

lyx.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Feb 19 15:06:07 UTC 2017 - mailaender@opensuse.org
+
+- install appdata.xml for https://en.opensuse.org/openSUSE:AppStore
+- install bash completion
+- add missing desktop/icon update macros
+
 -------------------------------------------------------------------
 Wed Feb  1 14:23:38 UTC 2017 - adam.majer@suse.de
 

lyx.spec

@@ -17,19 +17,37 @@
 
 
 Name:           lyx
+Version:        2.2.2
+Release:        0
+Summary:        WYSIWYM (What You See Is What You Mean) document processor
+License:        GPL-2.0+
+Group:          Productivity/Publishing/TeX/Frontends
+Url:            http://www.lyx.org/
+Source:         ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz
+Source1:        lyxrc.dist
+Source2:        lyx.keyring
+Source3:        ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig
 #!BuildIgnore: lyx
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bc
+BuildRequires:  enchant-devel
+BuildRequires:  fdupes
+BuildRequires:  file-devel
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  hunspell-devel
+BuildRequires:  pkgconfig
+BuildRequires:  python
+BuildRequires:  update-desktop-files
+BuildRequires:  zlib-devel
+Requires:       ImageMagick
+Requires:       ghostscript
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_signals-devel
 %else
 BuildRequires:  boost-devel
 %endif
-BuildRequires:  enchant-devel
-BuildRequires:  fdupes
-BuildRequires:  file-devel
-BuildRequires:  hunspell-devel
 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse}
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core)
@@ -44,22 +62,6 @@ BuildRequires:  pkgconfig(Qt5Xml)
 %else
 BuildRequires:  libqt4-devel
 %endif
-BuildRequires:  python
-BuildRequires:  update-desktop-files
-BuildRequires:  zlib-devel
-Version:        2.2.2
-Release:        0
-Summary:        WYSIWYM (What You See Is What You Mean) document processor
-License:        GPL-2.0+
-Group:          Productivity/Publishing/TeX/Frontends
-Url:            http://www.lyx.org/
-Source:         ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz
-Source1:        lyxrc.dist
-Source2:        lyx.keyring
-Source3:        ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       ImageMagick
-Requires:       ghostscript
 %if 0%{?suse_version} < 1230
 Requires:       texlive-latex
 Recommends:     texlive-xetex
@@ -124,7 +126,6 @@ have different formats, such as DVI, postscript, PDF, html.
 LyX can check the LaTeX installation by opening the LaTeX Configuration
 document under "Help" on the menubar.
 
-
 %prep
 %setup -q
 
@@ -143,47 +144,64 @@ make %{?_smp_mflags}
 
 %install
 TEXMF=%{_datadir}/texmf
-make install DESTDIR=$RPM_BUILD_ROOT TEXMF=$TEXMF
+make install DESTDIR=%{buildroot} TEXMF=$TEXMF
 
 # some defaults
-install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist
 
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
-pushd $RPM_BUILD_ROOT%{_datadir}/lyx/doc/
+pushd %{buildroot}%{_datadir}/lyx/doc/
     for i in *
     do
         ln -s %{_datadir}/lyx/doc/$i \
-	      $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
+	      %{buildroot}/%{_defaultdocdir}/%{name}/
     done
 popd
+
 cp ANNOUNCE COPYING NEWS \
    README README.localization RELEASE-NOTES UPGRADING \
-   $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
+   %{buildroot}/%{_defaultdocdir}/%{name}/
+
 mkdir -p $RPM_BUILD_ROOT$TEXMF/tex/latex
 ln -s %{_datadir}/lyx/tex $RPM_BUILD_ROOT$TEXMF/tex/latex/lyx
-%suse_update_desktop_file lyx Office WordProcessor
-%fdupes -s $RPM_BUILD_ROOT
-%find_lang %name
 
-%files -f %name.lang
+install -p -D -m 0644 lib/appdata.xml %{buildroot}%{_datadir}/appdata/lyx.appdata.xml
+
+install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/lyx
+
+%suse_update_desktop_file lyx Office WordProcessor
+
+%fdupes -s %{buildroot}%{_prefix}
+
+%find_lang %{name}
+
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
+%files -f %{name}.lang
 %defattr(-,root,root)
 %docdir %{_datadir}/lyx/doc
 %doc %{_defaultdocdir}/lyx
-/usr/bin/lyx
+%{_bindir}/lyx
-/usr/bin/lyxclient
+%{_bindir}/lyxclient
-/usr/bin/tex2lyx
+%{_bindir}/tex2lyx
 %{_datadir}/applications/lyx.desktop
-%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/appdata/
-%dir %{_datadir}/icons/hicolor/*
+%{_datadir}/appdata/lyx.appdata.xml
-%dir %{_datadir}/icons/hicolor/*/apps
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %dir %{_datadir}/texmf
 %dir %{_datadir}/texmf/tex
 %dir %{_datadir}/texmf/tex/latex
 %{_datadir}/texmf/tex/latex/lyx
 %{_datadir}/lyx
-%doc %{_mandir}/man1/lyx.1.gz
+%{_mandir}/man1/lyx.1%{ext_man}
-%doc %{_mandir}/man1/lyxclient.1.gz
+%{_mandir}/man1/lyxclient.1%{ext_man}
-%doc %{_mandir}/man1/tex2lyx.1.gz
+%{_mandir}/man1/tex2lyx.1%{ext_man}
+%{_sysconfdir}/bash_completion.d/lyx
 
 %changelog