Hello community, here is the log from the commit of package nasc for openSUSE:Factory checked in at 2018-11-06 14:39:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nasc (Old) and /work/SRC/openSUSE:Factory/.nasc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nasc" Tue Nov 6 14:39:49 2018 rev:3 rq:646459 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nasc/nasc.changes 2018-04-16 12:49:45.955416770 +0200 +++ /work/SRC/openSUSE:Factory/.nasc.new/nasc.changes 2018-11-06 14:40:27.656498836 +0100 @@ -1,0 +2,12 @@ +Mon Oct 29 19:39:23 UTC 2018 - Alexei Podvalsky <[email protected]> + +- Update to 0.5.0: + * Update com.github.parnold-x.nasc.appdata.xml + * Update Appdata Infos + * revert static lib commit because it does not work and rename + binary + * don't build libqalculatenasc shared library, but link directly +- Update nasc-0.4.7-link.patch > nasc-0.5.0-link.patch +- Spec file cleanup + +------------------------------------------------------------------- Old: ---- nasc-0.4.7-link.patch nasc-0.4.7.tar.gz New: ---- nasc-0.5.0-link.patch nasc-0.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nasc.spec ++++++ --- /var/tmp/diff_new_pack.ulEs6Q/_old 2018-11-06 14:40:29.092496667 +0100 +++ /var/tmp/diff_new_pack.ulEs6Q/_new 2018-11-06 14:40:29.092496667 +0100 @@ -1,7 +1,7 @@ # # spec file for package nasc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,20 @@ # 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/ # Name: nasc -Version: 0.4.7 +Version: 0.5.0 Release: 0 Summary: Do maths like a normal person -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Scientific/Math -Url: http://parnold-x.github.io/nasc/ +URL: http://parnold-x.github.io/nasc/ Source: https://github.com/parnold-x/nasc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM link.patch -- Build app with 'Wl,--no-undefined' and static library -Patch0: nasc-0.4.7-link.patch +Patch0: nasc-0.5.0-link.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -42,7 +42,6 @@ BuildRequires: pkgconfig(libsoup-2.4) Requires: qalculate Requires: %(rpm -qf $(readlink -qne %{_libdir}/libcln.so) --qf '%%{NAME} >= %%{VERSION}') -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description @@ -54,10 +53,7 @@ %prep %setup -q -%patch0 -p2 - -# Use appdata -sed -i 's/\/metainfo/\/appdata/' $(grep -rwl 'metainfo') +%patch0 -p1 %build %cmake \ @@ -70,6 +66,7 @@ %cmake_install %{?_smp_mflags} %post +%if 0%{?suse_version} < 1500 %glib2_gsettings_schema_post %icon_theme_cache_post %desktop_database_post @@ -78,15 +75,17 @@ %glib2_gsettings_schema_postun %icon_theme_cache_postun %desktop_database_postun +%endif %files -%defattr(-,root,root) -%doc AUTHORS COPYING README.md -%{_bindir}/%{name} -%{_datadir}/applications/com.github.parnold-x.%{name}.desktop -%{_datadir}/appdata/com.github.parnold-x.%{name}.appdata.xml -%{_datadir}/glib-2.0/schemas/com.github.parnold-x.%{name}.gschema.xml -%{_datadir}/icons/hicolor/*/apps/com.github.parnold-x.%{name}.??g +%license COPYING +%doc AUTHORS README.md +%dir %{_datadir}/metainfo +%{_bindir}/com.github.parnold-x.nasc +%{_datadir}/applications/com.github.parnold-x.nasc.desktop +%{_datadir}/glib-2.0/schemas/com.github.parnold-x.nasc.gschema.xml +%{_datadir}/icons/hicolor/*/apps/com.github.parnold-x.nasc.??g +%{_datadir}/metainfo/com.github.parnold-x.nasc.appdata.xml %{_datadir}/qalculate/ %changelog ++++++ nasc-0.4.7-link.patch -> nasc-0.5.0-link.patch ++++++ --- /work/SRC/openSUSE:Factory/nasc/nasc-0.4.7-link.patch 2018-04-16 12:49:45.803422298 +0200 +++ /work/SRC/openSUSE:Factory/.nasc.new/nasc-0.5.0-link.patch 2018-11-06 14:40:26.816500104 +0100 @@ -1,25 +1,26 @@ -diff -ruN nasc-0.4.7.orig/nasc-0.4.7/CMakeLists.txt nasc-0.4.7/nasc-0.4.7/CMakeLists.txt ---- nasc-0.4.7.orig/nasc-0.4.7/CMakeLists.txt 2018-03-26 21:05:02.000000000 +0300 -+++ nasc-0.4.7/nasc-0.4.7/CMakeLists.txt 2018-04-03 07:15:24.242242758 +0300 +diff -ruN nasc-0.5.0.orig/CMakeLists.txt nasc-0.5.0/CMakeLists.txt +--- nasc-0.5.0.orig/CMakeLists.txt 2018-10-28 17:08:46.000000000 +0300 ++++ nasc-0.5.0/CMakeLists.txt 2018-10-29 23:00:16.441822612 +0300 @@ -101,7 +101,8 @@ - target_link_libraries(nasc + target_link_libraries(com.github.parnold-x.nasc ${QALCULATE_LIB_PATH} ${DEPS_LIBRARIES} - qalculatenasc) + qalculatenasc + -lcln) - install (TARGETS nasc RUNTIME DESTINATION bin) + install (TARGETS com.github.parnold-x.nasc RUNTIME DESTINATION bin) -diff -ruN nasc-0.4.7.orig/nasc-0.4.7/libqalculatenasc/CMakeLists.txt nasc-0.4.7/nasc-0.4.7/libqalculatenasc/CMakeLists.txt ---- nasc-0.4.7.orig/nasc-0.4.7/libqalculatenasc/CMakeLists.txt 2018-03-26 21:05:02.000000000 +0300 -+++ nasc-0.4.7/nasc-0.4.7/libqalculatenasc/CMakeLists.txt 2018-04-03 07:47:10.736822446 +0300 -@@ -2,6 +2,6 @@ +diff -ruN nasc-0.5.0.orig/libqalculatenasc/CMakeLists.txt nasc-0.5.0/libqalculatenasc/CMakeLists.txt +--- nasc-0.5.0.orig/libqalculatenasc/CMakeLists.txt 2018-10-28 17:08:46.000000000 +0300 ++++ nasc-0.5.0/libqalculatenasc/CMakeLists.txt 2018-10-29 23:01:10.873982908 +0300 +@@ -1,7 +1,7 @@ + pkg_check_modules(QALC REQUIRED libqalculate) link_directories(${QALC_LIBRARY_DIRS}) include_directories(${QALC_INCLUDE_DIRS}) - --add_library(qalculatenasc SHARED -+add_library(qalculatenasc STATIC +- add_library(qalculatenasc SHARED ++ add_library(qalculatenasc STATIC QalculateNasc.cc) -target_link_libraries(qalculatenasc ${QALC_LIBRARIES}) +target_link_libraries(qalculatenasc ${QALC_LIBRARIES} -lcln) + ++++++ nasc-0.4.7.tar.gz -> nasc-0.5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.4.7/.travis.yml new/nasc-0.5.0/.travis.yml --- old/nasc-0.4.7/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/nasc-0.5.0/.travis.yml 2018-10-28 15:08:46.000000000 +0100 @@ -0,0 +1,22 @@ +language: node_js + +node_js: + - lts/* + +sudo: required + +services: + - docker + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libstdc++-5-dev + +install: + - npm i -g @elementaryos/houston + +script: + - houston ci diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.4.7/CMakeLists.txt new/nasc-0.5.0/CMakeLists.txt --- old/nasc-0.4.7/CMakeLists.txt 2018-03-26 20:05:02.000000000 +0200 +++ new/nasc-0.5.0/CMakeLists.txt 2018-10-28 15:08:46.000000000 +0100 @@ -1,5 +1,5 @@ -project (nasc) -cmake_minimum_required (VERSION 3.1) +project (com.github.parnold-x.nasc) +cmake_minimum_required (VERSION 2.8) cmake_policy (VERSION 2.6) include(GNUInstallDirs) @@ -95,15 +95,15 @@ include_directories(${CMAKE_BINARY_DIR}) include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/libqalculatenasc) -add_executable(nasc ${VALA_C}) -add_dependencies(nasc +add_executable(com.github.parnold-x.nasc ${VALA_C}) +add_dependencies(com.github.parnold-x.nasc qalculatenasc) -target_link_libraries(nasc +target_link_libraries(com.github.parnold-x.nasc ${QALCULATE_LIB_PATH} ${DEPS_LIBRARIES} qalculatenasc) -install (TARGETS nasc RUNTIME DESTINATION bin) +install (TARGETS com.github.parnold-x.nasc RUNTIME DESTINATION bin) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold-x.nasc.desktop DESTINATION share/applications) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold-x.nasc.appdata.xml DESTINATION share/metainfo) Binary files old/nasc-0.4.7/Screenshot2.png and new/nasc-0.5.0/Screenshot2.png differ Binary files old/nasc-0.4.7/Screenshot3.png and new/nasc-0.5.0/Screenshot3.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.4.7/data/com.github.parnold-x.nasc.appdata.xml new/nasc-0.5.0/data/com.github.parnold-x.nasc.appdata.xml --- old/nasc-0.4.7/data/com.github.parnold-x.nasc.appdata.xml 2018-03-26 20:05:02.000000000 +0200 +++ new/nasc-0.5.0/data/com.github.parnold-x.nasc.appdata.xml 2018-10-28 15:08:46.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017 Peter Arnold <[email protected]> --> <component type="desktop"> - <id>com.github.parnold-x.nasc.desktop</id> + <id>com.github.parnold-x.nasc</id> <metadata_license>CC0</metadata_license> <project_license>GPL-3.0+</project_license> <name>NaSC</name> @@ -10,13 +10,55 @@ <p>It’s an app where you do maths like a normal person. It lets you type whatever you want and smartly figures out what is math and spits out an answer on the right pane. Then you can plug those answers in to future equations and if that answer changes, so does the equations it’s used in.</p> </description> <provides> - <binary>nasc</binary> + <binary>com.github.parnold-x.nasc</binary> </provides> + <releases> + <release version="0.5.0" date="2018-20-28"> + <description> + <p>Release for Juno</p> + </description> + </release> + </releases> <screenshots> <screenshot type="default"> <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot.png</image> </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot2.png</image> + </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot3.png</image> + </screenshot> </screenshots> + <content_rating type="oars-1.1"> + <content_attribute id="violence-cartoon">none</content_attribute> + <content_attribute id="violence-fantasy">none</content_attribute> + <content_attribute id="violence-realistic">none</content_attribute> + <content_attribute id="violence-bloodshed">none</content_attribute> + <content_attribute id="violence-sexual">none</content_attribute> + <content_attribute id="violence-desecration">none</content_attribute> + <content_attribute id="violence-slavery">none</content_attribute> + <content_attribute id="violence-worship">none</content_attribute> + <content_attribute id="drugs-alcohol">none</content_attribute> + <content_attribute id="drugs-narcotics">none</content_attribute> + <content_attribute id="drugs-tobacco">none</content_attribute> + <content_attribute id="sex-nudity">none</content_attribute> + <content_attribute id="sex-themes">none</content_attribute> + <content_attribute id="sex-homosexuality">none</content_attribute> + <content_attribute id="sex-prostitution">none</content_attribute> + <content_attribute id="sex-adultery">none</content_attribute> + <content_attribute id="sex-appearance">none</content_attribute> + <content_attribute id="language-profanity">none</content_attribute> + <content_attribute id="language-humor">none</content_attribute> + <content_attribute id="language-discrimination">none</content_attribute> + <content_attribute id="social-chat">none</content_attribute> + <content_attribute id="social-info">mild</content_attribute> + <content_attribute id="social-audio">none</content_attribute> + <content_attribute id="social-location">none</content_attribute> + <content_attribute id="social-contacts">none</content_attribute> + <content_attribute id="money-purchasing">none</content_attribute> + <content_attribute id="money-gambling">none</content_attribute> + </content_rating> <developer_name>Peter Arnold</developer_name> <url type="homepage">https://github.com/parnold-x/nasc</url> <url type="bugtracker">https://github.com/parnold-x/nasc/issues</url> @@ -24,5 +66,6 @@ <custom> <value key="x-appcenter-color-primary">#3278cd</value> <value key="x-appcenter-color-primary-text">rgb(157, 200, 236)</value> + <value key="x-appcenter-suggested-price">8</value> </custom> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.4.7/data/com.github.parnold-x.nasc.desktop new/nasc-0.5.0/data/com.github.parnold-x.nasc.desktop --- old/nasc-0.4.7/data/com.github.parnold-x.nasc.desktop 2018-03-26 20:05:02.000000000 +0200 +++ new/nasc-0.5.0/data/com.github.parnold-x.nasc.desktop 2018-10-28 15:08:46.000000000 +0100 @@ -3,8 +3,8 @@ Name=NaSC Comment=Do maths like a normal person GenericName=NaSC -TryExec=nasc -Exec=nasc +TryExec=com.github.parnold-x.nasc +Exec=com.github.parnold-x.nasc Icon=com.github.parnold-x.nasc Terminal=false Categories=Utility;Calculator;Education;Science; @@ -12,4 +12,4 @@ [Desktop Action AboutDialog] Name=About NaSC -Exec=nasc --about +Exec=com.github.parnold-x.nasc --about diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.4.7/libqalculatenasc/CMakeLists.txt new/nasc-0.5.0/libqalculatenasc/CMakeLists.txt --- old/nasc-0.4.7/libqalculatenasc/CMakeLists.txt 2018-03-26 20:05:02.000000000 +0200 +++ new/nasc-0.5.0/libqalculatenasc/CMakeLists.txt 2018-10-28 15:08:46.000000000 +0100 @@ -1,7 +1,7 @@ pkg_check_modules(QALC REQUIRED libqalculate) link_directories(${QALC_LIBRARY_DIRS}) include_directories(${QALC_INCLUDE_DIRS}) - -add_library(qalculatenasc SHARED + add_library(qalculatenasc SHARED QalculateNasc.cc) target_link_libraries(qalculatenasc ${QALC_LIBRARIES}) +
