thunderbird fixes for 8

ROCKY/CFG/mail.cfg

@@ -35,38 +35,38 @@ spec_change {
   }
 
   # Add all plus changes here
-  append {
-      field: "Release"
-      value: "%{?with_rlplus:.plus}"
-  }
+#  append {
+#      field: "Release"
+#      value: "%{?with_rlplus:.plus}"
+#  }
   
-  search_and_replace {
-      any: true
-      find: "Summary:"
-      replace: "%bcond_with rlplus\nSummary:"
-      n: 1
-  }
+#  search_and_replace {
+#      any: true
+#      find: "Summary:"
+#      replace: "%bcond_with rlplus\nSummary:"
+#      n: 1
+#  }
 
-  search_and_replace {
-      any: true
-      find: "Patch237:        disable-openpgp-in-thunderbird.patch"
-      replace: "%if %{without rlplus}\nPatch237:        disable-openpgp-in-thunderbird.patch\n%endif"
-      n: 1
-  }
+#  search_and_replace {
+#      any: true
+#      find: "Patch237:        disable-openpgp-in-thunderbird.patch"
+#      replace: "%if %{without rlplus}\nPatch237:        disable-openpgp-in-thunderbird.patch\n%endif"
+#      n: 1
+#  }
 
-  search_and_replace {
-      any: true
-      find: "%patch237 -p1 -b .disable-openpgp-in-thunderbird"
-      replace: "%if %{without rlplus}\n%patch237 -p1 -b .disable-openpgp-in-thunderbird\n%endif"
-      n: 1
-  }
+#  search_and_replace {
+#      any: true
+#      find: "%patch237 -p1 -b .disable-openpgp-in-thunderbird"
+#      replace: "%if %{without rlplus}\n%patch237 -p1 -b .disable-openpgp-in-thunderbird\n%endif"
+#      n: 1
+#  }
 
-  search_and_replace {
-      any: true
-      find: "%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so"
-      replace: "%if %{without rlplus}\n%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so\n%endif"
-      n: 1
-  }
+#  search_and_replace {
+#      any: true
+#      find: "%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so"
+#      replace: "%if %{without rlplus}\n%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so\n%endif"
+#      n: 1
+#  }
   # End plus
 
   changelog {
@@ -76,5 +76,5 @@ spec_change {
       message: "Add rlplus conditional"
   }
 
-  disable_auto_align: true
+#  disable_auto_align: true
 }