rename HandBrake, remove audacity-freeworld, fix terra ffmpeg

anda/apps/audacity-freeworld/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "audacity-freeworld.spec"
-	}
-}

anda/apps/audacity/anda.hcl

@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "audacity.spec"
+	}
+	labels {
+		extra = 1
+	}
+}

anda/apps/audacity/audacity.spec

@@ -1,8 +1,8 @@
 %global __requires_exclude ^lib-.*.so            
 %global __provides_exclude ^lib-.*.so
 
-Name:    audacity-freeworld
-Version: Audacity.3.7.1
+Name:    audacity
+Version: 3.7.1
 Release: 1%?dist
 Summary: Multitrack audio editor
 License: GPLv2
@@ -13,6 +13,8 @@ Conflicts: %{realname}
 
 Source0: https://github.com/audacity/audacity/releases/download/Audacity-%{version}/audacity-sources-%{version}.tar.gz
 
+Obsoletes: audacity-freeworld < %{version}
+
 # manual can be installed from the base Fedora Audacity package.
 
 BuildRequires: cmake

anda/fusion/ffmpeg/ffmpeg.spec

@@ -253,7 +253,7 @@ Conflicts:      libpostproc-free
 Conflicts:      libswresample-free
 Conflicts:      libswscale-free
 %{?_with_vmaf:Recommends:     vmaf-models}
-Provides: libavcodec-freeworld = %{version}-%{release}
+Provides: libavcodec = %{version}-%{release}
 
 %description    libs
 FFmpeg is a complete and free Internet live audio and video
@@ -287,13 +287,14 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
 This package contains development files for %{name}
 
 %if %{with libavcodec_freeworld}
-%package -n     libavcodec-freeworld
+%package -n     libavcodec
 Summary:        Freeworld libavcodec to complement the distro counterparts
 # Supplements doesn't work well yet - we can rely on comps for now
 #Supplements:    libavcodec-free >= %%{version}
 Conflicts: libavcodec-free < %{version}
+Obsoletes: libavcodec-freeworld < %{version}
 
-%description -n libavcodec-freeworld
+%description -n libavcodec
 Freeworld libavcodec to complement the distro counterparts
 %endif
 
@@ -536,7 +537,7 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
 %{_libdir}/lib*.so
 
 %if %{with libavcodec_freeworld}
-%files -n libavcodec-freeworld
+%files -n libavcodec
 %{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
 %{_libdir}/%{name}/libavcodec.so.*
 %endif

anda/lib/mesa/anda.hcl

@@ -7,5 +7,4 @@ project pkg {
 
         extra = 1
     }
-    arches = ["x86_64", "i386", "aarch64"]
 }

anda/lib/mesa/mesa.spec

@@ -257,6 +257,7 @@ Recommends:     %{name}-va-drivers%{?_isa}
 Summary:        Mesa-based VA-API video acceleration drivers
 Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
+Obsoletes:      %{name}-va-drivers-freeworld
 
 %description va-drivers
 %{summary}.
@@ -266,6 +267,7 @@ Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
 %package        vdpau-drivers
 Summary:        Mesa-based VDPAU drivers
 Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-vdpau-drivers-freeworld
 
 %description vdpau-drivers
 %{summary}.

anda/tools/handbrake/HandBrake.spec

@@ -16,11 +16,12 @@
 
 %global desktop_id fr.handbrake.ghb
 
-Name:           terra-HandBrake
+Name:           HandBrake
 Version:        1.6.1
 Release:        1%?dist
 Summary:        An open-source multiplatform video transcoder
 License:        GPL-2.0-or-later
+Obsoletes:      terra-%{name} < %{version}
 URL:            https://handbrake.fr/
 
 %if 0%{?tag:1}
@@ -125,6 +126,7 @@ This package contains the command line version of the program.
 Summary:        An open-source multiplatform video transcoder (GUI)
 Provides:       handbrake-gui = %version-%release
 Requires:       hicolor-icon-theme
+Obsoletes:      terra-%{name}-gui < %{version}
 # needed for reading encrypted DVDs
 %{?fedora:Recommends:     libdvdcss%_isa}
 # needed for live preview

anda/tools/handbrake/anda.hcl

@@ -1,5 +1,8 @@
 project pkg {
 	rpm {
-		spec = "terra-HandBrake.spec"
+		spec = "HandBrake.spec"
+	}
+	labels {
+		extra = 1
 	}
 }