From 0d8c0ae78bedd312111e0c03076dd986bf8e1f9d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Jun 07 2018 20:02:46 +0000 Subject: 3.2.21 --- diff --git a/.gitignore b/.gitignore index b44c0a2..92b3cc0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /uranium-lulzbot-2.6.63.tar.gz /uranium-lulzbot-2.6.66.tar.gz /uranium-lulzbot-2.6.69.tar.gz +/uranium-lulzbot-3.2.21.tar.gz diff --git a/python-uranium-lulzbot.spec b/python-uranium-lulzbot.spec index 437af19..a8e3515 100644 --- a/python-uranium-lulzbot.spec +++ b/python-uranium-lulzbot.spec @@ -1,7 +1,7 @@ %global shortname uranium-lulzbot Name: python-%{shortname} -Version: 2.6.69 +Version: 3.2.21 Release: 1%{?dist} Summary: A Python framework for building desktop applications (Lulzbot fork) # UM/SortedList.py is ASL 2.0 @@ -10,14 +10,17 @@ License: AGPLv3+ and ASL 2.0 URL: https://code.alephobjects.com/diffusion/U/repository/master/ # git clone https://code.alephobjects.com/diffusion/U/uranium.git # cd uranium -# git checkout v2.6.69 -# git archive --format=tar.gz --prefix=uranium-lulzbot-%%{version}/ v2.6.69 > ../uranium-lulzbot-%%{version}.tar.gz +# git checkout v3.2.21 +## CANNOT use git archive here, because we need to scrape the hash for version +# cd .. +# mv uranium %%{shortname}-%%{version} +# tar cvfz %%{shortname}-%%{version}.tar.gz %%{shortname}-%%{version} Source0: %{shortname}-%{version}.tar.gz # Cannot conflict -Patch1: %{shortname}-2.6.19-system.patch +Patch1: %{shortname}-3.2.17-system.patch # Fix tests -Patch2: %{shortname}-2.6.63-fix-test.patch +Patch2: %{shortname}-3.2.17-fix-test.patch BuildRequires: python3-devel BuildRequires: /usr/bin/doxygen @@ -66,6 +69,14 @@ related applications. This is for the Lulzbot fork. %patch1 -p1 -b .system %patch2 -p1 -b .fixtest +GITHASH=`git rev-parse HEAD` + +cat > version.json << EOF +{ + "uranium": "$GITHASH" +} +EOF + # Upstream installs to lib/python3/dist-packages # We want to install to %%{python3_sitelib} sed -i 's|lib/python${PYTHON_VERSION_MAJOR}/dist-packages|%(echo %{python3_sitelib} | sed -e s@%{_prefix}/@@)|g' CMakeLists.txt @@ -106,15 +117,20 @@ for i in locale/*/LC_MESSAGES; do done popd +cp version.json %{buildroot}%{_datadir}/%{shortname}/ + %find_lang %{shortname} %check +# test code now tries to load cura, which we don't want as a dep, since it makes a loop +%if 0 pip3 freeze # The failing tests are reported at: # https://github.com/Ultimaker/Uranium/issues/225 # Skipping %{__python3} -m pytest -v -k "not getMimeTypeForFile" +%endif %files -n python3-%{shortname} -f %{shortname}.lang %license LICENSE @@ -131,6 +147,21 @@ pip3 freeze %doc html %changelog +* Wed May 23 2018 Tom Callaway - 3.2.21-1 +- update to 3.2.21 + +* Wed May 23 2018 Tom Callaway - 3.2.20-1 +- update to 3.2.20 + +* Wed May 9 2018 Tom Callaway - 3.2.19-1 +- update to 3.2.19 + +* Mon Apr 23 2018 Tom Callaway - 3.2.18-1 +- update to 3.2.18 + +* Mon Apr 16 2018 Tom Callaway - 3.2.17-1 +- update to 3.2.17 + * Wed Mar 14 2018 Tom Callaway - 2.6.69-1 - update to 2.6.69 diff --git a/sources b/sources index b706eba..f82152e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uranium-lulzbot-2.6.69.tar.gz) = afad8f1889708b115f5227c16bca31f51c8d722b4a3758984d311d363a992743a929ee4615868e7e34cd805bf7d6e156bdc47888541992cbf52eded9cfc5f62a +SHA512 (uranium-lulzbot-3.2.21.tar.gz) = 2c84c12ca721fe033bc1181e9282aaa89ca2ccdea060485ca19e1dab6f9910f15b7331071c7008bfbe4a1228b06845a3b08dc6e7f749816b175dfa44122b732b diff --git a/uranium-lulzbot-3.2.17-fix-test.patch b/uranium-lulzbot-3.2.17-fix-test.patch new file mode 100644 index 0000000..99e8849 --- /dev/null +++ b/uranium-lulzbot-3.2.17-fix-test.patch @@ -0,0 +1,15 @@ +diff -up uranium-lulzbot-3.2.17/tests/Settings/TestSettingInstance.py.fixtest uranium-lulzbot-3.2.17/tests/Settings/TestSettingInstance.py +--- uranium-lulzbot-3.2.17/tests/Settings/TestSettingInstance.py.fixtest 2018-04-16 15:13:51.205325191 -0400 ++++ uranium-lulzbot-3.2.17/tests/Settings/TestSettingInstance.py 2018-04-16 15:14:01.956083971 -0400 +@@ -18,6 +18,11 @@ class MockContainer(): + + self._instances = [] + ++ ## We do not really care about the metadataEntry here ++ # We just return "user". ++ def getMetaDataEntry(self, entry, default = None): ++ return "user" ++ + def getProperty(self, key, property_name, context = None): + for instance in self._instances: + if instance.definition.key == key: diff --git a/uranium-lulzbot-3.2.17-system.patch b/uranium-lulzbot-3.2.17-system.patch new file mode 100644 index 0000000..5954425 --- /dev/null +++ b/uranium-lulzbot-3.2.17-system.patch @@ -0,0 +1,50 @@ +diff -up uranium-lulzbot-3.2.17/CMakeLists.txt.system uranium-lulzbot-3.2.17/CMakeLists.txt +--- uranium-lulzbot-3.2.17/CMakeLists.txt.system 2018-02-27 22:14:25.000000000 -0500 ++++ uranium-lulzbot-3.2.17/CMakeLists.txt 2018-04-16 15:11:15.976808134 -0400 +@@ -1,4 +1,4 @@ +-project(uranium NONE) ++project(uranium-lulzbot NONE) + + cmake_minimum_required(VERSION 2.8.12) + +@@ -61,15 +61,15 @@ if(NOT PYTHON_SITE_PACKAGES_DIR) + set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE STRING "Directory to install Python bindings to") + endif() + set(URANIUM_INSTALL_MODULES_PATH ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ ) +- set(URANIUM_INSTALL_PLUGINS_PATH lib/uranium) ++ set(URANIUM_INSTALL_PLUGINS_PATH lib/uranium-lulzbot) + else() + set(URANIUM_INSTALL_MODULES_PATH ${CMAKE_INSTALL_DATADIR}/cmake/Modules/) +- set(URANIUM_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/uranium ) ++ set(URANIUM_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/uranium-lulzbot ) + endif() + +-install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR}) ++install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot) + install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake DESTINATION ${URANIUM_INSTALL_MODULES_PATH}) +-install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium) ++install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium-lulzbot) + install(DIRECTORY plugins DESTINATION ${URANIUM_INSTALL_PLUGINS_PATH} ) + + include(CPackConfig.cmake) +diff -up uranium-lulzbot-3.2.17/UM/Application.py.system uranium-lulzbot-3.2.17/UM/Application.py +--- uranium-lulzbot-3.2.17/UM/Application.py.system 2018-02-27 22:14:25.000000000 -0500 ++++ uranium-lulzbot-3.2.17/UM/Application.py 2018-04-16 15:10:10.473277870 -0400 +@@ -64,7 +64,7 @@ class Application: + Resources.ApplicationVersion = version + + Resources.addSearchPath(os.path.join(os.path.dirname(sys.executable), "resources")) +- Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "share", "uranium", "resources")) ++ Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "share", "uranium-lulzbot", "resources")) + Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "Resources", "uranium", "resources")) + Resources.addSearchPath(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "resources")) + if hasattr(sys, "frozen"): +@@ -113,7 +113,7 @@ class Application: + + self._plugin_registry = PluginRegistry.getInstance() + +- self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium")) ++ self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium-lulzbot")) + self._plugin_registry.addPluginLocation(os.path.join(os.path.dirname(sys.executable), "plugins")) + self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", "uranium", "plugins")) + self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "plugins"))