rename HandBrake, remove audacity-freeworld, fix terra ffmpeg

port #2878
fix audacity version
2026-05-31 09:01:55 +00:00 · 2025-01-05 15:29:34 +07:00 · 2025-01-05 13:15:04 +07:00 · 2025-01-04 18:13:33 -06:00 · 2025-01-04 18:07:07 -06:00 · 2025-01-04 18:04:36 -06:00
10 changed files with 27 additions and 15 deletions
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "audacity-freeworld.spec"
-	}
-}
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "audacity.spec"
+	}
+	labels {
+		extra = 1
+	}
+}
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 Name:           opengamepadui
-Version:        0.35.5
+Version:        0.35.6
 Release:        1%?dist
 Summary:        Open source gamepad-native game launcher and overlay

@@ -7,5 +7,4 @@ project pkg {

        extra = 1
    }
-    arches = ["x86_64", "i386", "aarch64"]
 }
@@ -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}.
@@ -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
@@ -1,5 +1,8 @@
 project pkg {
 	rpm {
-		spec = "terra-HandBrake.spec"
+		spec = "HandBrake.spec"
+	}
+	labels {
+		extra = 1
 	}
 }
Author	SHA1	Message	Date
Cappy Ishihara	470f24b2c4	rename HandBrake, remove audacity-freeworld, fix terra ffmpeg	2025-01-05 15:29:34 +07:00
Cappy Ishihara	fd9cf8f322	port #2878	2025-01-05 13:15:04 +07:00
Owen Zimmerman	9a1fa63760	fix audacity version	2025-01-04 18:13:33 -06:00
Owen Zimmerman	aa5df18a75	spell obsoletes right	2025-01-04 18:07:07 -06:00
Owen Zimmerman	8f003f2f84	move obseletes	2025-01-04 18:04:36 -06:00
Owen Zimmerman	8bafc2331c	obselete audacity-freeworld, add to extras repo	2025-01-04 17:55:53 -06:00
Owen Zimmerman	452b5eebbf	rename audacity stuff	2025-01-04 17:50:51 -06:00
Owen Zimmerman	a79302d22c	rename audacity stuff	2025-01-04 17:50:37 -06:00
Cappy Ishihara	8d04899eb5	fix missing pointers	2025-01-05 05:12:53 +07:00
Cappy Ishihara	74a8dc3b36	Obsolete libavcodec-freeworld in favor of terra ffmpeg	2025-01-05 05:09:42 +07:00
Raboneko	d160038cf4	bump: opengamepadui	2025-01-04 16:13:24 +00:00