[3/3] rootfiles: Remove further spaces

Message ID 20230118113628.3309496-3-michael.tremer@ipfire.org
State Accepted
Commit debf583b4265507a209b76b9a144ddbcbbdb887d
Headers
Series [1/3] Config: Support rootfiles with spaces in filenames |

Commit Message

Michael Tremer Jan. 18, 2023, 11:36 a.m. UTC
  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/aarch64/boost        | 3 +--
 config/rootfiles/common/x86_64/boost         | 3 +--
 config/rootfiles/packages/python3-setuptools | 8 +++-----
 config/rootfiles/packages/tshark             | 6 ++----
 4 files changed, 7 insertions(+), 13 deletions(-)
  

Comments

Peter Müller Jan. 18, 2023, 11:26 p.m. UTC | #1
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>  config/rootfiles/common/aarch64/boost        | 3 +--
>  config/rootfiles/common/x86_64/boost         | 3 +--
>  config/rootfiles/packages/python3-setuptools | 8 +++-----
>  config/rootfiles/packages/tshark             | 6 ++----
>  4 files changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
> index 78e114983..944101a8b 100644
> --- a/config/rootfiles/common/aarch64/boost
> +++ b/config/rootfiles/common/aarch64/boost
> @@ -12774,8 +12774,7 @@
>  #usr/include/boost/serialization/boost_array.hpp
>  #usr/include/boost/serialization/boost_unordered_map.hpp
>  #usr/include/boost/serialization/boost_unordered_set.hpp
> -#usr/include/boost/serialization/collection_size_type
> -#copy.hpp
> +#usr/include/boost/serialization/collection_size_type copy.hpp
>  #usr/include/boost/serialization/collection_size_type.hpp
>  #usr/include/boost/serialization/collection_traits.hpp
>  #usr/include/boost/serialization/collections_load_imp.hpp
> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
> index fe77e6f8c..50166badc 100644
> --- a/config/rootfiles/common/x86_64/boost
> +++ b/config/rootfiles/common/x86_64/boost
> @@ -12774,8 +12774,7 @@
>  #usr/include/boost/serialization/boost_array.hpp
>  #usr/include/boost/serialization/boost_unordered_map.hpp
>  #usr/include/boost/serialization/boost_unordered_set.hpp
> -#usr/include/boost/serialization/collection_size_type
> -#copy.hpp
> +#usr/include/boost/serialization/collection_size_type copy.hpp
>  #usr/include/boost/serialization/collection_size_type.hpp
>  #usr/include/boost/serialization/collection_traits.hpp
>  #usr/include/boost/serialization/collections_load_imp.hpp
> diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
> index 3e303605d..686d8da2c 100644
> --- a/config/rootfiles/packages/python3-setuptools
> +++ b/config/rootfiles/packages/python3-setuptools
> @@ -219,8 +219,7 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_egg_info.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_lib.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_scripts.py
> -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher
> -#manifest.xml
> +usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher manifest.xml
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/py36compat.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/register.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/rotate.py
> @@ -265,12 +264,11 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/namespa
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/package_index.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/py34compat.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/sandbox.py
> -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script
> -#(dev).tmpl
> +usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script (dev).tmpl
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script.tmpl
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/unicode_utils.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/version.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/wheel.py
>  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/windows_support.py
>  #usr/lib/python3.10/site-packages/setuptools.pth
> -
> +-
> diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
> index 937ddd3d6..9fa09eed4 100644
> --- a/config/rootfiles/packages/tshark
> +++ b/config/rootfiles/packages/tshark
> @@ -755,10 +755,8 @@ usr/share/wireshark/enterprises.tsv
>  #usr/share/wireshark/profiles/Bluetooth/preferences
>  #usr/share/wireshark/profiles/Classic
>  #usr/share/wireshark/profiles/Classic/colorfilters
> -#usr/share/wireshark/profiles/No
> -#Reassembly
> -#usr/share/wireshark/profiles/No
> -#Reassembly/preferences
> +#usr/share/wireshark/profiles/No Reassembly
> +#usr/share/wireshark/profiles/No Reassembly/preferences
>  #usr/share/wireshark/radius
>  #usr/share/wireshark/radius/README.radius_dictionary
>  usr/share/wireshark/radius/custom.includes
  

Patch

diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
index 78e114983..944101a8b 100644
--- a/config/rootfiles/common/aarch64/boost
+++ b/config/rootfiles/common/aarch64/boost
@@ -12774,8 +12774,7 @@ 
 #usr/include/boost/serialization/boost_array.hpp
 #usr/include/boost/serialization/boost_unordered_map.hpp
 #usr/include/boost/serialization/boost_unordered_set.hpp
-#usr/include/boost/serialization/collection_size_type
-#copy.hpp
+#usr/include/boost/serialization/collection_size_type copy.hpp
 #usr/include/boost/serialization/collection_size_type.hpp
 #usr/include/boost/serialization/collection_traits.hpp
 #usr/include/boost/serialization/collections_load_imp.hpp
diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
index fe77e6f8c..50166badc 100644
--- a/config/rootfiles/common/x86_64/boost
+++ b/config/rootfiles/common/x86_64/boost
@@ -12774,8 +12774,7 @@ 
 #usr/include/boost/serialization/boost_array.hpp
 #usr/include/boost/serialization/boost_unordered_map.hpp
 #usr/include/boost/serialization/boost_unordered_set.hpp
-#usr/include/boost/serialization/collection_size_type
-#copy.hpp
+#usr/include/boost/serialization/collection_size_type copy.hpp
 #usr/include/boost/serialization/collection_size_type.hpp
 #usr/include/boost/serialization/collection_traits.hpp
 #usr/include/boost/serialization/collections_load_imp.hpp
diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
index 3e303605d..686d8da2c 100644
--- a/config/rootfiles/packages/python3-setuptools
+++ b/config/rootfiles/packages/python3-setuptools
@@ -219,8 +219,7 @@  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_egg_info.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_lib.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_scripts.py
-#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher
-#manifest.xml
+usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher manifest.xml
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/py36compat.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/register.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/rotate.py
@@ -265,12 +264,11 @@  usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/namespa
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/package_index.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/py34compat.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/sandbox.py
-#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script
-#(dev).tmpl
+usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script (dev).tmpl
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script.tmpl
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/unicode_utils.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/version.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/wheel.py
 usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/windows_support.py
 #usr/lib/python3.10/site-packages/setuptools.pth
-
+-
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index 937ddd3d6..9fa09eed4 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -755,10 +755,8 @@  usr/share/wireshark/enterprises.tsv
 #usr/share/wireshark/profiles/Bluetooth/preferences
 #usr/share/wireshark/profiles/Classic
 #usr/share/wireshark/profiles/Classic/colorfilters
-#usr/share/wireshark/profiles/No
-#Reassembly
-#usr/share/wireshark/profiles/No
-#Reassembly/preferences
+#usr/share/wireshark/profiles/No Reassembly
+#usr/share/wireshark/profiles/No Reassembly/preferences
 #usr/share/wireshark/radius
 #usr/share/wireshark/radius/README.radius_dictionary
 usr/share/wireshark/radius/custom.includes