Accepting request 637061 from home:pluskalm:branches:utilities

- Simplify conditions
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/637061
OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=63

dateutils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 21 14:14:26 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
+
+- Simplify conditions
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Thu Sep 20 11:08:48 UTC 2018 - bwiedemann@suse.com
 

dateutils.spec

@@ -12,45 +12,23 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define have_octave 0
-%if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315
-%define have_octave 1
-%ifarch aarch64
-%if 0%{?suse_version} <= 1310
-%define have_octave 0
-%endif
-%endif
-%ifnarch i586 x86_64
-%if 0%{?suse_version} < 1310
-%define have_octave 0
-%endif
-%endif
-%endif
-%if 0%{?fedora_version} >= 19
-%define have_octave 1
-%endif
 Name:           dateutils
 Version:        0.4.5
 Release:        0
 Summary:        Command line date and time utilities
 License:        BSD-3-Clause
 Group:          Productivity/Text/Utilities
-Url:            https://github.com/hroptatyr/dateutils/
+URL:            https://github.com/hroptatyr/dateutils/
-Source:         https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Source0:        https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz
 Source1:        https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.asc
-BuildRequires:  pkgconfig
-BuildRequires:  xz
-%if 0%{?suse_version}
-BuildRequires:  timezone
-%endif
-%if %{have_octave}
 BuildRequires:  octave-devel
-%endif
+BuildRequires:  pkgconfig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  timezone
+Requires(post): info
 Requires(pre):  info
 
 %description
@@ -75,36 +53,26 @@ Dateutils can be used from within matlab or ocatave.
 
 %build
 %configure \
-    --docdir=%{_docdir}/%{name} \
+  --enable-contrib
-%if %{have_octave}
-    --enable-contrib \
-%endif
-    ignorethisline=xxx
 make %{?_smp_mflags} V=1
 
 %install
-%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}}
+%make_install
-rm -f %{buildroot}%{_infodir}/dir
+rm -rf %{buildroot}%{_datadir}/doc/dateutils
-rm -f %{buildroot}%{_libdir}/octave/site/oct/*/dateutils/tzconv.la
+rm -rf %{buildroot}%{_libdir}/octave/site/oct/*/dateutils/tzconv.la
 
 %check
-if ! make check; then
+make %{?_smp_mflags} check
-    cat test/test-suite.log
-    exit 1
-fi
 
-# How to make that info stuff portable?
-%if 0%{?install_info:1} > 0
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info*
 
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info*
-%endif
 
 %files
-%defattr(-,root,root)
+%license LICENSE
-%doc %{_docdir}/%{name}
+%doc README.md
 %{_bindir}/dadd
 %{_bindir}/dconv
 %{_bindir}/ddiff
@@ -127,34 +95,31 @@ fi
 %dir %{_datadir}/dateutils/
 %{_datadir}/dateutils/locale
 %{_datadir}/dateutils/*.tzmcc
-%{_infodir}/%{name}.info*
+%{_infodir}/%{name}.info%{?ext_info}
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}.1%{?ext_man}
-%{_mandir}/man1/dadd.1*
+%{_mandir}/man1/dadd.1%{?ext_man}
-%{_mandir}/man1/dconv.1*
+%{_mandir}/man1/dconv.1%{?ext_man}
-%{_mandir}/man1/ddiff.1*
+%{_mandir}/man1/ddiff.1%{?ext_man}
-%{_mandir}/man1/dgrep.1*
+%{_mandir}/man1/dgrep.1%{?ext_man}
-%{_mandir}/man1/dround.1*
+%{_mandir}/man1/dround.1%{?ext_man}
-%{_mandir}/man1/dseq.1*
+%{_mandir}/man1/dseq.1%{?ext_man}
-%{_mandir}/man1/dsort.1*
+%{_mandir}/man1/dsort.1%{?ext_man}
-%{_mandir}/man1/dtest.1*
+%{_mandir}/man1/dtest.1%{?ext_man}
-%{_mandir}/man1/dzone.1*
+%{_mandir}/man1/dzone.1%{?ext_man}
-%{_mandir}/man1/dateadd.1*
+%{_mandir}/man1/dateadd.1%{?ext_man}
-%{_mandir}/man1/dateconv.1*
+%{_mandir}/man1/dateconv.1%{?ext_man}
-%{_mandir}/man1/datediff.1*
+%{_mandir}/man1/datediff.1%{?ext_man}
-%{_mandir}/man1/dategrep.1*
+%{_mandir}/man1/dategrep.1%{?ext_man}
-%{_mandir}/man1/dateround.1*
+%{_mandir}/man1/dateround.1%{?ext_man}
-%{_mandir}/man1/dateseq.1*
+%{_mandir}/man1/dateseq.1%{?ext_man}
-%{_mandir}/man1/datesort.1*
+%{_mandir}/man1/datesort.1%{?ext_man}
-%{_mandir}/man1/datetest.1*
+%{_mandir}/man1/datetest.1%{?ext_man}
-%{_mandir}/man1/datezone.1*
+%{_mandir}/man1/datezone.1%{?ext_man}
-%{_mandir}/man1/strptime.1*
+%{_mandir}/man1/strptime.1%{?ext_man}
 
-%if %{have_octave}
 %files octave
-%defattr(-,root,root)
 %dir %{_libdir}/octave/site/oct/*/dateutils/
 %{_libdir}/octave/site/oct/*/dateutils/tzconv.m
 %{_libdir}/octave/site/oct/*/dateutils/tzconv.mex
-%endif
 
 %changelog