- updated to 2.0.0

- removed outdated mono4 patch

diff --git a/chronojump-mono4.patch b/chronojump-mono4.patch
deleted file mode 100644 (file)
index ed6939a..0000000
--- a/chronojump-mono4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- chronojump-1.9.0/build/m4/shamrock/mono.m4.orig    2019-07-22 17:19:43.000000000 +0200
-+++ chronojump-1.9.0/build/m4/shamrock/mono.m4 2019-10-09 16:24:49.391237247 +0200
-@@ -92,6 +92,11 @@
-       _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
- ])
- 
-+AC_DEFUN([SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES],
-+[
-+      _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5, $*)
-+])
-+
- AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
- [
-       _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
---- chronojump-1.9.0/configure.ac.orig 2019-07-22 17:19:43.000000000 +0200
-+++ chronojump-1.9.0/configure.ac      2019-10-09 16:26:59.353866512 +0200
-@@ -63,6 +63,15 @@
- dnl Mono and C# compiler
- dnl Check first for a 4.0 compiler or than fallback to 2.0
- SHAMROCK_CHECK_MONO_MODULE(2.4.0)
-+PKG_CHECK_EXISTS([mono >= 4.5],
-+              [SHAMROCK_FIND_MONO_4_0_COMPILER
-+              SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([
-+                      System.Data
-+                      Mono.Cairo
-+                      Mono.Posix
-+                      Mono.Data.Sqlite
-+              ])]
-+,[
- PKG_CHECK_EXISTS([mono >= 2.8],
-               [SHAMROCK_FIND_MONO_4_0_COMPILER
-               SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
-@@ -78,7 +87,7 @@
-                       Mono.Cairo
-                       Mono.Posix
-                       Mono.Data.Sqlite
--              ])])
-+              ])])])
- AC_SUBST(MCS, ["$MCS"])
- SHAMROCK_FIND_MONO_RUNTIME
- 

diff --git a/chronojump.spec b/chronojump.spec
index af8322adb7e9279b365a00649d6bf9f74cd10592..499a5cab0a70a21105fa3e9f7e0094ecd4cfc4a3 100644 (file)
--- a/chronojump.spec
+++ b/chronojump.spec
@@ -1,17 +1,16 @@
 Summary:       ChronoJump - system for measurement, management and statistics of the jump events
 Summary(pl.UTF-8):     ChronoJump - system do pomiarów, zarządzania i statystyk skoków
 Name:          chronojump
-Version:       1.9.0
+Version:       2.0.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 # release file misses many files
-#Source0:      http://ftp.gnome.org/pub/GNOME/sources/chronojump/1.9/%{name}-%{version}.tar.xz
-## Source0-md5:        6e7f09b7ec9ec2e2bc172b9e95d4db3e
+#Source0:      http://ftp.gnome.org/pub/GNOME/sources/chronojump/2.0/%{name}-%{version}.tar.xz
+## Source0-md5:        6af7450421e386cf6d5d0cc3e9cd6bac
 # ...so use git
 Source0:       https://gitlab.gnome.org/GNOME/chronojump/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 9345a0ebe6a5e8652b65b5b6883a3db1
-Patch0:                %{name}-mono4.patch
+# Source0-md5: 4de037421779f885a415259672ece65b
 URL:           http://chronojump.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -42,9 +41,12 @@ nauczycieli oraz uczniów.
 
 %prep
 %setup -q
-%patch0 -p1
 
-%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' chronopic-firmware/chronopic-firmwarecord/chronopic-firmwarecord.in
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' \
+       chronopic-firmware/chronopic-firmwarecord/chronopic-firmwarecord.in \
+       rfid/{MFRC522,chronojump_rfid_capture}.py
+
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' src/chronojump-importer/chronojump_importer.py
 
 %build
 %{__intltoolize}
@@ -64,6 +66,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/chronojump/*.la
+# too common name
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/test-delete.py
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/chronojump/*.pdf
@@ -81,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS README TODO.txt manual/{chronojump_crash,chronojump_manual_en,troubleshooting}.pdf
+%doc AUTHORS MAINTAINERS README TODO.txt manual/chronojump_manual_en.pdf
 %lang(es) %doc manual/chronojump_manual_es.pdf
 %attr(755,root,root) %{_bindir}/MFRC522.py
 %attr(755,root,root) %{_bindir}/chronojump
@@ -92,7 +96,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/chronojump_mini
 %attr(755,root,root) %{_bindir}/chronojump_rfid_capture.py
 %attr(755,root,root) %{_bindir}/chronopic-firmwarecord
-%attr(755,root,root) %{_bindir}/test-delete.py
 %dir %{_libdir}/chronojump
 %attr(755,root,root) %{_libdir}/chronojump/libchronopic.so*
 %{_libdir}/chronojump/Chronojump.exe