diff --git a/_service b/_service index 7aec62f..fb7c418 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v9.20 + refs/tags/v9.21 v*.* git diff --git a/baselibs.conf b/baselibs.conf index e1f0b47..11c8ba3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -29,3 +29,4 @@ wine requires "libGLU.so.1" provides "wine- = -" conflicts "otherproviders(wine-)" +wine-devel diff --git a/get-sources.sh b/get-sources.sh index 9a98d08..701c313 100644 --- a/get-sources.sh +++ b/get-sources.sh @@ -15,7 +15,8 @@ echo "++++++++++++++++++++++++++++++++++++++++++++++" sed -i -e 's|Version: .*|Version: '${VERSION}'|g' wine.spec osc service mr download_files -curl -L -o wine-staging-${VERSION}.tar.gz https://github.com/wine-staging/wine-staging/archive/refs/tags/v${VERSION}.tar.gz +sed -i -e "s|tags/v.*<|tags/v${VERSION}<|g" _service +osc service dr echo "++++++++++++++++++++++++++++++++++++++++++++++" echo "Done! Have fun building and testing" diff --git a/wine-staging-9.21.tar.gz b/wine-staging-9.21.tar.gz deleted file mode 100644 index fe1cde9..0000000 --- a/wine-staging-9.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e8c9cf9e378f99de133c7d86f9f0d5d506305869f4c802cb598f97b2f6bf8a6 -size 9564841 diff --git a/wine-staging-9.21.tar.xz b/wine-staging-9.21.tar.xz new file mode 100644 index 0000000..fda06c5 --- /dev/null +++ b/wine-staging-9.21.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dc224ccdb33ddceb8cbc1240e386ad56c410792e6f63c6926c47e179aaa05dd +size 7266088 diff --git a/wine.changes b/wine.changes index 961421a..90c0d00 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 10 09:35:28 UTC 2024 - Marcus Meissner + +- readd wine-devel to baselibs.conf +- readd _service and adjust get-sources.sh +- readd find-requires + ------------------------------------------------------------------- Sat Nov 9 00:56:55 UTC 2024 - Richard Rahl diff --git a/wine.spec b/wine.spec index 8f34ddb..99e712c 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine +# spec file # # Copyright (c) 2024 SUSE LLC # @@ -45,7 +45,7 @@ Source0: https://dl.winehq.org/wine/source/9.x/wine-%{version}.tar.xz Source1: https://dl.winehq.org/wine/source/9.x/wine-%{version}.tar.xz.sign Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xda23579a74d4ad9af9d3f945cefac8eaaf17519d#/wine.keyring %if %{staging} -Source3: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz +Source3: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.xz %endif Source97: baselibs.conf Source98: wine.rpmlintrc @@ -268,6 +268,21 @@ find %{buildroot}/usr/lib*/wine/*-windows/ -type f -exec strip --strip-debug {} rm -rf %{buildroot}%{_mandir}/{pl,de,fr}.UTF-8 +# find the implicit dependencies +%define winedir %_builddir/%projectname-%realver +cat >%winedir/my-find-requires.sh <