20 Dec '23
The package rpms/eccodes.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=c31f1653f716….
Change:
-ExcludeArch: armv7hl
Thanks.
Full change:
============
commit c31f1653f7164c53c0370d6c125113535def6ac6
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sat Dec 16 19:33:29 2023 -0700
Update to 2.33.0
diff --git a/.gitignore b/.gitignore
index d9d0b74..d311f8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/eccodes-2.31.0-Source.tar.gz
/eccodes-2.32.1-Source.tar.gz
/eccodes_test_data_20231101.tar.gz
+/eccodes-2.33.0-Source.tar.gz
+/eccodes_test_data_20231216.tar.gz
diff --git a/eccodes.spec b/eccodes.spec
index 369dfa9..95e9004 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,10 @@
+%if 0%{?el8}
+%undefine __cmake_in_source_build
+%endif
+
Name: eccodes
-Version: 2.32.1
-Release: 2%{?dist}
+Version: 2.33.0
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -10,7 +14,7 @@ Summary: WMO data format decoding and encoding
# note that the test_data package provided on the ECMWF version
# is unversioned, so use the download date to discriminate
# between different versions.
-%global datapack_date 20231101
+%global datapack_date 20231216
# latest fedora-38/rawhide grib_api version is 1.27.0-18
# but this version number is to be updated as soon as we know
@@ -43,7 +47,7 @@ Source0: https://confluence.ecmwf.int/download/attachments/45757960/eccod
# note: this data package is unversioned upstream but still it is updated
# now and then so rename the datapack using the download date
# to make it versioned in fedora
-Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccod…
+Source1: https://get.ecmwf.int/repository/test-data/eccodes/eccodes_test_data.tar.gz…
# a custom script to create man pages
Source2: eccodes_create_man_pages.sh
@@ -105,8 +109,6 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
-# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -355,6 +357,9 @@ ctest3 -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Sun Dec 17 2023 Orion Poplawski <orion(a)nwra.com> - 2.33.0-1
+- Update to 2.33.0
+
* Sun Nov 26 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-2
- rebuild after so name jump of libjasper
diff --git a/sources b/sources
index 28e346c..e1bf13e 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,2 @@
-SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d42637607423669351b6cd295b111a382f6d9ecb05ffe25f79599bf3963550ca27d84e7f9ef55e499e183a35f
-SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a
-SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa
-SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c
-SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f
-SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993
-SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00
-SHA512 (eccodes-2.31.0-Source.tar.gz) = f3fe70ad0a765ae6e9d23b1b0c6ac96ad81a8324b15b7ebbcc958ffa1a046079d4a9953d720a8c15ac421897059a74c96ea678254f59c88538e3dd4970da131c
-SHA512 (eccodes-2.32.1-Source.tar.gz) = 7fdb34cee0b656ebbecc04d654642b0524eb6e772c1d811471061698f4ec2d31da3be3d66ee697dd3e106f3e8024058b4c165c6dad59868af66a38949c956c77
-SHA512 (eccodes_test_data_20231101.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e
+SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df980a57ce21e04ef98d1d7e02f10ef363a497d29f086b1f17a86ba4e46bf14898cd227eae8bbe0297c62b4183
+SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e
commit fa6f919939a62336ddfc46aae5b3bb76e9f8f032
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Nov 26 11:56:33 2023 +0100
remove outdated rpmlintrc file
diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc
deleted file mode 100644
index b6c8fb4..0000000
--- a/eccodes.rpmlintrc
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Disable warning on duplicate files.
-# This package uses a huge number (1990 cases at the time of wrinting)
-# duplicates in the tables definitions, and patching this is totally
-# out of scope for my limited time.
-addFilter(r" W: files-duplicate ")
-addFilter(r" E: files-duplicated-waste ")
-
-# Disable warnings on missing man pages.
-# The tools that have --help output have been fixed by using help2man.
-# The remaining ones have no help output whatsoever and are not easy to fix.
-addFilter(r" W: no-manual-page-for-binary ")
-
commit 898051186fd2e3baf0ae02b4f0adaa22236a35fd
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Nov 26 11:54:46 2023 +0100
fix typo in change log
diff --git a/eccodes.spec b/eccodes.spec
index 4c85f80..369dfa9 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -355,7 +355,7 @@ ctest3 -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
-* Sun Nov 26 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-1
+* Sun Nov 26 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-2
- rebuild after so name jump of libjasper
* Thu Nov 02 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-1
commit ec997229b9b0077a9476f42688d18055d801f03a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Nov 26 11:36:57 2023 +0100
rebuild after so name jump of libjasper
diff --git a/eccodes.spec b/eccodes.spec
index c77b1bb..4c85f80 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
Version: 2.32.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -355,6 +355,9 @@ ctest3 -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Sun Nov 26 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-1
+- rebuild after so name jump of libjasper
+
* Thu Nov 02 2023 Jos de Kloe <josdekloe(a)gmail.com> - 2.32.1-1
- Upgrade to upstream version 2.32.1 and add updated test_data package
1
0
List of packages currently excluding arches (1140)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- JUnitParams
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- dotnet8.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- goldendict-ng
ExclusiveArch: aarch64 x86_64
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hipsparse
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-lpmd
ExclusiveArch: x86_64
- intel-media-driver-free
ExclusiveArch: i686 x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt6_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-cef
ExclusiveArch: x86_64 aarch64
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- python-torch
ExclusiveArch: x86_64 aarch64
- python-torchdata
ExclusiveArch: x86_64 aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rustup
ExclusiveArch: x86_64 aarch64
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-sequoia-octopus-librnp.git
by githook-noreply＠fedoraproject.org 19 Dec '23
by githook-noreply＠fedoraproject.org 19 Dec '23
19 Dec '23
The package rpms/rust-sequoia-octopus-librnp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-sequoia-octopus-librnp.git/com….
Change:
+ExcludeArch: %{ix86} %{arm} s390x
Thanks.
Full change:
============
commit 1abb41cbdf0c25021f360098dc5c773ed2a4ff5f
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Dec 14 19:44:13 2023 +0100
Update to version 1.6.1; Fixes RHBZ#2254574
diff --git a/.gitignore b/.gitignore
index a9c198c..07de4b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/sequoia-octopus-librnp-1.4.0.crate
/sequoia-octopus-librnp-1.4.1.crate
/sequoia-octopus-librnp-1.5.0.crate
+/sequoia-octopus-librnp-1.6.0.crate
+/sequoia-octopus-librnp-1.6.1.crate
diff --git a/0001-drop-broken-build-script-based-git-versioning.patch b/0001-drop-broken-build-script-based-git-versioning.patch
index e39436d..201461c 100644
--- a/0001-drop-broken-build-script-based-git-versioning.patch
+++ b/0001-drop-broken-build-script-based-git-versioning.patch
@@ -1,6 +1,6 @@
-From d764f2851a83e8e7917295701927d78184ee44f4 Mon Sep 17 00:00:00 2001
+From 827d480233c72419f94f862b9a7da510f0d7b586 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Fri, 14 Apr 2023 15:30:51 +0200
+Date: Thu, 14 Dec 2023 17:50:33 +0100
Subject: [PATCH] drop broken build-script based git versioning
---
@@ -11,7 +11,7 @@ Subject: [PATCH] drop broken build-script based git versioning
diff --git a/build.rs b/build.rs
deleted file mode 100644
-index 5ba50b4..0000000
+index 8cf944b..0000000
--- a/build.rs
+++ /dev/null
@@ -1,19 +0,0 @@
@@ -21,9 +21,6 @@ index 5ba50b4..0000000
-}
-
-fn vergen() {
-- let mut config = vergen::Config::default();
-- // Change the SHA output to the short variant
-- *config.git_mut().sha_kind_mut() = vergen::ShaKind::Short;
- // Generate the "cargo:" instruction cargo:rustc-env=VERGEN_GIT_SHA=<SHA>
- //
- // If the source directory is not a git repository, e.g. a tarball, this
@@ -32,17 +29,20 @@ index 5ba50b4..0000000
- // than VERGEN_GIT_SHA and only use it if it is set (see
- // rnp_version_string_full in src/version.rs).
- // Upstream issue: https://github.com/rustyhorde/vergen/issues/124
-- let _ = vergen::vergen(config);
+- let _ = vergen::EmitBuilder::builder()
+- .git_sha(/* short */ true)
+- .emit();
-}
+-
diff --git a/src/version.rs b/src/version.rs
-index 11af6b8..5af56f7 100644
+index 3b5bbe9..576d634 100644
--- a/src/version.rs
+++ b/src/version.rs
-@@ -38,23 +38,11 @@ pub unsafe extern "C" fn rnp_version(
- pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char {
- lazy_static::lazy_static! {
- static ref VERSION: Vec<u8> = {
-- let mut b = match option_env!("VERGEN_GIT_SHA_SHORT") {
+@@ -41,23 +41,11 @@ pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char {
+ static VERSION: OnceLock<Vec<u8>> = OnceLock::new();
+ VERSION.get_or_init(
+ || {
+- let mut b = match option_env!("VERGEN_GIT_SHA") {
- Some(git_sha) => {
- format!(
- "{}-{}+sequoia-openpgp-{}",
@@ -66,7 +66,7 @@ index 11af6b8..5af56f7 100644
+ ).into_bytes();
b.push(0); // Sentinel.
b
- };
+ })
--
-2.40.0
+2.43.0
diff --git a/rust-sequoia-octopus-librnp.spec b/rust-sequoia-octopus-librnp.spec
index 32b0fee..81a89ba 100644
--- a/rust-sequoia-octopus-librnp.spec
+++ b/rust-sequoia-octopus-librnp.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global crate sequoia-octopus-librnp
@@ -7,9 +7,9 @@
%global __provides_exclude_from ^%{tb_plugindir}/.*\\.so$
Name: rust-sequoia-octopus-librnp
-Version: 1.5.0
+Version: 1.6.1
Release: %autorelease
-Summary: Reimplementation of RNP's interface using Sequoia
+Summary: Reimplementation of RNP's interface using Sequoia for use with Thunderbird
License: LGPL-2.0-or-later
URL: https://crates.io/crates/sequoia-octopus-librnp
@@ -19,18 +19,15 @@ Source: %{crates_source}
# fixes undefined references to rand::thread_rng
# * exclude files only useful for upstream development
# * do not use bundled sqlite in rusqlite
-# * bump sequoia-autocrypt to 0.25
-# * bump sequoia-ipc to 0.30
-# * bump sequoia-net to 0.27
# * drop build script and build-dependencies:
# git repository is not available when building from published crates
Patch: sequoia-octopus-librnp-fix-metadata.diff
Patch: 0001-drop-broken-build-script-based-git-versioning.patch
# exclude architectures where thunderbird is not available
-ExcludeArch: %{arm} s390x
+ExcludeArch: %{ix86} %{arm} s390x
-BuildRequires: rust-packaging >= 23
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Reimplementation of RNP's interface using Sequoia for use with
@@ -40,24 +37,26 @@ Thunderbird.}
%package -n %{crate}
Summary: %{summary}
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause OR Apache-2.0 OR MIT
# BSL-1.0
# LGPL-2.0-or-later
# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
-# LGPL-3.0+
# MIT
# MIT OR Apache-2.0
# MIT OR Apache-2.0 OR Zlib
# MIT OR LGPL-3.0-or-later
# MIT OR Zlib OR Apache-2.0
+# MPL-2.0
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT
-License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-3.0+ AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT)
+License: LGPL-2.0-or-later AND Apache-2.0 AND BSD-3-Clause AND BSL-1.0 AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
Requires: thunderbird%{?_isa}
@@ -74,7 +73,7 @@ Conflicts: thunderbird-librnp%{?_isa}
%{tb_plugindir}/librnp.so
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -82,7 +81,7 @@ Conflicts: thunderbird-librnp%{?_isa}
%build
%cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
%{cargo_license} > LICENSE.dependencies
%install
@@ -91,8 +90,7 @@ cp -pav target/release/libsequoia_octopus_librnp.so %{buildroot}/%{tb_plugindir}
%if %{with check}
%check
-# * skip a test that fails with recent sequoia-openpgp versions
-%cargo_test -- -- --skip keystore::tests::same_grip_same_cert
+%cargo_test
%endif
%changelog
diff --git a/sequoia-octopus-librnp-fix-metadata.diff b/sequoia-octopus-librnp-fix-metadata.diff
index 093a6a1..eb859ca 100644
--- a/sequoia-octopus-librnp-fix-metadata.diff
+++ b/sequoia-octopus-librnp-fix-metadata.diff
@@ -1,5 +1,5 @@
---- sequoia-octopus-librnp-1.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sequoia-octopus-librnp-1.5.0/Cargo.toml 2023-04-14T13:18:42.517732+00:00
+--- sequoia-octopus-librnp-1.6.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ sequoia-octopus-librnp-1.6.1/Cargo.toml 2023-12-19T16:40:40.717767+00:00
@@ -20,7 +20,6 @@
"Nora Widdecke <nora(a)sequoia-pgp.org>",
"Wiktor Kwapisiewicz <wiktor(a)sequoia-pgp.org>",
@@ -8,58 +8,55 @@
description = "Reimplementation of RNP's interface using Sequoia for use with Thunderbird"
homepage = "https://sequoia-pgp.org/"
readme = "README.md"
-@@ -38,6 +37,7 @@
+@@ -38,6 +37,11 @@
]
license = "LGPL-2.0-or-later"
repository = "https://gitlab.com/sequoia-pgp/sequoia-octopus-librnp"
-+exclude = ["notes.org"]
++exclude = [
++ "/README-Debian.md",
++ "/build.rs",
++ "/notes.org",
++]
[lib]
crate-type = ["cdylib"]
-@@ -76,27 +76,24 @@
+@@ -72,15 +76,12 @@
+ "std",
"std_rng",
]
- optional = true
-default-features = false
[dependencies.rand_distr]
version = "0.4"
- optional = true
-default-features = false
[dependencies.rusqlite]
- version = ">=0.24, <0.29"
+ version = ">=0.24, <0.31"
-features = ["bundled"]
[dependencies.sequoia-autocrypt]
--version = "0.24"
-+version = "0.25"
- default-features = false
-
- [dependencies.sequoia-ipc]
--version = "0.28"
-+version = "0.30"
- default-features = false
-
- [dependencies.sequoia-net]
--version = ">=0.24, <0.26"
-+version = ">=0.24, <0.28"
- optional = true
- default-features = false
-
-@@ -127,25 +124,14 @@
+ version = ">=0.24, <0.26"
+@@ -123,27 +124,7 @@
+ [dependencies.tokio]
version = "1"
- optional = true
--[build-dependencies.libgit2-sys]
--version = "=0.11"
--
-[build-dependencies.vergen]
--version = ">=5, <7"
--features = ["git"]
+-version = "8"
+-features = [
+- "git",
+- "git2",
+-]
-default-features = false
-
[features]
+-crypto-botan = [
+- "sequoia-openpgp/compression",
+- "sequoia-openpgp/crypto-botan",
+-]
+-crypto-botan2 = [
+- "sequoia-openpgp/compression",
+- "sequoia-openpgp/crypto-botan2",
+-]
-crypto-cng = [
- "sequoia-openpgp/compression",
- "sequoia-openpgp/crypto-cng",
@@ -67,10 +64,15 @@
crypto-nettle = [
"sequoia-openpgp/compression",
"sequoia-openpgp/crypto-nettle",
+@@ -152,7 +133,10 @@
+ "sequoia-openpgp/compression",
+ "sequoia-openpgp/crypto-openssl",
]
- default = [
- "sequoia-openpgp/default",
+-default = ["sequoia-openpgp/default"]
++default = [
+ "crypto-nettle",
- "net",
- ]
- net = [
++ "sequoia-openpgp/default",
++]
+
+ [badges.gitlab]
+ repository = "sequoia-pgp/sequoia-octopus-librnp"
diff --git a/sources b/sources
index eb71ba5..f871a92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-octopus-librnp-1.5.0.crate) = 889d153a5370255548cf89557ae34d047bd49f316fe616593c90b53fff30b5303e4b1a5f0c0c11687b12a33165e78d269710c90f1155e5bf10c180d99098f8ba
+SHA512 (sequoia-octopus-librnp-1.6.1.crate) = d87f9764237b92711e8502be8467c5f052cd0e25e6c12cadf35ba424495f70d4c1880252d547fcba007ff144d942ed3dd1c68bd99dd43fe9bfeb047bec599928
1
0
Architecture specific change in rpms/rust-sequoia-octopus-librnp.git
by githook-noreply＠fedoraproject.org 19 Dec '23
by githook-noreply＠fedoraproject.org 19 Dec '23
19 Dec '23
The package rpms/rust-sequoia-octopus-librnp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-sequoia-octopus-librnp.git/com….
Change:
+ExcludeArch: %{ix86} %{arm} s390x
Thanks.
Full change:
============
commit 1abb41cbdf0c25021f360098dc5c773ed2a4ff5f
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Dec 14 19:44:13 2023 +0100
Update to version 1.6.1; Fixes RHBZ#2254574
diff --git a/.gitignore b/.gitignore
index a9c198c..07de4b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/sequoia-octopus-librnp-1.4.0.crate
/sequoia-octopus-librnp-1.4.1.crate
/sequoia-octopus-librnp-1.5.0.crate
+/sequoia-octopus-librnp-1.6.0.crate
+/sequoia-octopus-librnp-1.6.1.crate
diff --git a/0001-drop-broken-build-script-based-git-versioning.patch b/0001-drop-broken-build-script-based-git-versioning.patch
index e39436d..201461c 100644
--- a/0001-drop-broken-build-script-based-git-versioning.patch
+++ b/0001-drop-broken-build-script-based-git-versioning.patch
@@ -1,6 +1,6 @@
-From d764f2851a83e8e7917295701927d78184ee44f4 Mon Sep 17 00:00:00 2001
+From 827d480233c72419f94f862b9a7da510f0d7b586 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Fri, 14 Apr 2023 15:30:51 +0200
+Date: Thu, 14 Dec 2023 17:50:33 +0100
Subject: [PATCH] drop broken build-script based git versioning
---
@@ -11,7 +11,7 @@ Subject: [PATCH] drop broken build-script based git versioning
diff --git a/build.rs b/build.rs
deleted file mode 100644
-index 5ba50b4..0000000
+index 8cf944b..0000000
--- a/build.rs
+++ /dev/null
@@ -1,19 +0,0 @@
@@ -21,9 +21,6 @@ index 5ba50b4..0000000
-}
-
-fn vergen() {
-- let mut config = vergen::Config::default();
-- // Change the SHA output to the short variant
-- *config.git_mut().sha_kind_mut() = vergen::ShaKind::Short;
- // Generate the "cargo:" instruction cargo:rustc-env=VERGEN_GIT_SHA=<SHA>
- //
- // If the source directory is not a git repository, e.g. a tarball, this
@@ -32,17 +29,20 @@ index 5ba50b4..0000000
- // than VERGEN_GIT_SHA and only use it if it is set (see
- // rnp_version_string_full in src/version.rs).
- // Upstream issue: https://github.com/rustyhorde/vergen/issues/124
-- let _ = vergen::vergen(config);
+- let _ = vergen::EmitBuilder::builder()
+- .git_sha(/* short */ true)
+- .emit();
-}
+-
diff --git a/src/version.rs b/src/version.rs
-index 11af6b8..5af56f7 100644
+index 3b5bbe9..576d634 100644
--- a/src/version.rs
+++ b/src/version.rs
-@@ -38,23 +38,11 @@ pub unsafe extern "C" fn rnp_version(
- pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char {
- lazy_static::lazy_static! {
- static ref VERSION: Vec<u8> = {
-- let mut b = match option_env!("VERGEN_GIT_SHA_SHORT") {
+@@ -41,23 +41,11 @@ pub unsafe extern "C" fn rnp_version_string_full() -> *const c_char {
+ static VERSION: OnceLock<Vec<u8>> = OnceLock::new();
+ VERSION.get_or_init(
+ || {
+- let mut b = match option_env!("VERGEN_GIT_SHA") {
- Some(git_sha) => {
- format!(
- "{}-{}+sequoia-openpgp-{}",
@@ -66,7 +66,7 @@ index 11af6b8..5af56f7 100644
+ ).into_bytes();
b.push(0); // Sentinel.
b
- };
+ })
--
-2.40.0
+2.43.0
diff --git a/rust-sequoia-octopus-librnp.spec b/rust-sequoia-octopus-librnp.spec
index 32b0fee..81a89ba 100644
--- a/rust-sequoia-octopus-librnp.spec
+++ b/rust-sequoia-octopus-librnp.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global crate sequoia-octopus-librnp
@@ -7,9 +7,9 @@
%global __provides_exclude_from ^%{tb_plugindir}/.*\\.so$
Name: rust-sequoia-octopus-librnp
-Version: 1.5.0
+Version: 1.6.1
Release: %autorelease
-Summary: Reimplementation of RNP's interface using Sequoia
+Summary: Reimplementation of RNP's interface using Sequoia for use with Thunderbird
License: LGPL-2.0-or-later
URL: https://crates.io/crates/sequoia-octopus-librnp
@@ -19,18 +19,15 @@ Source: %{crates_source}
# fixes undefined references to rand::thread_rng
# * exclude files only useful for upstream development
# * do not use bundled sqlite in rusqlite
-# * bump sequoia-autocrypt to 0.25
-# * bump sequoia-ipc to 0.30
-# * bump sequoia-net to 0.27
# * drop build script and build-dependencies:
# git repository is not available when building from published crates
Patch: sequoia-octopus-librnp-fix-metadata.diff
Patch: 0001-drop-broken-build-script-based-git-versioning.patch
# exclude architectures where thunderbird is not available
-ExcludeArch: %{arm} s390x
+ExcludeArch: %{ix86} %{arm} s390x
-BuildRequires: rust-packaging >= 23
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Reimplementation of RNP's interface using Sequoia for use with
@@ -40,24 +37,26 @@ Thunderbird.}
%package -n %{crate}
Summary: %{summary}
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause OR Apache-2.0 OR MIT
# BSL-1.0
# LGPL-2.0-or-later
# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
-# LGPL-3.0+
# MIT
# MIT OR Apache-2.0
# MIT OR Apache-2.0 OR Zlib
# MIT OR LGPL-3.0-or-later
# MIT OR Zlib OR Apache-2.0
+# MPL-2.0
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT
-License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-3.0+ AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT)
+License: LGPL-2.0-or-later AND Apache-2.0 AND BSD-3-Clause AND BSL-1.0 AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
Requires: thunderbird%{?_isa}
@@ -74,7 +73,7 @@ Conflicts: thunderbird-librnp%{?_isa}
%{tb_plugindir}/librnp.so
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -82,7 +81,7 @@ Conflicts: thunderbird-librnp%{?_isa}
%build
%cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
%{cargo_license} > LICENSE.dependencies
%install
@@ -91,8 +90,7 @@ cp -pav target/release/libsequoia_octopus_librnp.so %{buildroot}/%{tb_plugindir}
%if %{with check}
%check
-# * skip a test that fails with recent sequoia-openpgp versions
-%cargo_test -- -- --skip keystore::tests::same_grip_same_cert
+%cargo_test
%endif
%changelog
diff --git a/sequoia-octopus-librnp-fix-metadata.diff b/sequoia-octopus-librnp-fix-metadata.diff
index 093a6a1..eb859ca 100644
--- a/sequoia-octopus-librnp-fix-metadata.diff
+++ b/sequoia-octopus-librnp-fix-metadata.diff
@@ -1,5 +1,5 @@
---- sequoia-octopus-librnp-1.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sequoia-octopus-librnp-1.5.0/Cargo.toml 2023-04-14T13:18:42.517732+00:00
+--- sequoia-octopus-librnp-1.6.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ sequoia-octopus-librnp-1.6.1/Cargo.toml 2023-12-19T16:40:40.717767+00:00
@@ -20,7 +20,6 @@
"Nora Widdecke <nora(a)sequoia-pgp.org>",
"Wiktor Kwapisiewicz <wiktor(a)sequoia-pgp.org>",
@@ -8,58 +8,55 @@
description = "Reimplementation of RNP's interface using Sequoia for use with Thunderbird"
homepage = "https://sequoia-pgp.org/"
readme = "README.md"
-@@ -38,6 +37,7 @@
+@@ -38,6 +37,11 @@
]
license = "LGPL-2.0-or-later"
repository = "https://gitlab.com/sequoia-pgp/sequoia-octopus-librnp"
-+exclude = ["notes.org"]
++exclude = [
++ "/README-Debian.md",
++ "/build.rs",
++ "/notes.org",
++]
[lib]
crate-type = ["cdylib"]
-@@ -76,27 +76,24 @@
+@@ -72,15 +76,12 @@
+ "std",
"std_rng",
]
- optional = true
-default-features = false
[dependencies.rand_distr]
version = "0.4"
- optional = true
-default-features = false
[dependencies.rusqlite]
- version = ">=0.24, <0.29"
+ version = ">=0.24, <0.31"
-features = ["bundled"]
[dependencies.sequoia-autocrypt]
--version = "0.24"
-+version = "0.25"
- default-features = false
-
- [dependencies.sequoia-ipc]
--version = "0.28"
-+version = "0.30"
- default-features = false
-
- [dependencies.sequoia-net]
--version = ">=0.24, <0.26"
-+version = ">=0.24, <0.28"
- optional = true
- default-features = false
-
-@@ -127,25 +124,14 @@
+ version = ">=0.24, <0.26"
+@@ -123,27 +124,7 @@
+ [dependencies.tokio]
version = "1"
- optional = true
--[build-dependencies.libgit2-sys]
--version = "=0.11"
--
-[build-dependencies.vergen]
--version = ">=5, <7"
--features = ["git"]
+-version = "8"
+-features = [
+- "git",
+- "git2",
+-]
-default-features = false
-
[features]
+-crypto-botan = [
+- "sequoia-openpgp/compression",
+- "sequoia-openpgp/crypto-botan",
+-]
+-crypto-botan2 = [
+- "sequoia-openpgp/compression",
+- "sequoia-openpgp/crypto-botan2",
+-]
-crypto-cng = [
- "sequoia-openpgp/compression",
- "sequoia-openpgp/crypto-cng",
@@ -67,10 +64,15 @@
crypto-nettle = [
"sequoia-openpgp/compression",
"sequoia-openpgp/crypto-nettle",
+@@ -152,7 +133,10 @@
+ "sequoia-openpgp/compression",
+ "sequoia-openpgp/crypto-openssl",
]
- default = [
- "sequoia-openpgp/default",
+-default = ["sequoia-openpgp/default"]
++default = [
+ "crypto-nettle",
- "net",
- ]
- net = [
++ "sequoia-openpgp/default",
++]
+
+ [badges.gitlab]
+ repository = "sequoia-pgp/sequoia-octopus-librnp"
diff --git a/sources b/sources
index eb71ba5..f871a92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-octopus-librnp-1.5.0.crate) = 889d153a5370255548cf89557ae34d047bd49f316fe616593c90b53fff30b5303e4b1a5f0c0c11687b12a33165e78d269710c90f1155e5bf10c180d99098f8ba
+SHA512 (sequoia-octopus-librnp-1.6.1.crate) = d87f9764237b92711e8502be8467c5f052cd0e25e6c12cadf35ba424495f70d4c1880252d547fcba007ff144d942ed3dd1c68bd99dd43fe9bfeb047bec599928
1
0
Architecture specific change in rpms/rust-capnp-rpc.git
by githook-noreply＠fedoraproject.org 19 Dec '23
by githook-noreply＠fedoraproject.org 19 Dec '23
19 Dec '23
The package rpms/rust-capnp-rpc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-capnp-rpc.git/commit/?id=065fa….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 124a9e0d68c155ee79a694bab557e68fe5b4cf5d
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Dec 14 12:19:36 2023 +0100
Update to version 0.18.0; Fixes RHBZ#2139858
diff --git a/.gitignore b/.gitignore
index 7c08b48..9cc7ad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/capnp-rpc-0.13.1.crate
/capnp-rpc-0.14.1.crate
+/capnp-rpc-0.18.0.crate
diff --git a/rust-capnp-rpc.spec b/rust-capnp-rpc.spec
index a84afb9..0028cf4 100644
--- a/rust-capnp-rpc.spec
+++ b/rust-capnp-rpc.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate capnp-rpc
Name: rust-capnp-rpc
-Version: 0.14.1
+Version: 0.18.0
Release: %autorelease
Summary: Implementation of the Cap'n Proto remote procedure call protocol
@@ -13,7 +13,7 @@ License: MIT
URL: https://crates.io/crates/capnp-rpc
Source: %{crates_source}
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Implementation of the Cap'n Proto remote procedure call protocol.}
@@ -48,7 +48,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/sources b/sources
index d8aa56f..9073ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (capnp-rpc-0.14.1.crate) = 3cd6ef7283c540074cd125fd14bb204833e37ce734c6875795f6d63079207ad8edaf9a678a181171295a882c2547519cc723d45995bac7d7dab89569b44411ba
+SHA512 (capnp-rpc-0.18.0.crate) = b64b607cfe54977c3236bc2b79d8de1ab4cfeb183d5274b11a70b7acb16b82cff7db29023c227f72ffc888064f4fd4e1bfa7de6c90cf6cbd985f463372210d8e
commit 065fadd173b107a849c3caa991b988a4b16cc5b8
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun Aug 6 15:20:48 2023 +0200
Regenerate with rust2rpm v24
diff --git a/rust-capnp-rpc.spec b/rust-capnp-rpc.spec
index 96198b5..a84afb9 100644
--- a/rust-capnp-rpc.spec
+++ b/rust-capnp-rpc.spec
@@ -1,21 +1,18 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate capnp-rpc
-Name: rust-%{crate}
+Name: rust-capnp-rpc
Version: 0.14.1
Release: %autorelease
Summary: Implementation of the Cap'n Proto remote procedure call protocol
-# Upstream license specification: MIT
License: MIT
URL: https://crates.io/crates/capnp-rpc
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
commit b4688b3cab36b138d1a25aefc54477d202d45941
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 19:21:52 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
1
0
Architecture specific change in rpms/rust-capnp-futures.git
by githook-noreply＠fedoraproject.org 19 Dec '23
by githook-noreply＠fedoraproject.org 19 Dec '23
19 Dec '23
The package rpms/rust-capnp-futures.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-capnp-futures.git/commit/?id=8….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 01c5a57771c3a8af1d8bb4460ac38a25fd9c0b06
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Dec 14 12:15:54 2023 +0100
Update to version 0.18.2; Fixes RHBZ#2139860
diff --git a/.gitignore b/.gitignore
index aa7c406..f7f6a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/capnp-futures-0.13.2.crate
/capnp-futures-0.14.1.crate
/capnp-futures-0.14.2.crate
+/capnp-futures-0.18.2.crate
diff --git a/rust-capnp-futures.spec b/rust-capnp-futures.spec
index 4ab1ca9..5389dbe 100644
--- a/rust-capnp-futures.spec
+++ b/rust-capnp-futures.spec
@@ -5,7 +5,7 @@
%global crate capnp-futures
Name: rust-capnp-futures
-Version: 0.14.2
+Version: 0.18.2
Release: %autorelease
Summary: Async serialization for Cap'n Proto messages
diff --git a/sources b/sources
index 17c46b7..ecada17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (capnp-futures-0.14.2.crate) = fe9a538d5a0b3767c6d137dfa7269276a04f1fed70a8b71f789471b61e9f331be0c546da53f526f4d4d36848353be104ecb561b1df573af32b602f481eb5ee71
+SHA512 (capnp-futures-0.18.2.crate) = 7f618cb94a6151959341ad3e8c9a9e311cb8693a8c1aae5e59d0d425174674b70ca2962798693abacd9490867223bd1d397181c1e6177f00e02a18be59511b7f
commit 8a9d559f6640e06bf47b1e52f92c246175d96d10
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sat Oct 28 20:06:06 2023 +0200
Regenerate with rust2rpm v25
diff --git a/rust-capnp-futures.spec b/rust-capnp-futures.spec
index 6af766c..4ab1ca9 100644
--- a/rust-capnp-futures.spec
+++ b/rust-capnp-futures.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
@@ -13,9 +13,7 @@ License: MIT
URL: https://crates.io/crates/capnp-futures
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Async serialization for Cap'n Proto messages.}
@@ -51,7 +49,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
commit d55411902c1468ca86879b73ecd56ea268e99b43
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 19:21:42 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
1
0
Architecture specific change in rpms/rust-capnp-futures.git
by githook-noreply＠fedoraproject.org 19 Dec '23
by githook-noreply＠fedoraproject.org 19 Dec '23
19 Dec '23
The package rpms/rust-capnp-futures.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-capnp-futures.git/commit/?id=8….
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 01c5a57771c3a8af1d8bb4460ac38a25fd9c0b06
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Dec 14 12:15:54 2023 +0100
Update to version 0.18.2; Fixes RHBZ#2139860
diff --git a/.gitignore b/.gitignore
index aa7c406..f7f6a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/capnp-futures-0.13.2.crate
/capnp-futures-0.14.1.crate
/capnp-futures-0.14.2.crate
+/capnp-futures-0.18.2.crate
diff --git a/rust-capnp-futures.spec b/rust-capnp-futures.spec
index 4ab1ca9..5389dbe 100644
--- a/rust-capnp-futures.spec
+++ b/rust-capnp-futures.spec
@@ -5,7 +5,7 @@
%global crate capnp-futures
Name: rust-capnp-futures
-Version: 0.14.2
+Version: 0.18.2
Release: %autorelease
Summary: Async serialization for Cap'n Proto messages
diff --git a/sources b/sources
index 17c46b7..ecada17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (capnp-futures-0.14.2.crate) = fe9a538d5a0b3767c6d137dfa7269276a04f1fed70a8b71f789471b61e9f331be0c546da53f526f4d4d36848353be104ecb561b1df573af32b602f481eb5ee71
+SHA512 (capnp-futures-0.18.2.crate) = 7f618cb94a6151959341ad3e8c9a9e311cb8693a8c1aae5e59d0d425174674b70ca2962798693abacd9490867223bd1d397181c1e6177f00e02a18be59511b7f
commit 8a9d559f6640e06bf47b1e52f92c246175d96d10
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sat Oct 28 20:06:06 2023 +0200
Regenerate with rust2rpm v25
diff --git a/rust-capnp-futures.spec b/rust-capnp-futures.spec
index 6af766c..4ab1ca9 100644
--- a/rust-capnp-futures.spec
+++ b/rust-capnp-futures.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
@@ -13,9 +13,7 @@ License: MIT
URL: https://crates.io/crates/capnp-futures
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Async serialization for Cap'n Proto messages.}
@@ -51,7 +49,7 @@ use the "default" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
1
0
List of packages currently excluding arches (1140)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- BareBonesBrowserLaunch
ExclusiveArch: %{java_arches} noarch
- CFR
ExclusiveArch: %{java_arches} noarch
- CardManager
ExclusiveArch: %{java_arches} noarch
- GAPDoc
ExclusiveArch: %{gap_arches} noarch
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- IPAddress
ExclusiveArch: %{java_arches} noarch
- JUnitParams
ExclusiveArch: %{java_arches} noarch
- Mars
ExclusiveArch: %{java_arches} noarch
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- OpenStego
ExclusiveArch: %{java_arches} noarch
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- R-rJava
ExclusiveArch: %{java_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- ant
ExclusiveArch: %{java_arches} noarch
- ant-antunit
ExclusiveArch: %{java_arches} noarch
- ant-contrib
ExclusiveArch: %{java_arches} noarch
- antlr
ExclusiveArch: %{java_arches}
- antlr3
ExclusiveArch: %{java_arches}
- antlr4-project
ExclusiveArch: %{java_arches}
- antlrworks
ExclusiveArch: %{java_arches} noarch
- aopalliance
ExclusiveArch: %{java_arches} noarch
- apache-commons-beanutils
ExclusiveArch: %{java_arches} noarch
- apache-commons-cli
ExclusiveArch: %{java_arches} noarch
- apache-commons-codec
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections
ExclusiveArch: %{java_arches} noarch
- apache-commons-collections4
ExclusiveArch: %{java_arches} noarch
- apache-commons-compress
ExclusiveArch: %{java_arches} noarch
- apache-commons-configuration
ExclusiveArch: %{java_arches} noarch
- apache-commons-digester
ExclusiveArch: %{java_arches} noarch
- apache-commons-exec
ExclusiveArch: %{java_arches} noarch
- apache-commons-io
ExclusiveArch: %{java_arches} noarch
- apache-commons-jexl
ExclusiveArch: %{java_arches} noarch
- apache-commons-jxpath
ExclusiveArch: %{java_arches} noarch
- apache-commons-lang3
ExclusiveArch: %{java_arches} noarch
- apache-commons-logging
ExclusiveArch: %{java_arches} noarch
- apache-commons-math
ExclusiveArch: %{java_arches} noarch
- apache-commons-modeler
ExclusiveArch: %{java_arches} noarch
- apache-commons-net
ExclusiveArch: %{java_arches} noarch
- apache-commons-parent
ExclusiveArch: %{java_arches} noarch
- apache-commons-pool
ExclusiveArch: %{java_arches} noarch
- apache-commons-vfs
ExclusiveArch: %{java_arches} noarch
- apache-ivy
ExclusiveArch: %{java_arches} noarch
- apache-parent
ExclusiveArch: %{java_arches} noarch
- apache-resource-bundles
ExclusiveArch: %{java_arches} noarch
- apache-sshd
ExclusiveArch: %{java_arches} noarch
- apiguardian
ExclusiveArch: %{java_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- aqute-bnd
ExclusiveArch: %{java_arches} noarch
- args4j
ExclusiveArch: %{java_arches} noarch
- arianna
ExclusiveArch: %{qt6_qtwebengine_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- asmjit
ExclusiveArch: aarch64 x86_64
- assertj-core
ExclusiveArch: %{java_arches} noarch
- atinject
ExclusiveArch: %{java_arches} noarch
- aunit
ExclusiveArch: %GPRbuild_arches
- auto
ExclusiveArch: %{java_arches} noarch
- autolink-java
ExclusiveArch: noarch %{java_arches}
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- azure-cli
ExclusiveArch: %{java_arches} noarch
- batik
ExclusiveArch: %{java_arches} noarch
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcel
ExclusiveArch: %{java_arches} noarch
- bcm283x-firmware
ExclusiveArch: aarch64
- beansbinding
ExclusiveArch: %{java_arches} noarch
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- beust-jcommander
ExclusiveArch: %{java_arches} noarch
- bibletime
ExclusiveArch: %{java_arches}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- bodhi-server
ExclusiveArch: %{golang_arches_future}
- bolzplatz2006
ExclusiveArch: %{java_arches}
- bouncycastle
ExclusiveArch: %{java_arches} noarch
- box64
ExclusiveArch: aarch64 ppc64le x86_64
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- brazil
ExclusiveArch: %{java_arches} noarch
- bsf
ExclusiveArch: %{java_arches} noarch
- bsh
ExclusiveArch: %{java_arches} noarch
- build-helper-maven-plugin
ExclusiveArch: %{java_arches} noarch
- buildah
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- byebyebios
ExclusiveArch: x86_64
- byte-buddy
ExclusiveArch: %{java_arches} noarch
- byteman
ExclusiveArch: %{java_arches} noarch
- cachelib
ExclusiveArch: x86_64 aarch64 ppc64le
- caddy
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: %{golang_arches}
- caffe
ExclusiveArch: x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: aarch64 x86_64
- cambozola
ExclusiveArch: %{java_arches} noarch
- canl-java
ExclusiveArch: %{java_arches} noarch
- catatonit
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: %{golang_arches_future}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- cdi-api
ExclusiveArch: %{java_arches} noarch
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- cglib
ExclusiveArch: %{java_arches} noarch
- chromium
ExclusiveArch: x86_64
ExclusiveArch: x86_64 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- classloader-leak-test-framework
ExclusiveArch: %{java_arches} noarch
- classpathless-compiler
ExclusiveArch: %{java_arches} noarch
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- clojure
ExclusiveArch: %{java_arches} noarch
- clojure-core-specs-alpha
ExclusiveArch: %{java_arches} noarch
- clojure-maven-plugin
ExclusiveArch: %{java_arches} noarch
- clojure-spec-alpha
ExclusiveArch: %{java_arches} noarch
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- codehaus-parent
ExclusiveArch: %{java_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- colossus
ExclusiveArch: %{java_arches} noarch
- conmon
ExclusiveArch: %{golang_arches_future}
- console-image-viewer
ExclusiveArch: %{java_arches} noarch
- containernetworking-plugins
ExclusiveArch: %{golang_arches}
- coq
ExclusiveArch: %{ocaml_native_compiler}
- cortado
ExclusiveArch: %{java_arches} noarch
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cpuinfo
ExclusiveArch: x86_64 aarch64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- credentials-fetcher
ExclusiveArch: x86_64 aarch64 s390x
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- crun
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- crypto-policies
ExclusiveArch: %{java_arches} noarch
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- decentxml
ExclusiveArch: %{java_arches} noarch
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- directory-maven-plugin
ExclusiveArch: %{java_arches} noarch
- dirgra
ExclusiveArch: %{java_arches} noarch
- disruptor
ExclusiveArch: %{java_arches} noarch
- ditaa
ExclusiveArch: %{java_arches} noarch
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dogtag-pki
ExclusiveArch: %{java_arches}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dom4j
ExclusiveArch: %{java_arches} noarch
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- dotnet7.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
ExclusiveArch: x86_64
- dotnet8.0
ExclusiveArch: aarch64 ppc64le s390x x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- easymock
ExclusiveArch: %{java_arches} noarch
- ecj
ExclusiveArch: %{java_arches} noarch
- eclipse-swt
ExclusiveArch: %{java_arches}
- ed25519-java
ExclusiveArch: %{java_arches} noarch
- edk2
ExclusiveArch: x86_64 aarch64 riscv64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: aarch64 x86_64
- embree3
ExclusiveArch: aarch64 x86_64
- enjarify
ExclusiveArch: %{java_arches} noarch
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- erlang-corba
ExclusiveArch: %{java_arches}
- esmi_ib_library
ExclusiveArch: x86_64
- eth-tools
ExclusiveArch: x86_64
- exec-maven-plugin
ExclusiveArch: %{java_arches} noarch
- external-editor-revived
ExclusiveArch: %{rust_arches}
- extra-enforcer-rules
ExclusiveArch: %{java_arches} noarch
- fasterxml-oss-parent
ExclusiveArch: %{java_arches} noarch
- fb303
ExclusiveArch: x86_64 aarch64 ppc64le
- fbthrift
ExclusiveArch: x86_64 aarch64 ppc64le
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- felix-parent
ExclusiveArch: %{java_arches} noarch
- felix-utils
ExclusiveArch: %{java_arches} noarch
- fernflower
ExclusiveArch: %{java_arches} noarch
- fes
ExclusiveArch: %{ix86} x86_64
- filedrop
ExclusiveArch: %{java_arches} noarch
- firecracker
ExclusiveArch: aarch64 x86_64
- fishbowl
ExclusiveArch: %{java_arches} noarch
- fizz
ExclusiveArch: x86_64 aarch64 ppc64le
- flexmark-java
ExclusiveArch: noarch %{java_arches}
- flocq
ExclusiveArch: %{ocaml_native_compiler}
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- flute
ExclusiveArch: %{java_arches} noarch
- folly
ExclusiveArch: x86_64 aarch64 ppc64le
- fop
ExclusiveArch: %{java_arches} noarch
- forge-parent
ExclusiveArch: %{java_arches} noarch
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frama-c
ExclusiveArch: %{ocaml_native_compiler}
- freecol
ExclusiveArch: %{java_arches} noarch
- freemarker
ExclusiveArch: %{java_arches} noarch
- freerouting
ExclusiveArch: %{java_arches} noarch
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: x86_64 ppc64
- fuse-overlayfs
ExclusiveArch: %{arm64} ppc64le s390x x86_64
- fusesource-pom
ExclusiveArch: %{java_arches} noarch
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gap
ExclusiveArch: %{gap_arches}
- gap-pkg-ace
ExclusiveArch: %{gap_arches}
- gap-pkg-aclib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-alnuth
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-atlasrep
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autodoc
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-automata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-autpgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-browse
ExclusiveArch: %{gap_arches}
- gap-pkg-caratinterface
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-circle
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-cohomolo
ExclusiveArch: %{gap_arches}
- gap-pkg-congruence
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-corelg
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crime
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crisp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crypting
ExclusiveArch: %{gap_arches}
- gap-pkg-cryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-crystcat
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ctbllib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-curlinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-cvec
ExclusiveArch: %{gap_arches}
- gap-pkg-datastructures
ExclusiveArch: %{gap_arches}
- gap-pkg-design
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-digraphs
ExclusiveArch: %{gap_arches}
- gap-pkg-edim
ExclusiveArch: %{gap_arches}
- gap-pkg-factint
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-ferret
ExclusiveArch: %{gap_arches}
- gap-pkg-fga
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fining
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-float
ExclusiveArch: %{gap_arches}
- gap-pkg-format
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-forms
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-fr
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-francy
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-gbnp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-genss
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grape
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-groupoids
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-grpconst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-guava
ExclusiveArch: %{gap_arches}
- gap-pkg-hap
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hapcryst
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-hecke
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-images
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-io
ExclusiveArch: %{gap_arches}
- gap-pkg-irredsol
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-json
ExclusiveArch: %{gap_arches}
- gap-pkg-jupyterkernel
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-jupyterviz
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-laguna
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liealgdb
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liepring
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-liering
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-loops
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-lpres
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-mapclass
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-nautytracesinterface
ExclusiveArch: %{gap_arches}
- gap-pkg-nq
ExclusiveArch: %{gap_arches}
- gap-pkg-openmath
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-orb
ExclusiveArch: %{gap_arches}
- gap-pkg-polenta
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polycyclic
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-polymaking
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-primgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-profiling
ExclusiveArch: %{gap_arches}
- gap-pkg-qpa
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-quagroup
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-radiroot
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-recog
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-repsn
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-resclasses
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-scscp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-semigroups
ExclusiveArch: %{gap_arches}
- gap-pkg-singular
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sla
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-smallsemi
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sonata
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-sophus
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-spinsym
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-standardff
ExclusiveArch: %{gap_arches}
- gap-pkg-tomlib
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-toric
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-transgrp
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-utils
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-uuid
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-xmod
ExclusiveArch: %{gap_arches} noarch
- gap-pkg-zeromqinterface
ExclusiveArch: %{gap_arches}
- gappalib-coq
ExclusiveArch: %{ocaml_native_compiler}
- gbrainy
ExclusiveArch: %mono_arches
- gdb
ExclusiveArch: %{ix86} x86_64
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gearhead2
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- goldendict-ng
ExclusiveArch: aarch64 x86_64
- google-gson
ExclusiveArch: %{java_arches} noarch
- google-guice
ExclusiveArch: %{java_arches} noarch
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- guava
ExclusiveArch: %{java_arches} noarch
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- gvisor-tap-vsock
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- hamcrest
ExclusiveArch: %{java_arches} noarch
- harec
ExclusiveArch: x86_64 aarch64
- hawtjni
ExclusiveArch: %{java_arches} noarch
- hedgewars
ExclusiveArch: %{fpc_arches}
- hibernate-jpa-2.0-api
ExclusiveArch: %{java_arches} noarch
- hid4java
ExclusiveArch: %{java_arches} noarch
- hipblas
ExclusiveArch: x86_64
- hipcub
ExclusiveArch: x86_64
- hipify
ExclusiveArch: x86_64
- hipsparse
ExclusiveArch: x86_64
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- httpcomponents-client
ExclusiveArch: %{java_arches} noarch
- httpcomponents-core
ExclusiveArch: %{java_arches} noarch
- httpcomponents-project
ExclusiveArch: %{java_arches} noarch
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64 aarch64
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- icedtea-web
ExclusiveArch: %{java_arches}
- icu4j
ExclusiveArch: %{java_arches} noarch
- imagej
ExclusiveArch: %{java_arches} noarch
- imhex
ExclusiveArch: x86_64 %{arm64}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-igc
ExclusiveArch: x86_64
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
- intel-lpmd
ExclusiveArch: x86_64
- intel-media-driver-free
ExclusiveArch: i686 x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- jFormatString
ExclusiveArch: %{java_arches} noarch
- jackson-annotations
ExclusiveArch: %{java_arches} noarch
- jackson-bom
ExclusiveArch: %{java_arches} noarch
- jackson-core
ExclusiveArch: %{java_arches} noarch
- jackson-databind
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-binary
ExclusiveArch: %{java_arches} noarch
- jackson-dataformats-text
ExclusiveArch: %{java_arches} noarch
- jackson-jaxrs-providers
ExclusiveArch: %{java_arches} noarch
- jackson-modules-base
ExclusiveArch: %{java_arches} noarch
- jackson-parent
ExclusiveArch: %{java_arches} noarch
- jacoco
ExclusiveArch: %{java_arches} noarch
- jacop
ExclusiveArch: %{java_arches} noarch
- jakarta-activation
ExclusiveArch: %{java_arches} noarch
- jakarta-activation1
ExclusiveArch: %{java_arches} noarch
- jakarta-annotations
ExclusiveArch: %{java_arches} noarch
- jakarta-el
ExclusiveArch: %{java_arches} noarch
- jakarta-interceptors
ExclusiveArch: %{java_arches} noarch
- jakarta-json
ExclusiveArch: %{java_arches} noarch
- jakarta-mail
ExclusiveArch: %{java_arches} noarch
- jakarta-mail1
ExclusiveArch: %{java_arches} noarch
- jakarta-oro
ExclusiveArch: %{java_arches} noarch
- jakarta-saaj
ExclusiveArch: %{java_arches} noarch
- jakarta-server-pages
ExclusiveArch: %{java_arches} noarch
- jakarta-servlet
ExclusiveArch: %{java_arches} noarch
- jakarta-xml-ws
ExclusiveArch: %{java_arches} noarch
- janino
ExclusiveArch: %{java_arches} noarch
- jansi
ExclusiveArch: %{java_arches}
- jansi-native
ExclusiveArch: %{java_arches}
- jansi1
ExclusiveArch: %{java_arches} noarch
- java-1.8.0-openjdk
ExclusiveArch: %{java_arches}
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- java-1.8.0-openjdk-portable
ExclusiveArch: %{java_arches}
- java-11-openjdk
ExclusiveArch: %{java_arches}
- java-11-openjdk-portable
ExclusiveArch: %{java_arches}
- java-17-openjdk
ExclusiveArch: %{java_arches}
- java-17-openjdk-portable
ExclusiveArch: %{java_arches}
- java-diff-utils
ExclusiveArch: %{java_arches} noarch
- java-dirq
ExclusiveArch: %{java_arches} noarch
- java-jd-decompiler
ExclusiveArch: %{java_arches} noarch
- java-latest-openjdk
ExclusiveArch: %{java_arches}
- java-latest-openjdk-portable
ExclusiveArch: %{java_arches}
- java-runtime-decompiler
ExclusiveArch: %{java_arches} noarch
- java-scrypt
ExclusiveArch: %{java_arches} noarch
- java_cup
ExclusiveArch: %{java_arches} noarch
- javacc
ExclusiveArch: %{java_arches} noarch
- javacc-maven-plugin
ExclusiveArch: %{java_arches} noarch
- javaewah
ExclusiveArch: %{java_arches} noarch
- javapackages-bootstrap
ExclusiveArch: %{java_arches}
- javaparser
ExclusiveArch: %{java_arches} noarch
- javapoet
ExclusiveArch: %{java_arches} noarch
- javassist
ExclusiveArch: %{java_arches} noarch
- jaxb
ExclusiveArch: %{java_arches} noarch
- jaxb-api
ExclusiveArch: %{java_arches} noarch
- jaxb-api2
ExclusiveArch: %{java_arches} noarch
- jaxb-dtd-parser
ExclusiveArch: %{java_arches} noarch
- jaxb-fi
ExclusiveArch: %{java_arches} noarch
- jaxb-istack-commons
ExclusiveArch: %{java_arches} noarch
- jaxb-stax-ex
ExclusiveArch: %{java_arches} noarch
- jaxen
ExclusiveArch: %{java_arches} noarch
- jboss-jaxrs-2.0-api
ExclusiveArch: %{java_arches} noarch
- jboss-logging
ExclusiveArch: %{java_arches} noarch
- jboss-logging-tools
ExclusiveArch: %{java_arches} noarch
- jboss-parent
ExclusiveArch: %{java_arches} noarch
- jchardet
ExclusiveArch: %{java_arches} noarch
- jcip-annotations
ExclusiveArch: %{java_arches} noarch
- jctools
ExclusiveArch: %{java_arches} noarch
- jcuber
ExclusiveArch: %{java_arches} noarch
- jdeparser
ExclusiveArch: %{java_arches} noarch
- jdepend
ExclusiveArch: %{java_arches} noarch
- jdependency
ExclusiveArch: %{java_arches} noarch
- jdom
ExclusiveArch: %{java_arches} noarch
- jdom2
ExclusiveArch: %{java_arches} noarch
- jedit
ExclusiveArch: %{java_arches} noarch
- jericho-html
ExclusiveArch: %{java_arches} noarch
- jetbrains-annotations
ExclusiveArch: noarch %{java_arches}
- jetty
ExclusiveArch: %{java_arches} noarch
- jflex
ExclusiveArch: %{java_arches} noarch
- jfreechart
ExclusiveArch: %{java_arches} noarch
- jgit
ExclusiveArch: %{java_arches} noarch
- jglobus
ExclusiveArch: %{java_arches} noarch
- jgoodies-common
ExclusiveArch: %{java_arches} noarch
- jgoodies-forms
ExclusiveArch: %{java_arches} noarch
- jgoodies-looks
ExclusiveArch: %{java_arches} noarch
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- jline
ExclusiveArch: %{java_arches}
- jline2
ExclusiveArch: %{java_arches} noarch
- jmock
ExclusiveArch: %{java_arches} noarch
- jmol
ExclusiveArch: %{java_arches} noarch
- jna
ExclusiveArch: %{java_arches}
- jneuroml-core
ExclusiveArch: %{java_arches} noarch
- jni-inchi
ExclusiveArch: %{java_arches}
- jol
ExclusiveArch: %{java_arches} noarch
- jolokia-jvm-agent
ExclusiveArch: %{java_arches} noarch
- jopt-simple
ExclusiveArch: %{java_arches} noarch
- jorbis
ExclusiveArch: %{java_arches} noarch
- jowl
ExclusiveArch: %{nodejs_arches} noarch
- jpanoramamaker
ExclusiveArch: %{java_arches} noarch
- jsch
ExclusiveArch: %{java_arches} noarch
- jsch-agent-proxy
ExclusiveArch: %{java_arches} noarch
- json_simple
ExclusiveArch: %{java_arches} noarch
- jsoup
ExclusiveArch: %{java_arches} noarch
- jsr-305
ExclusiveArch: %{java_arches} noarch
- jss
ExclusiveArch: %{java_arches}
- jssc
ExclusiveArch: %{java_arches}
- jtidy
ExclusiveArch: %{java_arches} noarch
- julia
ExclusiveArch: x86_64
- junit
ExclusiveArch: %{java_arches} noarch
- junit5
ExclusiveArch: %{java_arches} noarch
- juniversalchardet
ExclusiveArch: %{java_arches} noarch
- jzlib
ExclusiveArch: %{java_arches} noarch
- kaidan
ExclusiveArch: %{qt5_qtwebengine_arches}
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- khelpcenter
ExclusiveArch: %{qt6_qtwebengine_arches}
- kicad
ExclusiveArch: x86_64 aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- laf-plugin
ExclusiveArch: %{java_arches} noarch
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldapjdk
ExclusiveArch: %{java_arches} noarch
- ldc
ExclusiveArch: %{ldc_arches} ppc64le
- ldc1.32
ExclusiveArch: %{ldc_arches} ppc64le
- libbase
ExclusiveArch: %{java_arches} noarch
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64 ppc64le
- libfonts
ExclusiveArch: %{java_arches} noarch
- libformula
ExclusiveArch: %{java_arches} noarch
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkrun
ExclusiveArch: x86_64 aarch64
- libkrunfw
ExclusiveArch: x86_64 aarch64
- liblayout
ExclusiveArch: %{java_arches} noarch
- libloader
ExclusiveArch: %{java_arches} noarch
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libreoffice-TexMaths
ExclusiveArch: %{java_arches}
- librepository
ExclusiveArch: %{java_arches} noarch
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libserializer
ExclusiveArch: %{java_arches} noarch
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunicode
ExclusiveArch: x86_64 aarch64
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-nvidia-driver
ExclusiveArch: %{x86_64} %{ix86} %{arm64} ppc64le
- libvirt-java
ExclusiveArch: %{java_arches} noarch
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- libzpc
ExclusiveArch: s390x
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4j
ExclusiveArch: %{java_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- lucene
ExclusiveArch: %{java_arches} noarch
- lujavrite
ExclusiveArch: %{java_arches}
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- magicmirror
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-airnow
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-onthisday
ExclusiveArch: %{nodejs_arches} noarch
- magicmirror-module-singlestock
ExclusiveArch: %{nodejs_arches} noarch
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mariadb-java-client
ExclusiveArch: %{java_arches} noarch
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matrix-synapse
ExclusiveArch: %{rust_arches}
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maven
ExclusiveArch: %{java_arches} noarch
- maven-antrun-plugin
ExclusiveArch: %{java_arches} noarch
- maven-archetype
ExclusiveArch: %{java_arches} noarch
- maven-archiver
ExclusiveArch: %{java_arches} noarch
- maven-artifact-transfer
ExclusiveArch: %{java_arches} noarch
- maven-assembly-plugin
ExclusiveArch: %{java_arches} noarch
- maven-bundle-plugin
ExclusiveArch: %{java_arches} noarch
- maven-clean-plugin
ExclusiveArch: %{java_arches} noarch
- maven-common-artifact-filters
ExclusiveArch: %{java_arches} noarch
- maven-compiler-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-analyzer
ExclusiveArch: %{java_arches} noarch
- maven-dependency-plugin
ExclusiveArch: %{java_arches} noarch
- maven-dependency-tree
ExclusiveArch: %{java_arches} noarch
- maven-doxia
ExclusiveArch: %{java_arches} noarch
- maven-doxia-sitetools
ExclusiveArch: %{java_arches} noarch
- maven-enforcer
ExclusiveArch: %{java_arches} noarch
- maven-file-management
ExclusiveArch: %{java_arches} noarch
- maven-filtering
ExclusiveArch: %{java_arches} noarch
- maven-invoker
ExclusiveArch: %{java_arches} noarch
- maven-invoker-plugin
ExclusiveArch: %{java_arches} noarch
- maven-jar-plugin
ExclusiveArch: %{java_arches} noarch
- maven-mapping
ExclusiveArch: %{java_arches} noarch
- maven-native
ExclusiveArch: %{java_arches} noarch
- maven-parent
ExclusiveArch: %{java_arches} noarch
- maven-patch-plugin
ExclusiveArch: %{java_arches} noarch
- maven-plugin-testing
ExclusiveArch: %{java_arches} noarch
- maven-plugin-tools
ExclusiveArch: %{java_arches} noarch
- maven-remote-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-reporting-api
ExclusiveArch: %{java_arches} noarch
- maven-reporting-impl
ExclusiveArch: %{java_arches} noarch
- maven-resolver
ExclusiveArch: %{java_arches} noarch
- maven-resources-plugin
ExclusiveArch: %{java_arches} noarch
- maven-script-interpreter
ExclusiveArch: %{java_arches} noarch
- maven-shade-plugin
ExclusiveArch: %{java_arches} noarch
- maven-shared-incremental
ExclusiveArch: %{java_arches} noarch
- maven-shared-io
ExclusiveArch: %{java_arches} noarch
- maven-shared-utils
ExclusiveArch: %{java_arches} noarch
- maven-source-plugin
ExclusiveArch: %{java_arches} noarch
- maven-surefire
ExclusiveArch: %{java_arches} noarch
- maven-verifier
ExclusiveArch: %{java_arches} noarch
- maven-verifier-plugin
ExclusiveArch: %{java_arches} noarch
- maven-wagon
ExclusiveArch: %{java_arches} noarch
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mcrouter
ExclusiveArch: x86_64 aarch64 ppc64le
- mecab-java
ExclusiveArch: %java_arches
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: x86_64 %{ix86}
- merkuro
ExclusiveArch: %{qt6_qtwebengine_arches}
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64 riscv64
- miglayout
ExclusiveArch: %{java_arches} noarch
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- moby-engine
ExclusiveArch: %{golang_arches}
- mockito
ExclusiveArch: %{java_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- modello
ExclusiveArch: %{java_arches} noarch
- moditect
ExclusiveArch: %{java_arches} noarch
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- modulemaker-maven-plugin
ExclusiveArch: %{java_arches} noarch
- mojo-executor
ExclusiveArch: %{java_arches} noarch
- mojo-parent
ExclusiveArch: %{java_arches} noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- msv
ExclusiveArch: %{java_arches} noarch
- mvfst
ExclusiveArch: x86_64 aarch64 ppc64le
- mxparser
ExclusiveArch: %{java_arches} noarch
- mysql-connector-java
ExclusiveArch: %{java_arches} noarch
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- naga
ExclusiveArch: %{java_arches} noarch
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- nekohtml
ExclusiveArch: %{java_arches} noarch
- netavark
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjs-module-lexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-undici
ExclusiveArch: %{nodejs_arches} noarch
- nodejs18
ExclusiveArch: %{nodejs_arches}
- nodejs20
ExclusiveArch: %{nodejs_arches}
- nom-tam-fits
ExclusiveArch: %{java_arches} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- objectweb-asm
ExclusiveArch: %{java_arches} noarch
- objenesis
ExclusiveArch: %{java_arches} noarch
- obs-cef
ExclusiveArch: x86_64 aarch64
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
ExclusiveArch: %{golang_arches_future}
- oidn
ExclusiveArch: x86_64
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- oneapi-level-zero
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- ongres-scram
ExclusiveArch: %{java_arches} noarch
- ongres-stringprep
ExclusiveArch: %{java_arches} noarch
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64 aarch64
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjdk-asmtools
ExclusiveArch: %{java_arches} noarch
- openjdk-asmtools7
ExclusiveArch: %{java_arches} noarch
- openjfx
ExclusiveArch: %{java_arches}
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openoffice.org-diafilter
ExclusiveArch: %{java_arches}
- openpgl
ExclusiveArch: aarch64 x86_64
- openssl-ibmca
ExclusiveArch: s390 s390x
- openstack-java-sdk
ExclusiveArch: %{java_arches} noarch
- opentest4j
ExclusiveArch: %{java_arches} noarch
- openvkl
ExclusiveArch: aarch64 x86_64
- optee_client
ExclusiveArch: aarch64
- optee_os
ExclusiveArch: aarch64
- options
ExclusiveArch: %{java_arches} noarch
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- osgi-annotation
ExclusiveArch: %{java_arches} noarch
- osgi-compendium
ExclusiveArch: %{java_arches} noarch
- osgi-core
ExclusiveArch: %{java_arches} noarch
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- pageedit
ExclusiveArch: %{qt5_qtwebengine_arches}
- parserng
ExclusiveArch: %{java_arches} noarch
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcfi
ExclusiveArch: %{java_arches} noarch
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfbox
ExclusiveArch: %{java_arches} noarch
- pdfmod
ExclusiveArch: %mono_arches
- pdftk-java
ExclusiveArch: %{java_arches} noarch
- pentaho-libxml
ExclusiveArch: %{java_arches} noarch
- pentaho-reporting-flow-engine
ExclusiveArch: %{java_arches} noarch
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- picocli
ExclusiveArch: %{java_arches} noarch
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- plantuml
ExclusiveArch: %{java_arches} noarch
- plasma-dialer
ExclusiveArch: %{java_arches}
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plexus-archiver
ExclusiveArch: %{java_arches} noarch
- plexus-build-api
ExclusiveArch: %{java_arches} noarch
- plexus-build-api0
ExclusiveArch: %{java_arches} noarch
- plexus-cipher
ExclusiveArch: %{java_arches} noarch
- plexus-classworlds
ExclusiveArch: %{java_arches} noarch
- plexus-compiler
ExclusiveArch: %{java_arches} noarch
- plexus-component-api
ExclusiveArch: %{java_arches} noarch
- plexus-components-pom
ExclusiveArch: %{java_arches} noarch
- plexus-containers
ExclusiveArch: %{java_arches} noarch
- plexus-i18n
ExclusiveArch: %{java_arches} noarch
- plexus-interpolation
ExclusiveArch: %{java_arches} noarch
- plexus-io
ExclusiveArch: %{java_arches} noarch
- plexus-languages
ExclusiveArch: %{java_arches} noarch
- plexus-pom
ExclusiveArch: %{java_arches} noarch
- plexus-resources
ExclusiveArch: %{java_arches} noarch
- plexus-sec-dispatcher
ExclusiveArch: %{java_arches} noarch
- plexus-utils
ExclusiveArch: %{java_arches} noarch
- plexus-velocity
ExclusiveArch: %{java_arches} noarch
- podman
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- postgresql-jdbc
ExclusiveArch: %{java_arches} noarch
- powerpc-utils
ExclusiveArch: ppc %{power64}
- powerstat
ExclusiveArch: %{ix86} x86_64
- ppc64-diag
ExclusiveArch: ppc %{power64}
- procyon
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
ExclusiveArch: %{java_arches} noarch
- proguard
ExclusiveArch: %{java_arches} noarch
- prometheus-jmx-exporter
ExclusiveArch: %{java_arches} noarch
- prometheus-simpleclient-java
ExclusiveArch: %{java_arches} noarch
- proxygen
ExclusiveArch: x86_64 aarch64 ppc64le
- pveclib
ExclusiveArch: ppc %{power64}
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-ast-monitor
ExclusiveArch: %{qt6_qtwebengine_arches} noarch
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-damo
ExclusiveArch: x86_64 aarch64 ppc64le s390x noarch
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-javaobj
ExclusiveArch: %{java_arches} noarch
- python-jnius
ExclusiveArch: %{java_arches}
- python-jupyter-polymake
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pyahocorasick
ExclusiveArch: x86_64 %{arm64} ppc64le
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-pyqt6-webengine
ExclusiveArch: aarch64 x86_64
- python-torch
ExclusiveArch: x86_64 aarch64
- python-torchdata
ExclusiveArch: x86_64 aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatengine
ExclusiveArch: x86_64
- qatzip
ExclusiveArch: x86_64
- qbe
ExclusiveArch: x86_64 aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qdox
ExclusiveArch: %{java_arches} noarch
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt6-qtwebengine
ExclusiveArch: aarch64 x86_64
- qt6-qtwebview
ExclusiveArch: aarch64 x86_64
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rEFInd
ExclusiveArch: %{efi}
- rachota
ExclusiveArch: %{java_arches} noarch
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reflections
ExclusiveArch: %{java_arches} noarch
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- regexp
ExclusiveArch: %{java_arches} noarch
- relaxng-datatype-java
ExclusiveArch: %{java_arches} noarch
- replacer
ExclusiveArch: %{java_arches} noarch
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- resteasy
ExclusiveArch: %{java_arches} noarch
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- retsnoop
ExclusiveArch: %{rust_arches}
- rhino
ExclusiveArch: %{java_arches} noarch
- river
ExclusiveArch: %{zig_arches}
- rkcommon
ExclusiveArch: x86_64 aarch64
- rocalution
ExclusiveArch: x86_64
- rocblas
ExclusiveArch: x86_64
- rocclr
ExclusiveArch: x86_64
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-rpm-macros
ExclusiveArch: x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-smi
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rocprim
ExclusiveArch: x86_64
- rocrand
ExclusiveArch: x86_64
- rocsparse
ExclusiveArch: x86_64
- rocthrust
ExclusiveArch: x86_64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt6_qtwebengine_arches}
- rstudio
ExclusiveArch: %{java_arches}
- rsyntaxtextarea
ExclusiveArch: %{java_arches} noarch
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{golang_arches_future}
- rundoc
ExclusiveArch: %{java_arches} noarch
- rust
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-dashmap4
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamming
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-hyperlocal
ExclusiveArch: %{rust_arches}
- rust-image0.23
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder0.1
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-krunvm
ExclusiveArch: x86_64 aarch64
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kvm-ioctls
ExclusiveArch: x86_64 aarch64
- rust-lebe
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-msru
ExclusiveArch: x86_64
- rust-nanorand
ExclusiveArch: %{rust_arches}
- rust-netstat2
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pathsearch
ExclusiveArch: %{rust_arches}
- rust-pretty-bytes
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-primal-bit
ExclusiveArch: %{rust_arches}
- rust-primal-check
ExclusiveArch: %{rust_arches}
- rust-primal-estimate
ExclusiveArch: %{rust_arches}
- rust-procfs0.9
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-pwd
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_core
ExclusiveArch: %{rust_arches}
- rust-schemafy_lib
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde_qs
ExclusiveArch: %{rust_arches}
- rust-serde_yaml0.8
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: x86_64
- rust-sevctl
ExclusiveArch: x86_64
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-sinit
ExclusiveArch: %{rust_arches}
- rust-snphost
ExclusiveArch: x86_64
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-tiff0.6
ExclusiveArch: %{rust_arches}
- rust-totp-lite
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-uriparse
ExclusiveArch: %{rust_arches}
- rust-uucore
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-web-ext-native-messaging
ExclusiveArch: %{rust_arches}
- rust-wezterm-color-types
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic
ExclusiveArch: %{rust_arches}
- rust-wezterm-dynamic-derive
ExclusiveArch: %{rust_arches}
- rust-zbus1
ExclusiveArch: %{rust_arches}
- rust-zbus_macros1
ExclusiveArch: %{rust_arches}
- rust-zvariant2
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive2
ExclusiveArch: %{rust_arches}
- rustup
ExclusiveArch: x86_64 aarch64
- rutabaga-gfx-ffi
ExclusiveArch: x86_64 aarch64
- sac
ExclusiveArch: %{java_arches} noarch
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sat4j
ExclusiveArch: %{java_arches} noarch
- sbcl
ExclusiveArch: %{ix86} x86_64 aarch64 %{power64}
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sblim-cim-client
ExclusiveArch: %{java_arches} noarch
- sblim-cim-client2
ExclusiveArch: %{java_arches} noarch
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- scala
ExclusiveArch: %{java_arches} noarch
- scannotation
ExclusiveArch: %{java_arches} noarch
- sdljava
ExclusiveArch: %{java_arches}
- sdrangel
ExclusiveArch: %{qt5_qtwebengine_arches}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- sdubby
ExclusiveArch: %{efi}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- sequence-library
ExclusiveArch: %{java_arches} noarch
- servicelog
ExclusiveArch: ppc %{power64}
- shaman
ExclusiveArch: %{java_arches} noarch
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigil
ExclusiveArch: %{qt5_qtwebengine_arches}
- sigul
ExclusiveArch: x86_64
- singularity-ce
ExclusiveArch: %{go_arches}
- sisu
ExclusiveArch: %{java_arches} noarch
- sisu-mojos
ExclusiveArch: %{java_arches} noarch
- skopeo
ExclusiveArch: %{golang_arches_future}
ExclusiveArch: aarch64 ppc64le s390x x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- slf4j
ExclusiveArch: %{java_arches} noarch
- slirp4netns
ExclusiveArch: %{golang_arches_future}
- snakeyaml
ExclusiveArch: %{java_arches} noarch
- snapd
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- snip
ExclusiveArch: %{java_arches} noarch
- softnet-stat
ExclusiveArch: %{rust_arches}
- soup-sharp
ExclusiveArch: %{mono_arches}
- spacebar
ExclusiveArch: %{java_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spec-version-maven-plugin
ExclusiveArch: %{java_arches} noarch
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-parent
ExclusiveArch: %{java_arches} noarch
- springlobby
ExclusiveArch: %{ix86} x86_64
- spyder
ExclusiveArch: %{qt5_qtwebengine_arches}
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- stats-collect
ExclusiveArch: %{ix86} x86_64 noarch
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- string-template-maven-plugin
ExclusiveArch: %{java_arches} noarch
- stringtemplate
ExclusiveArch: %{java_arches} noarch
- stringtemplate4
ExclusiveArch: %{java_arches} noarch
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- subscription-manager-cockpit
ExclusiveArch: %{nodejs_arches} noarch
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svnkit
ExclusiveArch: %{java_arches} noarch
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- swiftlint
ExclusiveArch: x86_64 aarch64
- swing-layout
ExclusiveArch: %{java_arches} noarch
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system-rules
ExclusiveArch: %{java_arches} noarch
- systemd-boot
ExclusiveArch: %efi
- t-digest
ExclusiveArch: %{java_arches} noarch
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tagsoup
ExclusiveArch: %{java_arches} noarch
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- testng
ExclusiveArch: %{java_arches} noarch
- texlive
ExclusiveArch: %{java_arches} noarch
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tokodon
ExclusiveArch: %{qt6_qtwebengine_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tomcat
ExclusiveArch: %{java_arches} noarch
- tomcat-native
ExclusiveArch: %{java_arches}
- tomcat-taglibs-parent
ExclusiveArch: %{java_arches} noarch
- tomcatjss
ExclusiveArch: %{java_arches} noarch
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- treelayout
ExclusiveArch: %{java_arches} noarch
- trilead-ssh2
ExclusiveArch: %{java_arches} noarch
- truth
ExclusiveArch: %{java_arches} noarch
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- typescript
ExclusiveArch: %{nodejs_arches} noarch
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- umr
ExclusiveArch: x86_64 aarch64 ppc64le
- unetbootin
ExclusiveArch: %{ix86} x86_64
- univocity-parsers
ExclusiveArch: %{java_arches} noarch
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- vakzination
ExclusiveArch: %{java_arches}
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vecmath1.2
ExclusiveArch: %{java_arches} noarch
- velocity
ExclusiveArch: %{java_arches} noarch
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- vim-syntastic
ExclusiveArch: %{java_arches} noarch
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtiofsd
ExclusiveArch: %{rust_arches}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- voms-api-java
ExclusiveArch: %{java_arches} noarch
- voms-clients-java
ExclusiveArch: %{java_arches} noarch
- vrq
ExclusiveArch: %{ix86} x86_64
- wangle
ExclusiveArch: x86_64 aarch64 ppc64le
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- wasmedge
ExclusiveArch: x86_64 aarch64
- watchman
ExclusiveArch: x86_64 aarch64 ppc64le
- wdt
ExclusiveArch: x86_64 aarch64 ppc64le
- webkit2-sharp
ExclusiveArch: %mono_arches
- weld-parent
ExclusiveArch: %{java_arches} noarch
- why3
ExclusiveArch: %{ocaml_native_compiler}
- widevine-installer
ExclusiveArch: aarch64
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- ws-commons-util
ExclusiveArch: %{java_arches} noarch
- wsdl4j
ExclusiveArch: %{java_arches} noarch
- wult
ExclusiveArch: x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86-simd-sort
ExclusiveArch: x86_64
- xalan-j2
ExclusiveArch: %{java_arches} noarch
- xbean
ExclusiveArch: %{java_arches} noarch
- xbyak
ExclusiveArch: x86_64
- xbyak_aarch64
ExclusiveArch: aarch64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: x86_64 aarch64
- xerces-j2
ExclusiveArch: %{java_arches} noarch
- xgap
ExclusiveArch: %{gap_arches}
- xml-commons-apis
ExclusiveArch: %{java_arches} noarch
- xml-commons-resolver
ExclusiveArch: %{java_arches} noarch
- xml-maven-plugin
ExclusiveArch: %{java_arches} noarch
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xmlgraphics-commons
ExclusiveArch: %{java_arches} noarch
- xmlpull
ExclusiveArch: %{java_arches} noarch
- xmlstreambuffer
ExclusiveArch: %{java_arches} noarch
- xmlunit
ExclusiveArch: %{java_arches} noarch
- xmvn
ExclusiveArch: %{java_arches} noarch
- xmvn-connector-ivy
ExclusiveArch: %{java_arches} noarch
- xmvn-generator
ExclusiveArch: %{java_arches}
- xnnpack
ExclusiveArch: x86_64 aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xstream
ExclusiveArch: %{java_arches} noarch
- xz-java
ExclusiveArch: %{java_arches} noarch
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zcfan
ExclusiveArch: x86_64
- zeal
ExclusiveArch: aarch64 x86_64
- zenon
ExclusiveArch: %{ocaml_native_compiler}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
18 Dec '23
The package rpms/kaffeine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kaffeine.git/commit/?id=1df7dabdf29….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 4727d84dd391f4412eae29ed3568df85ad203d56
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Dec 18 22:26:01 2023 -0500
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..e4f6252
--- /dev/null
+++ b/changelog
@@ -0,0 +1,369 @@
+* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
+- Re-import into Fedora
+
+* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
+- Improve compatibility with new CMake macro
+
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
+- update to 2.0.18
+
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
+- update to 2.0.17
+
+* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
+- update to 2.0.16
+- use tarball from github with fixed versioning
+- drop previously applied patch
+- add translations from http://kaffeine.kde.org/
+- enable pt_br language again
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
+- update to 2.0.15 release
+
+* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- Use ninja to build
+- Remove scriptlets
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
+- remove broken pt_BR locale
+- fix appdata install
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
+- update to 2.0.14 release
+
+* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
+- update to 2.0.13 release
+
+* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
+- update to 2.0.12 release
+
+* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
+- update to 2.0.10 release
+
+* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
+- update to 2.0.9 release
+
+* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
+- Add Requires: qt5-qttranslations (fix rfbz#4450).
+- Add COPYING-DOCS
+
+* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
+- Add Requires: vlc (fix rfbz#4394).
+
+* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
+- update to 2.0.5 release
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
+- rebuilt
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
+- revert last commit
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
+- use kinit requires macro
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
+- add some missing runtime deps
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
+- update to 2.0.4 release
+
+* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
+- Rebuild for xine-lib 1.2.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme
+
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
+
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/kaffeine.spec b/kaffeine.spec
index a5d92d8..53a99ba 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 2.0.18
-Release: 10%{?dist}
+Release: %autorelease -b 9
License: GPL-2.0-or-later AND GFDL-1.3-or-later
Summary: KDE media player based on VLC
URL: https://apps.kde.org/kaffeine/
@@ -88,372 +88,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.ka
%changelog
-* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
-- Re-import into Fedora
-
-* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
- 5.1
-
-* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
-- Improve compatibility with new CMake macro
-
-* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
-- update to 2.0.18
-
-* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
-- update to 2.0.17
-
-* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
-- update to 2.0.16
-- use tarball from github with fixed versioning
-- drop previously applied patch
-- add translations from http://kaffeine.kde.org/
-- enable pt_br language again
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
-- update to 2.0.15 release
-
-* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
-- Use ninja to build
-- Remove scriptlets
-
-* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
-- remove broken pt_BR locale
-- fix appdata install
-
-* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
-- update to 2.0.14 release
-
-* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
-- update to 2.0.13 release
-
-* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
-- update to 2.0.12 release
-
-* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
-- update to 2.0.10 release
-
-* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
-- update to 2.0.9 release
-
-* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
-- Add Requires: qt5-qttranslations (fix rfbz#4450).
-- Add COPYING-DOCS
-
-* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
-- Add Requires: vlc (fix rfbz#4394).
-
-* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
-- update to 2.0.5 release
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
-- rebuilt
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
-- revert last commit
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
-- use kinit requires macro
-
-* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
-- add some missing runtime deps
-
-* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
-- update to 2.0.4 release
-
-* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
-- Patch for gcc6 and cmake changes
-
-* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
-- Rebuild for xine-lib 1.2.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
-- backport upstream patch to fix FTBFS with g++ 4.7
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
-- 1.2.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
-- kaffeine 1.1
-- fixes #618718
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
-- reverted to source
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
-- use ln now to have a kaffeine icon in hicolor
-- working with upstream to get it fixed
-- fixes #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
-- changed Requires to kdebase-runtime
-- added kaffeine.png to fix #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme
-
-* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
-- Unexpanded macro in kdelibs4 dependency (#606134)
-- remove old/unused patches
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
-- removed Require libXss, added BR libXss-devel
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
-- kaffeine 1.0
-- new dep libXss
-- lots of improvements and bugfixes
-
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
-- deinterlace-optional patch thanks to Kevin Kofler
-
-* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
-- kaffeine-1.0-pre3
-- adjust summary/description: no longer phonon based (uses xine-lib)
-
-* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
-- kaffeine-1.0-pre2
-- update %%description/%%summary
-- %%check: use desktop-file-validate
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
-- kaffeine-1.0-pre1
-
-* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
-- re-enable dvb (#495379)
-
-* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
-- Improve icon cache and desktop database update scriptlets.
-- Update URL.
-
-* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
-- s/nonfree/freeworld/
-- --without-dvb (f11+)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
-- EPG and OSD patch (#452421).
-
-* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
-- Unfuzz optflags patch.
-
-* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
-- kaffeine-0.8.7
-
-* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
-- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
-
-* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
-- fix deps wrt kaffeine-libs (#436442)
-- f7: xcb support (#373411)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
-- Autorebuild for GCC 4.3
-
-* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
-- kaffeine-0.8.6
-
-* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
-- Require kdelibs3-devel instead of kdelibs-devel in -devel.
-
-* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
-- BR: kdelibs3-devel
-
-* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
-- multiarch conflicts in kaffeine (#341681)
-
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
-- Avoid autotools re-run after configure (unclean upstream tarball?)
-
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
-- respin (BuildID)
-
-* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
-- License: GPLv2+
-- BR: libxcb-devel (really)
-
-* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
-- kaffeine-0.8.5
-- BR: libxcb-devel
-
-* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4 (#243823)
-
-* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
-- disable gst08 support (for now), it's been orphaned
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
-- less globbing in %%files
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
-
-* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
-- 0.8.3
-
-* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
-- %%doc README
-
-* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
-- fix chmod so it actually works.
-
-* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
-- chmod -x AUTHORS ChangeLog TODO
-- use rel symlinks under %%_docdir
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
-- update %%description to not mention any specific mm containers
- (like AVI, WMV).
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
-- fixup for Extras
-- support building kaffeine-extras-nonfree for that other repo.
-
-* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
-- 0.8.2
-
-* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
-- for kdelibs >= 3.5.4, omit
- /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
-
-* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
-- BR: libXtst-devel libXinerama-devel (fc5+)
-
-* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
-- (re)enable gstreamer support (fc3+)
-
-* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
-- avoid re-auto'ing thing, breaks locale/po-files
-
-* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
-- 0.8.1
-- cdda patch (upsgream bug #1463542)
-
-* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
-- drop --vendor=livna
-- fdo icon spec fix
-- kaffeine-0.7.x-CVE-2006-0051.patch
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
-- update-desktop-database (#645)
-- -devel pkg (#645)
-- -gstreamer subpkg, marked experimental (due to upstream #1254363)
-- omit -desktop patch (#645)
-- use desktop-file-install (#645)
-
-* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
-- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
-
-* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
-- 0.7.1, gcc visibility hack no longer needed.
-
-* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
-- 0.7, now with DVB support (FC4+ only).
-- GStreamer support disabled by default due to upstream #1254363, rebuild
- with "--with gstreamer" to enable.
-- Quick and dirty workaround for upstream #1253989.
-
-* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
-- 0.6.
-
-* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
-- Update to 0.5.
-
-* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
-- Update to 0.5rc2.
-
-* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
-- Update to 0.5rc1.
-- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
-- Purge libselinux workarounds, no longer needed.
-- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
-- Disable dependency tracking to speed up the build.
-- Provide -devel.
-
-* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
-- Update to 0.4.3b.
-- Add workaround for https://bugzilla.redhat.com/123853
-
-* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
-- Update to 0.4.3.
-
-* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
-- Update to 0.4.2.
-
-* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
-- Update to 0.4.1, patches applied upstream.
-- Update description.
-
-* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
-- Update to 0.4.
-- Disable rpath.
-- Add Gnome icon.
-
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
-- Own directories under %%{_datadir}/icons.
-
-* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
-- First build.
+%autochangelog
commit 1df7dabdf29faecd90bd3df1eeff95d411ced04e
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Dec 18 22:25:33 2023 -0500
Re-import into Fedora
diff --git a/.gitignore b/.gitignore
index 3798cee..ddd79d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kaffeine.png
/kaffeine-1.1.tar.gz
/kaffeine-1.2.2.tar.gz
+/kaffeine-2.0.18.tar.xz
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
deleted file mode 100644
index e74563e..0000000
--- a/kaffeine-1.2.2-gcc47.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfister(a)gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
index ff25edf..a5d92d8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,97 +1,209 @@
-Name: kaffeine
-Version: 1.2.2
-Release: 6%{?dist}
-
-License: GPLv2+
-Summary: KDE media player
-Group: Applications/Multimedia
-URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## upstream patches
-# fix build with g++ 4.7 (Christoph Pfister)
-# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
-Patch100: kaffeine-1.2.2-gcc47.patch
+Name: kaffeine
+Version: 2.0.18
+Release: 10%{?dist}
+License: GPL-2.0-or-later AND GFDL-1.3-or-later
+Summary: KDE media player based on VLC
+URL: https://apps.kde.org/kaffeine/
+Source: https://download.kde.org/%{stable_kf5}/%{name}/%{name}-%{version}.tar.xz
BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel libXScrnSaver-devel
+BuildRequires: kf5-rpm-macros
+BuildRequires: libappstream-glib
+
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5X11Extras)
+
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5WidgetsAddons)
+BuildRequires: cmake(KF5WindowSystem)
+BuildRequires: cmake(KF5XmlGui)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5DBusAddons)
+BuildRequires: cmake(KF5DocTools)
+
+BuildRequires: pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(libvlc)
+BuildRequires: pkgconfig(libdvbv5)
+
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+Requires: kio-extras-kf5%{?_isa}
+%else
+Requires: kio-extras%{?_isa}
+%endif
+# Needed for open file dialog translations
+Requires: qt5-qttranslations
+Requires: vlc-plugins-base%{?_isa}
+Requires: vlc-plugins-video-out%{?_isa}
+Recommends: vlc-plugin-ffmpeg%{?_isa}
+Recommends: (vlc-plugin-gnome%{?_isa} if gnome-keyring%{?_isa})
+Recommends: (vlc-plugin-kde%{?_isa} if kf5-kwallet%{?_isa})
+Recommends: (vlc-plugin-pulseaudio%{?_isa} or vlc-plugin-pipewire%{?_isa})
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
-Obsoletes: kaffeine-libs < 1.0
-Obsoletes: kaffeine-devel < 1.0
+%description
+Kaffeine is a KDE media player. Kaffeine has user-friendly interface,
+so that even first time users can start immediately playing their movies
+from DVD (including DVD menus, titles, chapters, etc.), VCD, or a file.
-Requires: kdebase-runtime
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+%prep
+%autosetup -p1
-%description
-Kaffeine is a KDE media player.
+%build
+%cmake_kf5
+%cmake_build
-%prep
-%setup -q -n kaffeine-%{version}
-%patch100 -p1 -b .gcc47
+%install
+%cmake_install
+%find_lang %{name} --with-qt --with-man --with-html --all-name
-%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%check
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kaffeine.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml
-%install
-rm -rf %{buildroot}
+%files -f %{name}.lang
+%doc README.md
+%license COPYING COPYING-DOCS
+%{_kf5_bindir}/kaffeine
+%{_kf5_datadir}/kaffeine/
+%{_kf5_datadir}/applications/org.kde.kaffeine.desktop
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/profiles/kaffeine.profile.xml
+%{_kf5_datadir}/solid/actions/*.desktop
+%{_kf5_mandir}/man1/kaffeine.1.*
+%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --with-kde
+%changelog
+* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
+- Re-import into Fedora
+* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-%clean
-rm -rf %{buildroot}
+* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-%postun
-if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-fi
+* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
+- Improve compatibility with new CMake macro
-%posttrans
-update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
+- update to 2.0.18
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_kde4_bindir}/kaffeine
-%{_kde4_bindir}/kaffeine-xbu
-%{_kde4_appsdir}/kaffeine/
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
+- update to 2.0.17
+
+* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
+- update to 2.0.16
+- use tarball from github with fixed versioning
+- drop previously applied patch
+- add translations from http://kaffeine.kde.org/
+- enable pt_br language again
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
+- update to 2.0.15 release
+
+* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- Use ninja to build
+- Remove scriptlets
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
+- remove broken pt_BR locale
+- fix appdata install
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
+- update to 2.0.14 release
+
+* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
+- update to 2.0.13 release
+
+* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
+- update to 2.0.12 release
+
+* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
+- update to 2.0.10 release
+
+* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
+- update to 2.0.9 release
+
+* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
+- Add Requires: qt5-qttranslations (fix rfbz#4450).
+- Add COPYING-DOCS
+
+* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
+- Add Requires: vlc (fix rfbz#4394).
+
+* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
+- update to 2.0.5 release
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
+- rebuilt
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
+- revert last commit
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
+- use kinit requires macro
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
+- add some missing runtime deps
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
+- update to 2.0.4 release
+
+* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
+- Rebuild for xine-lib 1.2.
-%changelog
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -204,7 +316,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
- BR: kdelibs3-devel
-* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
- multiarch conflicts in kaffeine (#341681)
* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
diff --git a/sources b/sources
index 5a867c7..0020cf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
+SHA512 (kaffeine-2.0.18.tar.xz) = 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
commit f54d7038e22f3bff261830dc8882672d8aad5a70
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Dec 18 13:40:50 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11840
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3798cee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/kaffeine.png
+/kaffeine-1.1.tar.gz
+/kaffeine-1.2.2.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index a621cab..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister(a)gmail.com>
+Date: Wed Apr 4 21:22:09 2012 +0200
+
+ fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
+
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
new file mode 100644
index 0000000..ff25edf
--- /dev/null
+++ b/kaffeine.spec
@@ -0,0 +1,347 @@
+Name: kaffeine
+Version: 1.2.2
+Release: 6%{?dist}
+
+License: GPLv2+
+Summary: KDE media player
+Group: Applications/Multimedia
+URL: http://kaffeine.kde.org/
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: xine-lib-devel libXScrnSaver-devel
+
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
+
+Requires: kdebase-runtime
+
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+
+%description
+Kaffeine is a KDE media player.
+
+
+%prep
+%setup -q -n kaffeine-%{version}
+%patch100 -p1 -b .gcc47
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf %{buildroot}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database %{_datadir}/applications &>/dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING README
+%{_kde4_bindir}/kaffeine
+%{_kde4_bindir}/kaffeine-xbu
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+
+
+%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme
+
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
+
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/sources b/sources
new file mode 100644
index 0000000..5a867c7
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 95d66162001360cf742d8d97ee1b45c5dcc873e5
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Oct 24 01:02:54 2013 +0200
Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3798cee..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/kaffeine.png
-/kaffeine-1.1.tar.gz
-/kaffeine-1.2.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a621cab
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
deleted file mode 100644
index e74563e..0000000
--- a/kaffeine-1.2.2-gcc47.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfister(a)gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
deleted file mode 100644
index ff25edf..0000000
--- a/kaffeine.spec
+++ /dev/null
@@ -1,347 +0,0 @@
-Name: kaffeine
-Version: 1.2.2
-Release: 6%{?dist}
-
-License: GPLv2+
-Summary: KDE media player
-Group: Applications/Multimedia
-URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## upstream patches
-# fix build with g++ 4.7 (Christoph Pfister)
-# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
-Patch100: kaffeine-1.2.2-gcc47.patch
-
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel libXScrnSaver-devel
-
-Obsoletes: kaffeine-libs < 1.0
-Obsoletes: kaffeine-devel < 1.0
-
-Requires: kdebase-runtime
-
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
-
-%description
-Kaffeine is a KDE media player.
-
-
-%prep
-%setup -q -n kaffeine-%{version}
-%patch100 -p1 -b .gcc47
-
-
-%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
-
-
-%install
-rm -rf %{buildroot}
-
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-%find_lang %{name} --with-kde
-
-
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-fi
-
-%posttrans
-update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_kde4_bindir}/kaffeine
-%{_kde4_bindir}/kaffeine-xbu
-%{_kde4_appsdir}/kaffeine/
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/profiles/kaffeine.profile.xml
-
-
-%changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
-- backport upstream patch to fix FTBFS with g++ 4.7
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
-- 1.2.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
-- kaffeine 1.1
-- fixes #618718
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
-- reverted to source
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
-- use ln now to have a kaffeine icon in hicolor
-- working with upstream to get it fixed
-- fixes #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
-- changed Requires to kdebase-runtime
-- added kaffeine.png to fix #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme
-
-* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
-- Unexpanded macro in kdelibs4 dependency (#606134)
-- remove old/unused patches
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
-- removed Require libXss, added BR libXss-devel
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
-- kaffeine 1.0
-- new dep libXss
-- lots of improvements and bugfixes
-
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
-- deinterlace-optional patch thanks to Kevin Kofler
-
-* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
-- kaffeine-1.0-pre3
-- adjust summary/description: no longer phonon based (uses xine-lib)
-
-* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
-- kaffeine-1.0-pre2
-- update %%description/%%summary
-- %%check: use desktop-file-validate
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
-- kaffeine-1.0-pre1
-
-* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
-- re-enable dvb (#495379)
-
-* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
-- Improve icon cache and desktop database update scriptlets.
-- Update URL.
-
-* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
-- s/nonfree/freeworld/
-- --without-dvb (f11+)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
-- EPG and OSD patch (#452421).
-
-* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
-- Unfuzz optflags patch.
-
-* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
-- kaffeine-0.8.7
-
-* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
-- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
-
-* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
-- fix deps wrt kaffeine-libs (#436442)
-- f7: xcb support (#373411)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
-- Autorebuild for GCC 4.3
-
-* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
-- kaffeine-0.8.6
-
-* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
-- Require kdelibs3-devel instead of kdelibs-devel in -devel.
-
-* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
-- BR: kdelibs3-devel
-
-* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
-- multiarch conflicts in kaffeine (#341681)
-
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
-- Avoid autotools re-run after configure (unclean upstream tarball?)
-
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
-- respin (BuildID)
-
-* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
-- License: GPLv2+
-- BR: libxcb-devel (really)
-
-* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
-- kaffeine-0.8.5
-- BR: libxcb-devel
-
-* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4 (#243823)
-
-* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
-- disable gst08 support (for now), it's been orphaned
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
-- less globbing in %%files
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
-
-* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
-- 0.8.3
-
-* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
-- %%doc README
-
-* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
-- fix chmod so it actually works.
-
-* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
-- chmod -x AUTHORS ChangeLog TODO
-- use rel symlinks under %%_docdir
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
-- update %%description to not mention any specific mm containers
- (like AVI, WMV).
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
-- fixup for Extras
-- support building kaffeine-extras-nonfree for that other repo.
-
-* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
-- 0.8.2
-
-* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
-- for kdelibs >= 3.5.4, omit
- /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
-
-* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
-- BR: libXtst-devel libXinerama-devel (fc5+)
-
-* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
-- (re)enable gstreamer support (fc3+)
-
-* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
-- avoid re-auto'ing thing, breaks locale/po-files
-
-* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
-- 0.8.1
-- cdda patch (upsgream bug #1463542)
-
-* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
-- drop --vendor=livna
-- fdo icon spec fix
-- kaffeine-0.7.x-CVE-2006-0051.patch
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
-- update-desktop-database (#645)
-- -devel pkg (#645)
-- -gstreamer subpkg, marked experimental (due to upstream #1254363)
-- omit -desktop patch (#645)
-- use desktop-file-install (#645)
-
-* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
-- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
-
-* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
-- 0.7.1, gcc visibility hack no longer needed.
-
-* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
-- 0.7, now with DVB support (FC4+ only).
-- GStreamer support disabled by default due to upstream #1254363, rebuild
- with "--with gstreamer" to enable.
-- Quick and dirty workaround for upstream #1253989.
-
-* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
-- 0.6.
-
-* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
-- Update to 0.5.
-
-* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
-- Update to 0.5rc2.
-
-* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
-- Update to 0.5rc1.
-- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
-- Purge libselinux workarounds, no longer needed.
-- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
-- Disable dependency tracking to speed up the build.
-- Provide -devel.
-
-* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
-- Update to 0.4.3b.
-- Add workaround for https://bugzilla.redhat.com/123853
-
-* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
-- Update to 0.4.3.
-
-* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
-- Update to 0.4.2.
-
-* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
-- Update to 0.4.1, patches applied upstream.
-- Update description.
-
-* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
-- Update to 0.4.
-- Disable rpath.
-- Add Gnome icon.
-
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
-- Own directories under %%{_datadir}/icons.
-
-* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
-- First build.
diff --git a/sources b/sources
deleted file mode 100644
index 5a867c7..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 04c7400ab654980857705f4a5cf594ea2cefba31
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 16:57:53 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index d60cd14..ff25edf 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit 09df2d736c792d0800a42c2f1c9bde7e4b4b208d
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 21:07:43 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 5f0735f..d60cd14 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit 05bdf49b4c724688de0466ec8ce53066f9c07827
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jul 19 11:59:20 2012 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 7072380..5f0735f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
- backport upstream patch to fix FTBFS with g++ 4.7
commit 64eb96749f4ab07f607f395e2403c63b856cdbb3
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Apr 22 00:27:49 2012 +0200
backport upstream patch to fix FTBFS with g++ 4.7
* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
- backport upstream patch to fix FTBFS with g++ 4.7
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister(a)gmail.com>
+Date: Wed Apr 4 21:22:09 2012 +0200
+
+ fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
+
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
index 5cbf877..7072380 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -9,7 +9,10 @@ URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstreamable patches
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -29,6 +32,7 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
+%patch100 -p1 -b .gcc47
%build
@@ -88,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit ea46631f4a8a7ad1ea5c86c738e2c3231dbb7419
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jan 13 00:39:23 2012 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 551d436..5cbf877 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
- 1.2.2
commit 1151e9ffa0020cf9abad5e507bfe224fe5a9e2f6
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 9 20:08:03 2011 -0500
1.2.2
diff --git a/.gitignore b/.gitignore
index bcaf79a..3798cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-kaffeine-1.0.tar.gz
-kaffeine.png
-/kaffeine-1.0.tar.gz
/kaffeine.png
/kaffeine-1.1.tar.gz
+/kaffeine-1.2.2.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index cace8ac..551d436 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,12 @@
Name: kaffeine
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -46,11 +45,6 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-mv %{buildroot}%{_kde4_iconsdir}/oxygen \
- %{buildroot}%{_kde4_iconsdir}/hicolor
-
-install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
-
%find_lang %{name} --with-kde
@@ -64,32 +58,39 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
update-desktop-database %{_datadir}/applications &>/dev/null
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO
+%doc COPYING README
%{_kde4_bindir}/kaffeine
%{_kde4_bindir}/kaffeine-xbu
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 852e1cf..5a867c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
-72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
+690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 87e1665531d0a1874fb378b56486e639dd22bc09
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:32:53 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index f0ffba4..cace8ac 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -90,6 +90,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
- kaffeine 1.1
- fixes #618718
commit 432e44083158ac4b16ef1f67516ea5bf76869d81
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Mon Sep 6 22:19:02 2010 +0200
kaffeine 1.1, seems i forgot the kaffeine.png file
diff --git a/sources b/sources
index f748375..852e1cf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
commit 09668aff683545b5c8b50e2ee4cc6f956d9f9123
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Mon Sep 6 22:11:30 2010 +0200
kaffeine 1.1
diff --git a/.gitignore b/.gitignore
index 145deaf..bcaf79a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ kaffeine-1.0.tar.gz
kaffeine.png
/kaffeine-1.0.tar.gz
/kaffeine.png
+/kaffeine-1.1.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 535b106..f0ffba4 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
-Version: 1.0
-Release: 7%{?dist}
+Version: 1.1
+Release: 1%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -90,6 +90,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
- reverted to source
diff --git a/sources b/sources
index 13aa78c..f748375 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
-d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
+72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
commit 55b72552b9d37b597483f2b68eeb78807f293ea6
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Tue Aug 17 20:50:38 2010 +0200
reverted to source1
diff --git a/.gitignore b/.gitignore
index 76e79b5..145deaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
kaffeine-1.0.tar.gz
kaffeine.png
+/kaffeine-1.0.tar.gz
+/kaffeine.png
diff --git a/kaffeine.spec b/kaffeine.spec
index e72e343..535b106 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-
+Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -49,6 +49,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
+
%find_lang %{name} --with-kde
@@ -62,7 +64,6 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-ln -f -s %{_kde4_iconsdir}/oxygen/48x48/apps/kaffeine.png %{_kde4_iconsdir}/hicolor/48x48/apps/
%postun
if [ $1 -eq 0 ] ; then
@@ -89,6 +90,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
- use ln now to have a kaffeine icon in hicolor
- working with upstream to get it fixed
commit e9fd27aa4c9bc7fe7b8bd92ae7db760b1f23e98d
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Tue Aug 17 19:25:35 2010 +0200
short-term-fix #611273
diff --git a/kaffeine.spec b/kaffeine.spec
index 42e1e90..e72e343 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Source1: kaffeine.png
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -49,8 +49,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
-
%find_lang %{name} --with-kde
@@ -64,6 +62,7 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ln -f -s %{_kde4_iconsdir}/oxygen/48x48/apps/kaffeine.png %{_kde4_iconsdir}/hicolor/48x48/apps/
%postun
if [ $1 -eq 0 ] ; then
@@ -90,6 +89,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
- changed Requires to kdebase-runtime
- added kaffeine.png to fix #611273
commit fe6952751953f7b80fd01200ad6c0ee961222bff
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Wed Jul 28 18:58:12 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index dda970f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: kaffeine
-# $Id: Makefile,v 1.1 2006/11/14 04:10:42 rdieter Exp $
-NAME := kaffeine
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 4bfb0687213cb16e43927e6f94f2bf7f59a773a8
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jul 22 18:14:32 2010 +0000
kaffeine.png : remove from cvs, put into sources instead
diff --git a/.cvsignore b/.cvsignore
index 88c4c51..76e79b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
kaffeine-1.0.tar.gz
+kaffeine.png
diff --git a/kaffeine.png b/kaffeine.png
deleted file mode 100644
index 5eb32a4..0000000
Binary files a/kaffeine.png and /dev/null differ
diff --git a/sources b/sources
index 9787ead..13aa78c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
+d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
commit 8432d7b9245c5f35ee7deee0eb9b301e54dad0b4
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jul 5 00:19:08 2010 +0000
minor esthetics wrt macros in scriptlets
diff --git a/kaffeine.spec b/kaffeine.spec
index 0139354..42e1e90 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -49,8 +49,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
-install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
%find_lang %{name} --with-kde
@@ -64,18 +63,18 @@ rm -rf %{buildroot}
%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%files -f %{name}.lang
commit d7834782e04e85fc0d91fcd2307db02c28c423ee
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 21:06:45 2010 +0000
man.. tired, forgot mkdir first
diff --git a/kaffeine.spec b/kaffeine.spec
index c22de69..0139354 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,6 +48,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+
+mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 7d3c3cbf9872ae74ac8c8d5c21b62eafc78937f9
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:58:20 2010 +0000
fixed a typo in spec
diff --git a/kaffeine.spec b/kaffeine.spec
index e16bfb1..c22de69 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,7 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-nstall -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 5dc55d207ffc1b4abc36b0f03a0a5585b84a3eeb
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:47:32 2010 +0000
spec fix
diff --git a/kaffeine.spec b/kaffeine.spec
index 5e07c4d..e16bfb1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,7 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-mv kaffeine.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+nstall -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 73db330336a18ce4bde9b5db61d2c09293b1d54f
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:37:13 2010 +0000
added kaffeine.png into hicolor to fix #611273
diff --git a/kaffeine.png b/kaffeine.png
new file mode 100644
index 0000000..5eb32a4
Binary files /dev/null and b/kaffeine.png differ
diff --git a/kaffeine.spec b/kaffeine.spec
index cc5629b..5e07c4d 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,12 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -19,8 +20,7 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
-# fix bug #611273
-Requires: oxygen-icon-theme
+Requires: kdebase-runtime
%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
@@ -48,6 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+mv kaffeine.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
@@ -88,8 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme #611273
+- added Requires oxygen-icon-theme
* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
- Unexpanded macro in kdelibs4 dependency (#606134)
commit d5d0cdbc92fe7205f8f11efd868e796f149dcddf
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 17:17:05 2010 +0000
added Requires: oxygen-icon-theme #611273
diff --git a/kaffeine.spec b/kaffeine.spec
index 926bd3f..cc5629b 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,6 @@
-
Name: kaffeine
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -20,6 +19,9 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
+# fix bug #611273
+Requires: oxygen-icon-theme
+
%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
%description
@@ -86,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme #611273
+
* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
- Unexpanded macro in kdelibs4 dependency (#606134)
- remove old/unused patches
commit 26798436e8ac96d9b9a428c1ff7312c4382c9cd9
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jun 21 12:24:54 2010 +0000
- Unexpanded macro in kdelibs4 dependency (#606134)
- remove old/unused patches
diff --git a/kaffeine-1.0-pre3-deinterlace-optional.patch b/kaffeine-1.0-pre3-deinterlace-optional.patch
deleted file mode 100644
index f4d7272..0000000
--- a/kaffeine-1.0-pre3-deinterlace-optional.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp
---- kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp 2010-01-31 18:04:50.000000000 +0100
-+++ kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp 2010-04-15 21:16:04.000000000 +0200
-@@ -44,8 +44,8 @@
- };
-
- XineObject::XineObject() : engine(NULL), audioOutput(NULL), videoOutput(NULL), stream(NULL),
-- eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), aspectRatio(XineAspectRatioAuto),
-- videoSize(0)
-+ eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), deinterlacing(false),
-+ aspectRatio(XineAspectRatioAuto), videoSize(0)
- {
- reader = new XinePipeReader(3, this);
- parentProcess = new XineParent(4, this);
-@@ -154,11 +154,13 @@
- break;
- }
- case XineCommands::SetDeinterlacing: {
-- bool deinterlacing_ = reader->readBool();
-+ if (deinterlacer != NULL) {
-+ bool deinterlacing_ = reader->readBool();
-
-- if (reader->isValid()) {
-- deinterlacing = deinterlacing_;
-- dirtyFlags |= SetDeinterlacing;
-+ if (reader->isValid()) {
-+ deinterlacing = deinterlacing_;
-+ dirtyFlags |= SetDeinterlacing;
-+ }
- }
-
- break;
-@@ -391,35 +393,32 @@
- xine_event_create_listener_thread(eventQueue, &event_listener_cb, this);
- deinterlacer = xine_post_init(engine, "tvtime", 1, 0, &videoOutput);
-
-- if (deinterlacer == NULL) {
-- parentProcess->initFailed("Cannot create deinterlace plugin.");
-- return;
-- }
--
-- xine_post_api_t *deinterlacerApi =
-- static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
-- xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
--
-- for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
-- xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
--
-- if ((parameter.type == POST_PARAM_TYPE_INT) &&
-- (strcmp(parameter.name, "method") == 0)) {
-- QByteArray parameterData;
-- parameterData.resize(deinterlacerParameters->struct_size);
-- char *data = parameterData.data();
-- deinterlacerApi->get_parameters(deinterlacer, data);
-- int *method = reinterpret_cast<int *>(data + parameter.offset);
--
-- for (char **value = parameter.enum_values; *value != NULL; ++value) {
-- if (strcmp(*value, "Greedy2Frame") == 0) {
-- *method = value - parameter.enum_values;
-- break;
-+ if (deinterlacer != NULL) {
-+ xine_post_api_t *deinterlacerApi =
-+ static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
-+ xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
-+
-+ for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
-+ xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
-+
-+ if ((parameter.type == POST_PARAM_TYPE_INT) &&
-+ (strcmp(parameter.name, "method") == 0)) {
-+ QByteArray parameterData;
-+ parameterData.resize(deinterlacerParameters->struct_size);
-+ char *data = parameterData.data();
-+ deinterlacerApi->get_parameters(deinterlacer, data);
-+ int *method = reinterpret_cast<int *>(data + parameter.offset);
-+
-+ for (char **value = parameter.enum_values; *value != NULL; ++value) {
-+ if (strcmp(*value, "Greedy2Frame") == 0) {
-+ *method = value - parameter.enum_values;
-+ break;
-+ }
- }
-- }
-
-- deinterlacerApi->set_parameters(deinterlacer, data);
-- break;
-+ deinterlacerApi->set_parameters(deinterlacer, data);
-+ break;
-+ }
- }
- }
diff --git a/kaffeine-1.0-pre3-mkfifo.patch.patch b/kaffeine-1.0-pre3-mkfifo.patch.patch
deleted file mode 100644
index 09ef7f8..0000000
--- a/kaffeine-1.0-pre3-mkfifo.patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo kaffeine-1.0-pre3/src/mediawidget.cpp
---- kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo 2010-01-31 11:04:50.000000000 -0600
-+++ kaffeine-1.0-pre3/src/mediawidget.cpp 2010-02-08 12:54:32.323917100 -0600
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/stat.h>
- #include "backend-xine/xinemediawidget.h"
- #include "osdwidget.h"
-
diff --git a/kaffeine.spec b/kaffeine.spec
index 0d294a6..926bd3f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,7 @@
Name: kaffeine
Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-#Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -30,7 +29,6 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
-#%patch60 -p1
%build
mkdir -p %{_target_platform}
@@ -86,7 +84,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+
%changelog
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
- removed Require libXss, added BR libXss-devel
commit 7818e38cd989e23f660c5b4e85c1f9526a2074fc
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jun 20 20:56:10 2010 +0000
fixed a typo in the spec
diff --git a/kaffeine.spec b/kaffeine.spec
index 2342499..0d294a6 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -21,7 +21,7 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
%description
Kaffeine is a KDE media player.
commit b33b78ddf35f3e9cd9a5841e06e496e9f29cd0ef
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 16:30:27 2010 +0000
removed Requires libXss, added BR libXss-devel
diff --git a/kaffeine.spec b/kaffeine.spec
index ceb39b7..2342499 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,7 @@
Name: kaffeine
Version: 1.0
-Release: 0%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -16,9 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel
-
-Requires: libXScrnSaver
+BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
@@ -89,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
- kaffeine 1.0
- new dep libXss
commit a14f22dc00f872c0b6fbf0647459483811ae2386
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 14:10:02 2010 +0000
spec fix 4
diff --git a/kaffeine.spec b/kaffeine.spec
index 0d90ca2..ceb39b7 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -86,7 +86,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
-
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
commit ea83020fb5f6638afb8aa445667dbf703e3ed631
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:59:56 2010 +0000
spec fix 3
diff --git a/kaffeine.spec b/kaffeine.spec
index dfa07df..0d90ca2 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -86,7 +86,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/kaffeinedvb.so
%changelog
commit 3819797869ddfe7f3cf7ed67157d5d6deb7e669f
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:47:25 2010 +0000
spec fix 2
diff --git a/kaffeine.spec b/kaffeine.spec
index a83a9a8..dfa07df 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,7 +11,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
+#Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -32,7 +32,7 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
-%patch60 -p1
+#%patch60 -p1
%build
mkdir -p %{_target_platform}
commit acfc3cc58a5a17305934fb2efe09b127801b88b0
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:33:36 2010 +0000
spec fix
diff --git a/kaffeine.spec b/kaffeine.spec
index 956075c..a83a9a8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
@@ -31,9 +30,8 @@ Kaffeine is a KDE media player.
%prep
-%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%setup -q -n kaffeine-%{version}
-%patch50 -p1 -b .mkfifo
%patch60 -p1
%build
commit 1b5f1dd1e249566e0643a6f864c5d6efb5b7ad32
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:23:35 2010 +0000
kaffeine 1.0
diff --git a/.cvsignore b/.cvsignore
index 4436234..88c4c51 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre3.tar.gz
+kaffeine-1.0.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 6e74a51..956075c 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,15 +1,13 @@
-%define pre pre3
-
Name: kaffeine
Version: 1.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -21,6 +19,8 @@ BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: xine-lib-devel
+Requires: libXScrnSaver
+
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
@@ -92,6 +92,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
- deinterlace-optional patch thanks to Kevin Kofler
diff --git a/sources b/sources
index d407339..9787ead 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-919e29a95b599db5eef74b5983f135f4 kaffeine-1.0-pre3.tar.gz
+81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
commit 691e754e1ad3b72496e94122ca75bdd8e971b473
Author: Kevin Kofler <kkofler(a)fedoraproject.org>
Date: Tue Apr 27 13:02:16 2010 +0000
Bump Release for upgrade path.
diff --git a/kaffeine.spec b/kaffeine.spec
index f9ff44b..6e74a51 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -2,8 +2,8 @@
%define pre pre3
Name: kaffeine
-Version: 1.0
-Release: 0.4.%{pre}%{?dist}
+Version: 1.0
+Release: 0.5.%{pre}%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,7 +92,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.4.pre3
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
- deinterlace-optional patch thanks to Kevin Kofler
* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
commit bd1805774999b28d01ffccfa870c62cdd55c1dca
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Thu Apr 15 19:54:49 2010 +0000
patch try2
diff --git a/kaffeine.spec b/kaffeine.spec
index 7554d52..f9ff44b 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -34,7 +34,7 @@ Kaffeine is a KDE media player.
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
%patch50 -p1 -b .mkfifo
-%patch60 -p0
+%patch60 -p1
%build
mkdir -p %{_target_platform}
commit c8e7d9ec21d3f097df47e019d6ae3e535b664001
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Thu Apr 15 19:32:16 2010 +0000
deinterlace-optional patch
diff --git a/kaffeine-1.0-pre3-deinterlace-optional.patch b/kaffeine-1.0-pre3-deinterlace-optional.patch
new file mode 100644
index 0000000..f4d7272
--- /dev/null
+++ b/kaffeine-1.0-pre3-deinterlace-optional.patch
@@ -0,0 +1,91 @@
+diff -ur kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp
+--- kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp 2010-01-31 18:04:50.000000000 +0100
++++ kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp 2010-04-15 21:16:04.000000000 +0200
+@@ -44,8 +44,8 @@
+ };
+
+ XineObject::XineObject() : engine(NULL), audioOutput(NULL), videoOutput(NULL), stream(NULL),
+- eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), aspectRatio(XineAspectRatioAuto),
+- videoSize(0)
++ eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), deinterlacing(false),
++ aspectRatio(XineAspectRatioAuto), videoSize(0)
+ {
+ reader = new XinePipeReader(3, this);
+ parentProcess = new XineParent(4, this);
+@@ -154,11 +154,13 @@
+ break;
+ }
+ case XineCommands::SetDeinterlacing: {
+- bool deinterlacing_ = reader->readBool();
++ if (deinterlacer != NULL) {
++ bool deinterlacing_ = reader->readBool();
+
+- if (reader->isValid()) {
+- deinterlacing = deinterlacing_;
+- dirtyFlags |= SetDeinterlacing;
++ if (reader->isValid()) {
++ deinterlacing = deinterlacing_;
++ dirtyFlags |= SetDeinterlacing;
++ }
+ }
+
+ break;
+@@ -391,35 +393,32 @@
+ xine_event_create_listener_thread(eventQueue, &event_listener_cb, this);
+ deinterlacer = xine_post_init(engine, "tvtime", 1, 0, &videoOutput);
+
+- if (deinterlacer == NULL) {
+- parentProcess->initFailed("Cannot create deinterlace plugin.");
+- return;
+- }
+-
+- xine_post_api_t *deinterlacerApi =
+- static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
+- xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
+-
+- for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
+- xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
+-
+- if ((parameter.type == POST_PARAM_TYPE_INT) &&
+- (strcmp(parameter.name, "method") == 0)) {
+- QByteArray parameterData;
+- parameterData.resize(deinterlacerParameters->struct_size);
+- char *data = parameterData.data();
+- deinterlacerApi->get_parameters(deinterlacer, data);
+- int *method = reinterpret_cast<int *>(data + parameter.offset);
+-
+- for (char **value = parameter.enum_values; *value != NULL; ++value) {
+- if (strcmp(*value, "Greedy2Frame") == 0) {
+- *method = value - parameter.enum_values;
+- break;
++ if (deinterlacer != NULL) {
++ xine_post_api_t *deinterlacerApi =
++ static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
++ xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
++
++ for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
++ xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
++
++ if ((parameter.type == POST_PARAM_TYPE_INT) &&
++ (strcmp(parameter.name, "method") == 0)) {
++ QByteArray parameterData;
++ parameterData.resize(deinterlacerParameters->struct_size);
++ char *data = parameterData.data();
++ deinterlacerApi->get_parameters(deinterlacer, data);
++ int *method = reinterpret_cast<int *>(data + parameter.offset);
++
++ for (char **value = parameter.enum_values; *value != NULL; ++value) {
++ if (strcmp(*value, "Greedy2Frame") == 0) {
++ *method = value - parameter.enum_values;
++ break;
++ }
+ }
+- }
+
+- deinterlacerApi->set_parameters(deinterlacer, data);
+- break;
++ deinterlacerApi->set_parameters(deinterlacer, data);
++ break;
++ }
+ }
+ }
diff --git a/kaffeine.spec b/kaffeine.spec
index 91a79fb..7554d52 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
+Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -33,7 +34,7 @@ Kaffeine is a KDE media player.
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
%patch50 -p1 -b .mkfifo
-
+%patch60 -p0
%build
mkdir -p %{_target_platform}
@@ -91,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.4.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
- kaffeine-1.0-pre3
- adjust summary/description: no longer phonon based (uses xine-lib)
commit 6f85f8fc047398063a092902a9ca0dc9f57dae69
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Feb 8 18:56:24 2010 +0000
#include <sys/stat.h> for mkfifo
diff --git a/kaffeine-1.0-pre1-kernel_headers.patch b/kaffeine-1.0-pre1-kernel_headers.patch
deleted file mode 100644
index be98188..0000000
--- a/kaffeine-1.0-pre1-kernel_headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
---- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers 2009-04-26 13:38:11.000000000 -0500
-+++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp 2009-04-26 14:34:24.526814875 -0500
-@@ -24,7 +24,7 @@
- * workaround buggy kernel includes
- * asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
- */
--typedef quint64 __u64;
-+//typedef quint64 __u64;
-
- #include <cmath>
- #include <errno.h>
diff --git a/kaffeine-1.0-pre3-mkfifo.patch.patch b/kaffeine-1.0-pre3-mkfifo.patch.patch
new file mode 100644
index 0000000..09ef7f8
--- /dev/null
+++ b/kaffeine-1.0-pre3-mkfifo.patch.patch
@@ -0,0 +1,11 @@
+diff -up kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo kaffeine-1.0-pre3/src/mediawidget.cpp
+--- kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo 2010-01-31 11:04:50.000000000 -0600
++++ kaffeine-1.0-pre3/src/mediawidget.cpp 2010-02-08 12:54:32.323917100 -0600
+@@ -43,6 +43,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #include "backend-xine/xinemediawidget.h"
+ #include "osdwidget.h"
+
diff --git a/kaffeine.spec b/kaffeine.spec
index b150456..91a79fb 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,6 +12,9 @@ URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
@@ -29,6 +32,8 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%patch50 -p1 -b .mkfifo
+
%build
mkdir -p %{_target_platform}
commit d1dede66587370b36b65f1f3bad407354b358584
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Feb 8 18:45:28 2010 +0000
- kaffeine-1.0-pre3
- adjust summary/description: no longer phonon based (uses xine-lib)
diff --git a/.cvsignore b/.cvsignore
index 1782054..4436234 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre2.tar.gz
+kaffeine-1.0-pre3.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 80bd65c..b150456 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,12 +1,12 @@
-%define pre pre2
+%define pre pre3
Name: kaffeine
Version: 1.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
License: GPLv2+
-Summary: Phonon-based media player
+Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
@@ -15,13 +15,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: phonon-devel
+BuildRequires: xine-lib-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+
%description
-Kaffeine is a phonon-based media player.
+Kaffeine is a KDE media player.
%prep
@@ -39,12 +41,13 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-%find_lang %{name}
+%find_lang %{name} --with-kde
%check
@@ -52,7 +55,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.de
%clean
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+rm -rf %{buildroot}
%post
@@ -74,6 +77,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_kde4_bindir}/kaffeine
+%{_kde4_bindir}/kaffeine-xbu
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
@@ -82,6 +86,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
- kaffeine-1.0-pre2
- update %%description/%%summary
diff --git a/sources b/sources
index a5dd102..d407339 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24eee004427d6b3f73ffb85a94fc6e3b kaffeine-1.0-pre2.tar.gz
+919e29a95b599db5eef74b5983f135f4 kaffeine-1.0-pre3.tar.gz
commit b814da633e5ce60b7d0a35e9d226d59c94820c63
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 23:51:13 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index b8f8bd6..dda970f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: kaffeine
-# $Id$
+# $Id: Makefile,v 1.1 2006/11/14 04:10:42 rdieter Exp $
NAME := kaffeine
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit beb1df806de4d7002750f7c654ad06b1383481a4
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Aug 14 13:38:15 2009 +0000
- kaffeine-1.0-pre2
- update %description/%summary
- %check: use desktop-file-validate
diff --git a/.cvsignore b/.cvsignore
index efe08f3..1782054 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre1.tar.gz
+kaffeine-1.0-pre2.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 1006115..80bd65c 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,19 +1,18 @@
-%define pre pre1
+%define pre pre2
Name: kaffeine
Version: 1.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
License: GPLv2+
-Summary: Xine-based media player
+Summary: Phonon-based media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-
+BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: phonon-devel
@@ -22,14 +21,12 @@ Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
%description
-Kaffeine is a xine-based media player for KDE.
+Kaffeine is a phonon-based media player.
%prep
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-%patch1 -p1 -b .kernel_headers
-
%build
mkdir -p %{_target_platform}
@@ -50,8 +47,12 @@ mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%find_lang %{name}
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%post
@@ -73,13 +74,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_kde4_bindir}/kaffeine
-%{_kde4_datadir}/applications/kde4/*.desktop
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/kaffeinedvb.so
%changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index b84a9fd..a5dd102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecae6fd84103a268daf17b61784d837f kaffeine-1.0-pre1.tar.gz
+24eee004427d6b3f73ffb85a94fc6e3b kaffeine-1.0-pre2.tar.gz
commit 82742d49984469ef154da9e717ac4b2800ad6abc
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Jul 25 04:17:07 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 762af32..1006115 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -3,7 +3,7 @@
Name: kaffeine
Version: 1.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
License: GPLv2+
Summary: Xine-based media player
@@ -80,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
- kaffeine-1.0-pre1
commit 39775ce63b110cf1bdfca22f4cb002af9e10de3f
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Apr 26 19:41:58 2009 +0000
- kaffeine-1.0-pre1
diff --git a/.cvsignore b/.cvsignore
index acd27b1..efe08f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-0.8.7.tar.bz2
+kaffeine-1.0-pre1.tar.gz
diff --git a/kaffeine-0.8.7-codecs.patch b/kaffeine-0.8.7-codecs.patch
deleted file mode 100644
index 0d6fb97..0000000
--- a/kaffeine-0.8.7-codecs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp
---- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs 2007-06-03 08:55:14.000000000 -0500
-+++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp 2008-07-06 13:50:12.000000000 -0500
-@@ -61,6 +61,8 @@ void InstWizard::internalWizard()
- setHelpEnabled(page1, false);
- setFinishEnabled(page1, false);
-
-+ QDir d;
-+
- QString infoString;
- QTextStream info(&infoString, IO_WriteOnly);
-
-@@ -106,14 +108,16 @@ void InstWizard::internalWizard()
- << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
- */
- //WIN32-CODECS
-+ /*
- info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
-- QDir d("/usr/lib/win32");
-+ d = DDir("@libdir@/codecs");
- QStringList entries = d.entryList("wmv*");
- if (entries.count())
- info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
- else
-- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
-+ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
-+ */
-
- //LIBDVDCSS
- info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
diff --git a/kaffeine-0.8.7-epg.patch b/kaffeine-0.8.7-epg.patch
deleted file mode 100644
index 574f111..0000000
--- a/kaffeine-0.8.7-epg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp.orig 2008-01-20 19:50:45.000000000 +0200
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp 2008-08-30 10:15:10.000000000 +0300
-@@ -171,10 +171,10 @@ EventSid *EventSource::getEventSid( int
- }
- }
- if ( !et ) {
-- if ( nid==0) {
-- mutex.unlock();
-- return 0;
-- }
-+ // if ( nid==0) {
-+ // mutex.unlock();
-+ // return 0;
-+ // }
- et = new EventTsid( nid, tsid );
- tsidList.append( et );
- }
diff --git a/kaffeine-0.8.7-optflags.patch b/kaffeine-0.8.7-optflags.patch
deleted file mode 100644
index 0ac33c6..0000000
--- a/kaffeine-0.8.7-optflags.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig 2008-07-01 16:35:02.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -9,4 +9,4 @@ libdvbapi_la_SOURCES = dvbaudio.c \
- dvbnet.c \
- dvbvideo.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig 2008-07-01 16:34:53.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -21,4 +21,4 @@ libdvben50221_la_SOURCES = asn_1.c \
- en50221_stdcam_llci.c \
- en50221_stdcam_hlci.c
-
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -100,7 +100,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
- tva_container_section.c \
- types.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -16,4 +16,4 @@ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.
- ./dvb/libdvbdvb.la \
- ./atsc/libdvbatsc.la
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -103,7 +103,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig 2008-07-01 16:34:55.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
- pmt_section.c \
- tsdt_section.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine-1.0-pre1-kernel_headers.patch b/kaffeine-1.0-pre1-kernel_headers.patch
new file mode 100644
index 0000000..be98188
--- /dev/null
+++ b/kaffeine-1.0-pre1-kernel_headers.patch
@@ -0,0 +1,12 @@
+diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
+--- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers 2009-04-26 13:38:11.000000000 -0500
++++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp 2009-04-26 14:34:24.526814875 -0500
+@@ -24,7 +24,7 @@
+ * workaround buggy kernel includes
+ * asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
+ */
+-typedef quint64 __u64;
++//typedef quint64 __u64;
+
+ #include <cmath>
+ #include <errno.h>
diff --git a/kaffeine.spec b/kaffeine.spec
index 72c16e4..762af32 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,233 +1,88 @@
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define kdelibs3 kdelibs3
-BuildRequires: libxcb-devel
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-## define to build freeworld bits (for that other repo)
-#define freeworld 1
-
-# FIXME
-#if 0%{?fedora} > 10
-#define _without_dvb --without-dvb
-#endif
-
-Version: 0.8.7
-Release: 7%{?dist}
-
-%if 0%{?freeworld:1} == 0
-# Fedora Review: http://bugzilla.redhat.com/213432
+%define pre pre1
+
Name: kaffeine
-%else
-Name: kaffeine-freeworld
-%endif
+Version: 1.0
+Release: 0.1.%{pre}%{?dist}
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kaffeine-0.8.7-optflags.patch
-Patch1: kaffeine-0.8.7-codecs.patch
-Patch2: kaffeine-0.8.7-epg.patch
+Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
-BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
-BuildRequires: %{kdelibs3}-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
-BuildRequires: xine-lib-devel
-
-%if 0%{?freeworld:1}
-Requires: kaffeine = %{version}
-%define _with_lame --with-lame
-%{?_with_lame:BuildRequires: lame-devel}
-%if 0%{?fedora} > 4
-# can view dvd's if libdvdcss is available
-#Requires(hint): libdvdcss
-# extra/freeworld codec support
-Requires(hint): xine-lib-extras-freeworld
-%endif
-
-%description
-Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
+BuildRequires: kdelibs4-devel
+BuildRequires: phonon-devel
-%else
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides: %{name}-libs = %{version}-%{release}
-%endif
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
%description
-Kaffeine is a xine-based media player for KDE. It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{kdelibs3}-devel
-%description devel
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%endif
-
+Kaffeine is a xine-based media player for KDE.
%prep
-%setup -q -n kaffeine-%{version}
+%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-%patch0 -p1 -b .optflags
-# FIXME
-#patch1 -p1 -b .codecs
-#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
-%patch2 -p1 -b .epg
-
-# FIXME, must be a better workaround here
-sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
+%patch1 -p1 -b .kernel_headers
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --disable-final \
- --with-extra-includes=%{_includedir}/cdda \
- --with-gstreamer \
- %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
- %{?_with_lame} %{!?_with_lame:--without-lame}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-%if 0%{?freeworld:1}
-make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
-%else
-make %{?_smp_mflags}
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
-%if 0%{?freeworld:1}
-make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
-%else
-make install DESTDIR=%{buildroot}
-
-## File lists
-# locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
+mv %{buildroot}%{_kde4_iconsdir}/oxygen \
+ %{buildroot}%{_kde4_iconsdir}/hicolor
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
-%endif
+%find_lang %{name}
%clean
rm -rf %{buildroot}
-%if 0%{?freeworld:1}
-%files
-%defattr(-,root,root,-)
-%{_libdir}/kde3/libkaffeinemp3lame.*
-%{_datadir}/services/kaffeinemp3lame.desktop
-%else
-
%post
-%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-%{!?libs:/sbin/ldconfig}
if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?libs}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%endif
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kaffeine
-%{_libdir}/libkaffeinepart.so
-%{_libdir}/kde3/lib*.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/gstreamerpart/
-%{_datadir}/apps/kaffeine/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/profiles/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-
-%if 0%{?libs}
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kaffeine/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
-
-%endif
+%doc AUTHORS COPYING TODO
+%{_kde4_bindir}/kaffeine
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
%changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
- re-enable dvb (#495379)
diff --git a/sources b/sources
index 512216a..b84a9fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2
+ecae6fd84103a268daf17b61784d837f kaffeine-1.0-pre1.tar.gz
commit 9919ecd1ee7d13a06a44b173eb61484ef3a919a3
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Apr 12 18:25:20 2009 +0000
- re-enable dvb (#495379)
diff --git a/kaffeine.spec b/kaffeine.spec
index 115cc0a..72c16e4 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,12 +11,12 @@ BuildRequires: libutempter-devel
#define freeworld 1
# FIXME
-%if 0%{?fedora} > 10
-%define _without_dvb --without-dvb
-%endif
+#if 0%{?fedora} > 10
+#define _without_dvb --without-dvb
+#endif
Version: 0.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -228,6 +228,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
- Improve icon cache and desktop database update scriptlets.
- Update URL.
commit 8187d933c3706ceacbc3ffbaeefcc1d8f9c3dd99
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Tue Mar 17 22:23:40 2009 +0000
- Improve icon cache and desktop database update scriptlets.
- Update URL.
diff --git a/kaffeine.spec b/kaffeine.spec
index 53029db..115cc0a 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -16,7 +16,7 @@ BuildRequires: libutempter-devel
%endif
Version: 0.8.7
-Release: 5%{?dist}
+Release: 6%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -28,7 +28,7 @@ Name: kaffeine-freeworld
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
-URL: http://kaffeine.sourceforge.net/
+URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -176,15 +176,19 @@ rm -rf %{buildroot}
%post
%{!?libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
%{!?libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+if [ $1 -eq 0 ] ; then
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database %{_datadir}/applications &>/dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if 0%{?libs}
%post libs -p /sbin/ldconfig
@@ -224,6 +228,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
- s/nonfree/freeworld/
- --without-dvb (f11+)
commit 0c60a5c9f30f1b02c9d8f2787b9df3450cf7152a
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 6 20:25:02 2009 +0000
Release++
diff --git a/kaffeine.spec b/kaffeine.spec
index 2651a46..53029db 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -16,7 +16,7 @@ BuildRequires: libutempter-devel
%endif
Version: 0.8.7
-Release: 4%{?dist}
+Release: 5%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
commit ece6c9f37f4b33c334629a03fc972f5259b1f407
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 6 20:22:24 2009 +0000
- s/nonfree/freeworld/
- --without-dvb (f11+)
diff --git a/kaffeine.spec b/kaffeine.spec
index 5161a27..2651a46 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,25 +1,28 @@
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_gstreamer --with-gstreamer
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+%define kdelibs3 kdelibs3
+BuildRequires: libxcb-devel
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
%endif
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
+## define to build freeworld bits (for that other repo)
+#define freeworld 1
-## define to build nonfree bits (for that other repo)
-#define nonfree 1
+# FIXME
+%if 0%{?fedora} > 10
+%define _without_dvb --without-dvb
+%endif
Version: 0.8.7
Release: 4%{?dist}
-%if 0%{?nonfree:1} == 0
+%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%else
-Name: kaffeine-extras-nonfree
+Name: kaffeine-freeworld
%endif
License: GPLv2+
@@ -35,31 +38,25 @@ Patch2: kaffeine-0.8.7-epg.patch
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
-# dvb
-BuildRequires: glibc-kernheaders
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-BuildRequires: kdelibs3-devel
-BuildRequires: libxcb-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
+BuildRequires: %{kdelibs3}-devel
BuildRequires: libvorbis-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
BuildRequires: xine-lib-devel
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
Requires: kaffeine = %{version}
%define _with_lame --with-lame
%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
-Requires(hint): libdvdcss
-# extra/nonfree codec support
-Requires(hint): xine-lib-extras-nonfree
+#Requires(hint): libdvdcss
+# extra/freeworld codec support
+Requires(hint): xine-lib-extras-freeworld
%endif
%description
-Nonfree support bits for kaffeine, including DVD playback, MP3
+Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.
%else
@@ -83,19 +80,17 @@ Konqueror plugin, OSD and much more.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs3-devel
+Requires: %{kdelibs3}-devel
%description devel
%{summary}.
-%if 0%{?libs}
%package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
-%endif
%endif
@@ -123,10 +118,11 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
--with-extra-includes=%{_includedir}/cdda \
- %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
+ --with-gstreamer \
+ %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
%{?_with_lame} %{!?_with_lame:--without-lame}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
@@ -136,7 +132,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=%{buildroot}
@@ -171,7 +167,7 @@ rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
rm -rf %{buildroot}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
%files
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
@@ -204,7 +200,7 @@ update-desktop-database >& /dev/null ||:
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
-%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
+%{_datadir}/apps/gstreamerpart/
%{_datadir}/apps/kaffeine/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/profiles/
@@ -228,6 +224,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit de498330fae52590f128f36ba477ab9497a579e0
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 25 10:07:50 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index cc3f5b8..5161a27 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 3%{?dist}
+Release: 4%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
- EPG and OSD patch (#452421).
commit 25fe34985f2acb259246dcbffdf9df5f9ca2ae13
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Feb 6 17:16:52 2009 +0000
- EPG and OSD patch (#452421).
diff --git a/kaffeine-0.8.7-epg.patch b/kaffeine-0.8.7-epg.patch
new file mode 100644
index 0000000..574f111
--- /dev/null
+++ b/kaffeine-0.8.7-epg.patch
@@ -0,0 +1,17 @@
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp.orig 2008-01-20 19:50:45.000000000 +0200
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp 2008-08-30 10:15:10.000000000 +0300
+@@ -171,10 +171,10 @@ EventSid *EventSource::getEventSid( int
+ }
+ }
+ if ( !et ) {
+- if ( nid==0) {
+- mutex.unlock();
+- return 0;
+- }
++ // if ( nid==0) {
++ // mutex.unlock();
++ // return 0;
++ // }
+ et = new EventTsid( nid, tsid );
+ tsidList.append( et );
+ }
diff --git a/kaffeine.spec b/kaffeine.spec
index e7faf02..cc3f5b8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: kaffeine-0.8.7-optflags.patch
Patch1: kaffeine-0.8.7-codecs.patch
+Patch2: kaffeine-0.8.7-epg.patch
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
@@ -107,6 +108,7 @@ Requires: %{name} = %{version}-%{release}
# FIXME
#patch1 -p1 -b .codecs
#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+%patch2 -p1 -b .epg
# FIXME, must be a better workaround here
sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
@@ -226,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
- Unfuzz optflags patch.
commit 5c458d9d0abe37c0464017276ceaeca682124912
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Thu Aug 28 19:28:48 2008 +0000
- Unfuzz optflags patch.
diff --git a/kaffeine-0.8.6-optflags.patch b/kaffeine-0.8.6-optflags.patch
deleted file mode 100644
index ee2bf6f..0000000
--- a/kaffeine-0.8.6-optflags.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ 2008-01-20 19:50:43.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -8,4 +8,4 @@ libdvbapi_la_SOURCES = diseqc.c \
- dvbfe.c \
- dvbnet.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-03-20 21:39:50.000000000 +0200
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
- en50221_session.c \
- en50221_transport.c
-
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-03-20 21:40:10.000000000 +0200
-@@ -98,7 +98,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ 2008-01-20 19:50:41.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
- tva_container_section.c \
- types.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-03-20 21:40:28.000000000 +0200
-@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -14,4 +14,4 @@ libucsi_la_LDFLAGS = ./mpeg \
- libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \
- ./dvb/libdvbdvb.la
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-03-20 21:40:49.000000000 +0200
-@@ -102,7 +102,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
- pmt_section.c \
- tsdt_section.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-03-20 21:41:09.000000000 +0200
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine-0.8.7-optflags.patch b/kaffeine-0.8.7-optflags.patch
new file mode 100644
index 0000000..0ac33c6
--- /dev/null
+++ b/kaffeine-0.8.7-optflags.patch
@@ -0,0 +1,110 @@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig 2008-07-01 16:35:02.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -9,4 +9,4 @@ libdvbapi_la_SOURCES = dvbaudio.c \
+ dvbnet.c \
+ dvbvideo.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig 2008-07-01 16:34:53.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -21,4 +21,4 @@ libdvben50221_la_SOURCES = asn_1.c \
+ en50221_stdcam_llci.c \
+ en50221_stdcam_hlci.c
+
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -100,7 +100,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
+ tva_container_section.c \
+ types.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -16,4 +16,4 @@ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.
+ ./dvb/libdvbdvb.la \
+ ./atsc/libdvbatsc.la
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -103,7 +103,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig 2008-07-01 16:34:55.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
+ pmt_section.c \
+ tsdt_section.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine.spec b/kaffeine.spec
index 4e686c5..e7faf02 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -29,7 +29,7 @@ URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kaffeine-0.8.6-optflags.patch
+Patch0: kaffeine-0.8.7-optflags.patch
Patch1: kaffeine-0.8.7-codecs.patch
BuildRequires: cdparanoia-devel cdparanoia
@@ -226,6 +226,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
- kaffeine-0.8.7
commit 9db1f4f087c7bcbfb9ee967fcc9f54c44f0564f1
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Jul 6 19:28:34 2008 +0000
- kaffeine-0.8.7
diff --git a/.cvsignore b/.cvsignore
index 4c62d87..acd27b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-0.8.6.tar.bz2
+kaffeine-0.8.7.tar.bz2
diff --git a/kaffeine-0.8.7-codecs.patch b/kaffeine-0.8.7-codecs.patch
new file mode 100644
index 0000000..0d6fb97
--- /dev/null
+++ b/kaffeine-0.8.7-codecs.patch
@@ -0,0 +1,31 @@
+diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp
+--- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs 2007-06-03 08:55:14.000000000 -0500
++++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp 2008-07-06 13:50:12.000000000 -0500
+@@ -61,6 +61,8 @@ void InstWizard::internalWizard()
+ setHelpEnabled(page1, false);
+ setFinishEnabled(page1, false);
+
++ QDir d;
++
+ QString infoString;
+ QTextStream info(&infoString, IO_WriteOnly);
+
+@@ -106,14 +108,16 @@ void InstWizard::internalWizard()
+ << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
+ */
+ //WIN32-CODECS
++ /*
+ info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
+- QDir d("/usr/lib/win32");
++ d = DDir("@libdir@/codecs");
+ QStringList entries = d.entryList("wmv*");
+ if (entries.count())
+ info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
+ else
+- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
++ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
+ << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
++ */
+
+ //LIBDVDCSS
+ info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
diff --git a/kaffeine.spec b/kaffeine.spec
index 77f470a..4e686c5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,10 +12,10 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.6
-Release: 4%{?dist}
+Version: 0.8.7
+Release: 1%{?dist}
-%if "%{?nonfree:1}" != "1"
+%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%else
@@ -27,24 +27,27 @@ Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Patch0: %{name}-0.8.6-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: kaffeine-0.8.6-optflags.patch
+Patch1: kaffeine-0.8.7-codecs.patch
+
+BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
+# dvb
+BuildRequires: glibc-kernheaders
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: kdelibs3-devel
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: libvorbis-devel
-BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 6
BuildRequires: libxcb-devel
+%else
+BuildRequires: kdelibs-devel
%endif
-# dvb
-BuildRequires: glibc-kernheaders
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
%define _with_lame --with-lame
%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
@@ -87,8 +90,6 @@ Requires: kdelibs3-devel
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-# helps multilib upgrades
-Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
@@ -101,26 +102,29 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kaffeine-%{version}
+
%patch0 -p1 -b .optflags
-%{?nonfree:%patch1 -p1 -b .codecs}
+# FIXME
+#patch1 -p1 -b .codecs
+#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+
+# FIXME, must be a better workaround here
+sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-# easier than patching, and using
-# --with-extra-includes=%{_includedir}/cdda below -- Rex
-CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
-
%configure \
--disable-rpath \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
+ --with-extra-includes=%{_includedir}/cdda \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
@@ -128,20 +132,20 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%if "%{?nonfree:1}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
+%if 0%{?nonfree:1}
+make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
%else
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name}
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -156,16 +160,16 @@ done
fi
# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
+rm -f %{buildroot}%{_libdir}/lib*.la
+rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
%files
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
@@ -217,10 +221,14 @@ update-desktop-database >& /dev/null ||:
%{_includedir}/kaffeine/
%{_libdir}/lib*.so
%exclude %{_libdir}/libkaffeinepart.so
+
%endif
%changelog
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
diff --git a/sources b/sources
index a38852f..512216a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-102cced6a686f5ffffee94652ca2a093 kaffeine-0.8.6.tar.bz2
+3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2
commit 43ee022d88d8ada4ed85ac2f4fa8862559783f40
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Thu Mar 20 19:53:46 2008 +0000
- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
diff --git a/kaffeine-0.8.6-optflags.patch b/kaffeine-0.8.6-optflags.patch
new file mode 100644
index 0000000..ee2bf6f
--- /dev/null
+++ b/kaffeine-0.8.6-optflags.patch
@@ -0,0 +1,110 @@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ 2008-01-20 19:50:43.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -8,4 +8,4 @@ libdvbapi_la_SOURCES = diseqc.c \
+ dvbfe.c \
+ dvbnet.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-03-20 21:39:50.000000000 +0200
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
+ en50221_session.c \
+ en50221_transport.c
+
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-03-20 21:40:10.000000000 +0200
+@@ -98,7 +98,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ 2008-01-20 19:50:41.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
+ tva_container_section.c \
+ types.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-03-20 21:40:28.000000000 +0200
+@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -14,4 +14,4 @@ libucsi_la_LDFLAGS = ./mpeg \
+ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \
+ ./dvb/libdvbdvb.la
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-03-20 21:40:49.000000000 +0200
+@@ -102,7 +102,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
+ pmt_section.c \
+ tsdt_section.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-03-20 21:41:09.000000000 +0200
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine.spec b/kaffeine.spec
index 0badbb1..77f470a 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 3%{?dist}
+Release: 4%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -27,6 +27,7 @@ Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Patch0: %{name}-0.8.6-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -100,7 +101,7 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kaffeine-%{version}
-
+%patch0 -p1 -b .optflags
%{?nonfree:%patch1 -p1 -b .codecs}
@@ -220,6 +221,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
- fix deps wrt kaffeine-libs (#436442)
- f7: xcb support (#373411)
commit 610ec24c59fe2f3bd41847caad7da477a95216a0
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 7 15:02:13 2008 +0000
- fix deps wrt kaffeine-libs (#436442)
- f7: xcb support (#373411)
diff --git a/kaffeine.spec b/kaffeine.spec
index e9446c2..0badbb1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 2%{?dist}
+Release: 3%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -34,7 +34,7 @@ BuildRequires: kdelibs3-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 7
+%if 0%{?fedora} > 6
BuildRequires: libxcb-devel
%endif
# dvb
@@ -51,21 +51,21 @@ Patch1: kaffeine-0.8.2-codecs.patch
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
+%endif
+
+%description
+Nonfree support bits for kaffeine, including DVD playback, MP3
+decoding, as well as extended audio/video codec support.
+
%else
+
%if 0%{?libs}
Requires: %{name}-libs = %{version}-%{release}
%else
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release}
%endif
-%endif
-
-
-%description
-Nonfree support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
-%else
%description
Kaffeine is a xine-based media player for KDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
@@ -86,7 +86,6 @@ Requires: kdelibs3-devel
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: kdelibs3 >= %{version}
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
@@ -221,6 +220,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
- Autorebuild for GCC 4.3
commit 882298a4f0de9d83c83daa6c67b98450fadb48d8
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 19 21:14:28 2008 +0000
- Autorebuild for GCC 4.3
diff --git a/kaffeine.spec b/kaffeine.spec
index 4903d0e..e9446c2 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -221,6 +221,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
- kaffeine-0.8.6
commit 87dda81904a69f116af3a56eb3e5234f65c1ffd8
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jan 21 07:05:11 2008 +0000
fix %files
diff --git a/kaffeine.spec b/kaffeine.spec
index dd9188f..4903d0e 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -210,14 +210,13 @@ update-desktop-database >& /dev/null ||:
%files libs
%defattr(-,root,root,-)
%endif
-%{_libdir}/libkaffeineaudioencoder.so.*
-%{_libdir}/libkaffeinedvbplugin.so.*
+%{_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/kaffeine/
-%{_libdir}/libkaffeineaudioencoder.so
-%{_libdir}/libkaffeinedvbplugin.so
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
%endif
commit c0a0092d5f1741a704e68a60cb8cd2c3f10a4a80
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Jan 20 22:46:07 2008 +0000
- kaffeine-0.8.6
diff --git a/.cvsignore b/.cvsignore
index a20337e..4c62d87 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-kaffeine-0.8.2.tar.bz2
-kaffeine-0.8.3.tar.bz2
-kaffeine-0.8.4.tar.bz2
-kaffeine-0.8.5.tar.bz2
+kaffeine-0.8.6.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index daaacac..dd9188f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,8 +12,8 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.5
-Release: 7%{?dist}
+Version: 0.8.6
+Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -26,7 +26,7 @@ License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -104,12 +104,6 @@ Requires: %{name} = %{version}-%{release}
%{?nonfree:%patch1 -p1 -b .codecs}
-# fix perms on docs
-chmod -x AUTHORS ChangeLog INSTALL TODO ||:
-
-# avoid autofoo rerun in 0.8.5
-touch -r acinclude.m4 admin/acinclude.m4.in
-
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -228,6 +222,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
- Require kdelibs3-devel instead of kdelibs-devel in -devel.
diff --git a/sources b/sources
index 2d99076..a38852f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2
+102cced6a686f5ffffee94652ca2a093 kaffeine-0.8.6.tar.bz2
commit 9e3794ac088c5a978652b2f4ba06e7aea7d03c96
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Sun Jan 13 19:13:01 2008 +0000
- Require kdelibs3-devel instead of kdelibs-devel in -devel.
diff --git a/kaffeine.spec b/kaffeine.spec
index baad037..daaacac 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 6%{?dist}
+Release: 7%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -78,7 +78,7 @@ Konqueror plugin, OSD and much more.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs-devel
+Requires: kdelibs3-devel
%description devel
%{summary}.
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
- BR: kdelibs3-devel
commit 84294ad53190f7ef2672004cf6309397070e4c47
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Dec 9 03:18:53 2007 +0000
- BR: kdelibs3-devel
diff --git a/kaffeine.spec b/kaffeine.spec
index 0e0d35e..baad037 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 5%{?dist}
+Release: 6%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -30,7 +30,7 @@ Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs3-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
- multiarch conflicts in kaffeine (#341681)
commit c4fc2fa967303a50ffd1b20cc73eec476b81eca2
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Tue Oct 30 13:41:15 2007 +0000
- multiarch conflicts in kaffeine (#341681)
diff --git a/kaffeine.spec b/kaffeine.spec
index 03e0da5..0e0d35e 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -4,11 +4,16 @@
BuildRequires: libXext-devel libXinerama-devel libXtst-devel
%endif
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
## define to build nonfree bits (for that other repo)
#define nonfree 1
Version: 0.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -46,8 +51,16 @@ Patch1: kaffeine-0.8.2-codecs.patch
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
+%else
+%if 0%{?libs}
+Requires: %{name}-libs = %{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{version}-%{release}
+Provides: %{name}-libs = %{version}-%{release}
+%endif
%endif
+
%description
Nonfree support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.
@@ -64,12 +77,27 @@ Konqueror plugin, OSD and much more.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: kdelibs-devel
%description devel
%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group: System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
%endif
+%endif
+
+
%prep
%setup -q -n kaffeine-%{version}
@@ -79,6 +107,9 @@ Requires: kdelibs-devel
# fix perms on docs
chmod -x AUTHORS ChangeLog INSTALL TODO ||:
+# avoid autofoo rerun in 0.8.5
+touch -r acinclude.m4 admin/acinclude.m4.in
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -87,8 +118,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
-touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
-
%configure \
--disable-rpath \
--enable-new-ldflags \
@@ -150,23 +179,28 @@ rm -rf $RPM_BUILD_ROOT
%else
%post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
-%{_libdir}/libkaffeineaudioencoder.so.*
-%{_libdir}/libkaffeinedvbplugin.so.*
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
@@ -178,6 +212,13 @@ update-desktop-database >& /dev/null ||:
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/kaffeine/
@@ -187,7 +228,10 @@ update-desktop-database >& /dev/null ||:
%changelog
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
- Avoid autotools re-run after configure (unclean upstream tarball?)
* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
commit e2b680e6ec666831cd6ccb47bc211e49fab2183b
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Wed Sep 19 20:16:29 2007 +0000
- Avoid autotools re-run after configure (unclean upstream tarball?)
diff --git a/kaffeine.spec b/kaffeine.spec
index c54fcc1..03e0da5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -87,6 +87,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
%configure \
--disable-rpath \
--enable-new-ldflags \
@@ -185,6 +187,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
- respin (BuildID)
commit 4b22c0ea87a7d40ebde15962e39678d756ad49cb
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sat Aug 25 14:25:38 2007 +0000
- respin (BuildID)
diff --git a/kaffeine.spec b/kaffeine.spec
index a7727e5..c54fcc1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -185,6 +185,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
- License: GPLv2+
- BR: libxcb-devel (really)
commit ae2c9352d92ab6f618257f7906dd55172c5d6be5
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Aug 12 03:00:26 2007 +0000
- License: GPLv2+
- BR: libxcb-devel (really)
diff --git a/kaffeine.spec b/kaffeine.spec
index 5ced824..a7727e5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -17,7 +17,7 @@ Name: kaffeine
Name: kaffeine-extras-nonfree
%endif
-License: GPL
+License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
@@ -30,7 +30,7 @@ BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
%if 0%{?fedora} > 7
-#BuildRequires: libxcb-devel
+BuildRequires: libxcb-devel
%endif
# dvb
BuildRequires: glibc-kernheaders
@@ -185,6 +185,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
- kaffeine-0.8.5
- BR: libxcb-devel
commit 720a802735795c8ce7db695aaf514220a1514437
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jul 30 13:08:31 2007 +0000
- kaffeine-0.8.5
- BR: libxcb-devel
diff --git a/.cvsignore b/.cvsignore
index 9f081e7..a20337e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
kaffeine-0.8.2.tar.bz2
kaffeine-0.8.3.tar.bz2
kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.5.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index e39e9b1..5ced824 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define _with_gstreamer --with-gstreamer
-BuildRequires: libXinerama-devel libXtst-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
@@ -29,8 +29,9 @@ BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-# FIXME/TODO: http://xcb.freedesktop.org/
+%if 0%{?fedora} > 7
#BuildRequires: libxcb-devel
+%endif
# dvb
BuildRequires: glibc-kernheaders
%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
@@ -184,8 +185,12 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4
+- kaffeine-0.8.4 (#243823)
* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
- disable gst08 support (for now), it's been orphaned
diff --git a/sources b/sources
index 352ef9c..2d99076 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f62ebb7a6f88ff49f452856a1660d95 kaffeine-0.8.4.tar.bz2
+71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2
commit e6ae6d268ffed84481fd4d1593963d44c158162b
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Jun 8 14:40:06 2007 +0000
- kaffeine-0.8.4
diff --git a/.cvsignore b/.cvsignore
index 7a0985a..9f081e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
kaffeine-0.8.2.tar.bz2
kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index e1e6307..e39e9b1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,32 +1,20 @@
-%if 0%{?fedora} > 2
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define _with_gstreamer --with-gstreamer
-%endif
-
-%if 0%{?fedora} > 4
-%define gst 08
-# gstreamer08 has been orphaned
-%undefine _with_gstreamer
BuildRequires: libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.3
-Release: 4%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
-
%else
Name: kaffeine-extras-nonfree
-%define _with_lame --with-lame
-Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
-# split occurred here
-Conflicts: kaffeine < 0.8.2-2
%endif
License: GPL
@@ -41,22 +29,17 @@ BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-%{!?_without_dvb:BuildRequires: glibc-kernheaders }
-%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
-# not included in Extras, disabled
-%{?_with_lame:BuildRequires: lame-devel}
-
-## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
-## everybondy should be using kde >= 3.5.4 by now... (:
-#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
-#if "%{?kdelibs_ver}" >= "3.5.4"
-%define x_mplayer2_hack 1
-Requires: kdelibs >= 6:3.5.4
-#or
-#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
-#endif
+# FIXME/TODO: http://xcb.freedesktop.org/
+#BuildRequires: libxcb-devel
+# dvb
+BuildRequires: glibc-kernheaders
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
%if "%{?nonfree:1}" == "1"
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+%define _with_lame --with-lame
+%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
@@ -99,16 +82,15 @@ chmod -x AUTHORS ChangeLog INSTALL TODO ||:
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+# easier than patching, and using
+# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
%configure \
--disable-rpath \
- --disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
- %{?_without_dvb} \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
@@ -149,7 +131,7 @@ fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
%endif
@@ -202,6 +184,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4
+
* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
- disable gst08 support (for now), it's been orphaned
diff --git a/sources b/sources
index b95fe41..352ef9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24 kaffeine-0.8.3.tar.bz2
+6f62ebb7a6f88ff49f452856a1660d95 kaffeine-0.8.4.tar.bz2
commit 159526e2d6f5d2a6ad961c36c622042ee5066a6c
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jan 18 14:22:53 2007 +0000
- disable gst08 support (for now), it's been orphaned
diff --git a/kaffeine.spec b/kaffeine.spec
index c207b5d..e1e6307 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,36 +1,39 @@
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 2
%define _with_gstreamer --with-gstreamer
%endif
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4
%define gst 08
-BuildRequires: libXtst-devel libXinerama-devel
+# gstreamer08 has been orphaned
+%undefine _with_gstreamer
+BuildRequires: libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
Version: 0.8.3
-Release: 2%{?dist}
+Release: 4%{?dist}
-%if "%{?nonfree:1}" == "1"
+%if "%{?nonfree:1}" != "1"
+# Fedora Review: http://bugzilla.redhat.com/213432
+Name: kaffeine
+
+%else
Name: kaffeine-extras-nonfree
%define _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2
-%else
-# Fedora Review: http://bugzilla.redhat.com/213432
-Name: kaffeine
%endif
License: GPL
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -54,7 +57,7 @@ Requires: kdelibs >= 6:3.5.4
#endif
%if "%{?nonfree:1}" == "1"
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
# extra/nonfree codec support
@@ -177,7 +180,8 @@ update-desktop-database >& /dev/null ||:
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
@@ -191,15 +195,21 @@ update-desktop-database >& /dev/null ||:
%files devel
%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
%endif
%changelog
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
- 0.8.3
commit 883458d04df17a413f0cb254989fb2014e9a1185
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Wed Nov 29 18:14:55 2006 +0000
- include libkaffeinepart.so in main pkg (not -devel)
diff --git a/kaffeine.spec b/kaffeine.spec
index 3d14863..c207b5d 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,7 +12,7 @@ BuildRequires: libXtst-devel libXinerama-devel
#define nonfree 1
Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" == "1"
Name: kaffeine-extras-nonfree
@@ -34,7 +34,6 @@ Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
-BuildRequires: desktop-file-utils
BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
@@ -125,11 +124,6 @@ make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
- --vendor="" \
- --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
## File lists
# locale's
%find_lang %{name}
@@ -184,6 +178,7 @@ update-desktop-database >& /dev/null ||:
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -198,10 +193,14 @@ update-desktop-database >& /dev/null ||:
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
%endif
%changelog
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
- 0.8.3
commit b707eb2d0f9735aea8a8a7d463840cd6444d2779
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Nov 26 23:57:34 2006 +0000
- 0.8.3
diff --git a/.cvsignore b/.cvsignore
index 22e4aa6..7a0985a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index 4fcf639..3d14863 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,29 +11,26 @@ BuildRequires: libXtst-devel libXinerama-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
+%if "%{?nonfree:1}" == "1"
Name: kaffeine-extras-nonfree
-
%define _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2
-
%else
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%endif
-Version: 0.8.2
-Release: 5%{?dist}
-
License: GPL
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -108,7 +105,7 @@ CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
--disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --disable-dependency-tracking --disable-final \
%{?_without_dvb} \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
@@ -205,6 +202,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
- %%doc README
diff --git a/sources b/sources
index 8ef1f11..b95fe41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41 kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24 kaffeine-0.8.3.tar.bz2
commit 4930e9539f4e81025bde6da1bceb346746231b65
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Tue Nov 14 04:11:06 2006 +0000
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm
diff --git a/.cvsignore b/.cvsignore
index e69de29..22e4aa6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+kaffeine-0.8.2.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
new file mode 100644
index 0000000..4fcf639
--- /dev/null
+++ b/kaffeine.spec
@@ -0,0 +1,316 @@
+
+%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%define _with_gstreamer --with-gstreamer
+%endif
+
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%define gst 08
+BuildRequires: libXtst-devel libXinerama-devel
+%endif
+
+## define to build nonfree bits (for that other repo)
+#define nonfree 1
+
+%if "%{?nonfree:1}" == "1"
+
+Name: kaffeine-extras-nonfree
+
+%define _with_lame --with-lame
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+# split occurred here
+Conflicts: kaffeine < 0.8.2-2
+
+%else
+# Fedora Review: http://bugzilla.redhat.com/213432
+Name: kaffeine
+%endif
+
+Version: 0.8.2
+Release: 5%{?dist}
+
+License: GPL
+Summary: Xine-based media player
+Group: Applications/Multimedia
+URL: http://kaffeine.sourceforge.net/
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs-devel
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
+%{!?_without_dvb:BuildRequires: glibc-kernheaders }
+%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
+# not included in Extras, disabled
+%{?_with_lame:BuildRequires: lame-devel}
+
+## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
+## everybondy should be using kde >= 3.5.4 by now... (:
+#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
+#if "%{?kdelibs_ver}" >= "3.5.4"
+%define x_mplayer2_hack 1
+Requires: kdelibs >= 6:3.5.4
+#or
+#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
+#endif
+
+%if "%{?nonfree:1}" == "1"
+%if "%{?fedora}" > "4"
+# can view dvd's if libdvdcss is available
+Requires(hint): libdvdcss
+# extra/nonfree codec support
+Requires(hint): xine-lib-extras-nonfree
+%endif
+
+%description
+Nonfree support bits for kaffeine, including DVD playback, MP3
+decoding, as well as extended audio/video codec support.
+
+%else
+%description
+Kaffeine is a xine-based media player for KDE. It plays back CDs,
+and VCDs, and can decode all (local or streamed) multimedia formats
+supported by xine-lib.
+Additionally, Kaffeine is fully integrated in KDE, it supports drag
+and drop and provides an editable playlist, a bookmark system, a
+Konqueror plugin, OSD and much more.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs-devel
+%description devel
+%{summary}.
+%endif
+
+
+%prep
+%setup -q -n kaffeine-%{version}
+
+%{?nonfree:%patch1 -p1 -b .codecs}
+
+# fix perms on docs
+chmod -x AUTHORS ChangeLog INSTALL TODO ||:
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
+# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
+
+%configure \
+ --disable-rpath \
+ --disable-gcc-hidden-visibility \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
+ %{?_without_dvb} \
+ %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
+ %{?_with_lame} %{!?_with_lame:--without-lame}
+
+%if "%{?nonfree:1}" == "1"
+make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
+%else
+make %{?_smp_mflags}
+%endif
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%if "%{?nonfree:1}" == "1"
+make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
+%else
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+ --vendor="" \
+ --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
+ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+
+## File lists
+# locale's
+%find_lang %{name}
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+ if [ -d $lang_dir ]; then
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+ # replace absolute symlinks with relative ones
+ pushd $lang_dir
+ for i in *; do
+ [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+ done
+ popd
+ fi
+done
+fi
+
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%if "%{?nonfree:1}" == "1"
+%files
+%defattr(-,root,root,-)
+%{_libdir}/kde3/libkaffeinemp3lame.*
+%{_datadir}/services/kaffeinemp3lame.desktop
+%else
+
+%post
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_bindir}/kaffeine
+%{_libdir}/lib*.so.*
+%{_libdir}/kde3/lib*.*
+%{_datadir}/appl*/*/*.desktop
+%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
+%{_datadir}/apps/kaffeine/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/profiles/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/service*/*.desktop
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+%endif
+
+
+%changelog
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/sources b/sources
index e69de29..8ef1f11 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bfb57b62fa72267cc5b01ce9b037cb41 kaffeine-0.8.2.tar.bz2
1
0
18 Dec '23
The package rpms/kaffeine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kaffeine.git/commit/?id=1df7dabdf29….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 4727d84dd391f4412eae29ed3568df85ad203d56
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Dec 18 22:26:01 2023 -0500
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..e4f6252
--- /dev/null
+++ b/changelog
@@ -0,0 +1,369 @@
+* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
+- Re-import into Fedora
+
+* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
+- Improve compatibility with new CMake macro
+
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
+- update to 2.0.18
+
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
+- update to 2.0.17
+
+* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
+- update to 2.0.16
+- use tarball from github with fixed versioning
+- drop previously applied patch
+- add translations from http://kaffeine.kde.org/
+- enable pt_br language again
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
+- update to 2.0.15 release
+
+* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- Use ninja to build
+- Remove scriptlets
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
+- remove broken pt_BR locale
+- fix appdata install
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
+- update to 2.0.14 release
+
+* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
+- update to 2.0.13 release
+
+* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
+- update to 2.0.12 release
+
+* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
+- update to 2.0.10 release
+
+* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
+- update to 2.0.9 release
+
+* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
+- Add Requires: qt5-qttranslations (fix rfbz#4450).
+- Add COPYING-DOCS
+
+* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
+- Add Requires: vlc (fix rfbz#4394).
+
+* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
+- update to 2.0.5 release
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
+- rebuilt
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
+- revert last commit
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
+- use kinit requires macro
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
+- add some missing runtime deps
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
+- update to 2.0.4 release
+
+* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
+- Rebuild for xine-lib 1.2.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme
+
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
+
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/kaffeine.spec b/kaffeine.spec
index a5d92d8..53a99ba 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 2.0.18
-Release: 10%{?dist}
+Release: %autorelease -b 9
License: GPL-2.0-or-later AND GFDL-1.3-or-later
Summary: KDE media player based on VLC
URL: https://apps.kde.org/kaffeine/
@@ -88,372 +88,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.ka
%changelog
-* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
-- Re-import into Fedora
-
-* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
- 5.1
-
-* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
-- Improve compatibility with new CMake macro
-
-* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
-- update to 2.0.18
-
-* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
-- update to 2.0.17
-
-* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
-- update to 2.0.16
-- use tarball from github with fixed versioning
-- drop previously applied patch
-- add translations from http://kaffeine.kde.org/
-- enable pt_br language again
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
-- update to 2.0.15 release
-
-* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
-- Use ninja to build
-- Remove scriptlets
-
-* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
-- remove broken pt_BR locale
-- fix appdata install
-
-* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
-- update to 2.0.14 release
-
-* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
-- update to 2.0.13 release
-
-* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
-- update to 2.0.12 release
-
-* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
-- update to 2.0.10 release
-
-* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
-- update to 2.0.9 release
-
-* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
-- Add Requires: qt5-qttranslations (fix rfbz#4450).
-- Add COPYING-DOCS
-
-* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
-- Add Requires: vlc (fix rfbz#4394).
-
-* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
-- update to 2.0.5 release
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
-- rebuilt
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
-- revert last commit
-
-* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
-- use kinit requires macro
-
-* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
-- add some missing runtime deps
-
-* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
-- update to 2.0.4 release
-
-* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
-- Patch for gcc6 and cmake changes
-
-* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
-- Rebuild for xine-lib 1.2.
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
-- backport upstream patch to fix FTBFS with g++ 4.7
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
-- 1.2.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
-- kaffeine 1.1
-- fixes #618718
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
-- reverted to source
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
-- use ln now to have a kaffeine icon in hicolor
-- working with upstream to get it fixed
-- fixes #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
-- changed Requires to kdebase-runtime
-- added kaffeine.png to fix #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme
-
-* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
-- Unexpanded macro in kdelibs4 dependency (#606134)
-- remove old/unused patches
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
-- removed Require libXss, added BR libXss-devel
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
-- kaffeine 1.0
-- new dep libXss
-- lots of improvements and bugfixes
-
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
-- deinterlace-optional patch thanks to Kevin Kofler
-
-* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
-- kaffeine-1.0-pre3
-- adjust summary/description: no longer phonon based (uses xine-lib)
-
-* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
-- kaffeine-1.0-pre2
-- update %%description/%%summary
-- %%check: use desktop-file-validate
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
-- kaffeine-1.0-pre1
-
-* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
-- re-enable dvb (#495379)
-
-* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
-- Improve icon cache and desktop database update scriptlets.
-- Update URL.
-
-* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
-- s/nonfree/freeworld/
-- --without-dvb (f11+)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
-- EPG and OSD patch (#452421).
-
-* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
-- Unfuzz optflags patch.
-
-* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
-- kaffeine-0.8.7
-
-* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
-- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
-
-* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
-- fix deps wrt kaffeine-libs (#436442)
-- f7: xcb support (#373411)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
-- Autorebuild for GCC 4.3
-
-* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
-- kaffeine-0.8.6
-
-* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
-- Require kdelibs3-devel instead of kdelibs-devel in -devel.
-
-* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
-- BR: kdelibs3-devel
-
-* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
-- multiarch conflicts in kaffeine (#341681)
-
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
-- Avoid autotools re-run after configure (unclean upstream tarball?)
-
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
-- respin (BuildID)
-
-* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
-- License: GPLv2+
-- BR: libxcb-devel (really)
-
-* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
-- kaffeine-0.8.5
-- BR: libxcb-devel
-
-* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4 (#243823)
-
-* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
-- disable gst08 support (for now), it's been orphaned
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
-- less globbing in %%files
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
-
-* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
-- 0.8.3
-
-* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
-- %%doc README
-
-* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
-- fix chmod so it actually works.
-
-* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
-- chmod -x AUTHORS ChangeLog TODO
-- use rel symlinks under %%_docdir
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
-- update %%description to not mention any specific mm containers
- (like AVI, WMV).
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
-- fixup for Extras
-- support building kaffeine-extras-nonfree for that other repo.
-
-* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
-- 0.8.2
-
-* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
-- for kdelibs >= 3.5.4, omit
- /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
-
-* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
-- BR: libXtst-devel libXinerama-devel (fc5+)
-
-* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
-- (re)enable gstreamer support (fc3+)
-
-* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
-- avoid re-auto'ing thing, breaks locale/po-files
-
-* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
-- 0.8.1
-- cdda patch (upsgream bug #1463542)
-
-* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
-- drop --vendor=livna
-- fdo icon spec fix
-- kaffeine-0.7.x-CVE-2006-0051.patch
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
-- update-desktop-database (#645)
-- -devel pkg (#645)
-- -gstreamer subpkg, marked experimental (due to upstream #1254363)
-- omit -desktop patch (#645)
-- use desktop-file-install (#645)
-
-* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
-- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
-
-* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
-- 0.7.1, gcc visibility hack no longer needed.
-
-* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
-- 0.7, now with DVB support (FC4+ only).
-- GStreamer support disabled by default due to upstream #1254363, rebuild
- with "--with gstreamer" to enable.
-- Quick and dirty workaround for upstream #1253989.
-
-* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
-- 0.6.
-
-* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
-- Update to 0.5.
-
-* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
-- Update to 0.5rc2.
-
-* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
-- Update to 0.5rc1.
-- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
-- Purge libselinux workarounds, no longer needed.
-- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
-- Disable dependency tracking to speed up the build.
-- Provide -devel.
-
-* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
-- Update to 0.4.3b.
-- Add workaround for https://bugzilla.redhat.com/123853
-
-* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
-- Update to 0.4.3.
-
-* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
-- Update to 0.4.2.
-
-* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
-- Update to 0.4.1, patches applied upstream.
-- Update description.
-
-* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
-- Update to 0.4.
-- Disable rpath.
-- Add Gnome icon.
-
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
-- Own directories under %%{_datadir}/icons.
-
-* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
-- First build.
+%autochangelog
commit 1df7dabdf29faecd90bd3df1eeff95d411ced04e
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Dec 18 22:25:33 2023 -0500
Re-import into Fedora
diff --git a/.gitignore b/.gitignore
index 3798cee..ddd79d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kaffeine.png
/kaffeine-1.1.tar.gz
/kaffeine-1.2.2.tar.gz
+/kaffeine-2.0.18.tar.xz
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
deleted file mode 100644
index e74563e..0000000
--- a/kaffeine-1.2.2-gcc47.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfister(a)gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
index ff25edf..a5d92d8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,97 +1,209 @@
-Name: kaffeine
-Version: 1.2.2
-Release: 6%{?dist}
-
-License: GPLv2+
-Summary: KDE media player
-Group: Applications/Multimedia
-URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## upstream patches
-# fix build with g++ 4.7 (Christoph Pfister)
-# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
-Patch100: kaffeine-1.2.2-gcc47.patch
+Name: kaffeine
+Version: 2.0.18
+Release: 10%{?dist}
+License: GPL-2.0-or-later AND GFDL-1.3-or-later
+Summary: KDE media player based on VLC
+URL: https://apps.kde.org/kaffeine/
+Source: https://download.kde.org/%{stable_kf5}/%{name}/%{name}-%{version}.tar.xz
BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel libXScrnSaver-devel
+BuildRequires: kf5-rpm-macros
+BuildRequires: libappstream-glib
+
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Sql)
+BuildRequires: cmake(Qt5X11Extras)
+
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5WidgetsAddons)
+BuildRequires: cmake(KF5WindowSystem)
+BuildRequires: cmake(KF5XmlGui)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5DBusAddons)
+BuildRequires: cmake(KF5DocTools)
+
+BuildRequires: pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(libvlc)
+BuildRequires: pkgconfig(libdvbv5)
+
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+Requires: kio-extras-kf5%{?_isa}
+%else
+Requires: kio-extras%{?_isa}
+%endif
+# Needed for open file dialog translations
+Requires: qt5-qttranslations
+Requires: vlc-plugins-base%{?_isa}
+Requires: vlc-plugins-video-out%{?_isa}
+Recommends: vlc-plugin-ffmpeg%{?_isa}
+Recommends: (vlc-plugin-gnome%{?_isa} if gnome-keyring%{?_isa})
+Recommends: (vlc-plugin-kde%{?_isa} if kf5-kwallet%{?_isa})
+Recommends: (vlc-plugin-pulseaudio%{?_isa} or vlc-plugin-pipewire%{?_isa})
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
-Obsoletes: kaffeine-libs < 1.0
-Obsoletes: kaffeine-devel < 1.0
+%description
+Kaffeine is a KDE media player. Kaffeine has user-friendly interface,
+so that even first time users can start immediately playing their movies
+from DVD (including DVD menus, titles, chapters, etc.), VCD, or a file.
-Requires: kdebase-runtime
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+%prep
+%autosetup -p1
-%description
-Kaffeine is a KDE media player.
+%build
+%cmake_kf5
+%cmake_build
-%prep
-%setup -q -n kaffeine-%{version}
-%patch100 -p1 -b .gcc47
+%install
+%cmake_install
+%find_lang %{name} --with-qt --with-man --with-html --all-name
-%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%check
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kaffeine.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml
-%install
-rm -rf %{buildroot}
+%files -f %{name}.lang
+%doc README.md
+%license COPYING COPYING-DOCS
+%{_kf5_bindir}/kaffeine
+%{_kf5_datadir}/kaffeine/
+%{_kf5_datadir}/applications/org.kde.kaffeine.desktop
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/profiles/kaffeine.profile.xml
+%{_kf5_datadir}/solid/actions/*.desktop
+%{_kf5_mandir}/man1/kaffeine.1.*
+%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --with-kde
+%changelog
+* Tue Dec 19 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 2.0.18-10
+- Re-import into Fedora
+* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-%clean
-rm -rf %{buildroot}
+* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
+* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-%postun
-if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-fi
+* Tue Jul 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.18-3
+- Improve compatibility with new CMake macro
-%posttrans
-update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Fri Aug 09 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.18-1
+- update to 2.0.18
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_kde4_bindir}/kaffeine
-%{_kde4_bindir}/kaffeine-xbu
-%{_kde4_appsdir}/kaffeine/
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Thu May 02 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.17-1
+- update to 2.0.17
+
+* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de> 2.0.16-1
+- update to 2.0.16
+- use tarball from github with fixed versioning
+- drop previously applied patch
+- add translations from http://kaffeine.kde.org/
+- enable pt_br language again
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.15-1
+- update to 2.0.15 release
+
+* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.0.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- Use ninja to build
+- Remove scriptlets
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
+- remove broken pt_BR locale
+- fix appdata install
+
+* Sat Dec 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
+- update to 2.0.14 release
+
+* Wed Oct 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
+- update to 2.0.13 release
+
+* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
+- update to 2.0.12 release
+
+* Fri Jul 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
+- update to 2.0.10 release
+
+* Sat Apr 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.9-1
+- update to 2.0.9 release
+
+* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-3
+- Add Requires: qt5-qttranslations (fix rfbz#4450).
+- Add COPYING-DOCS
+
+* Fri Dec 30 2016 Xavier Bachelot <xavier(a)bachelot.org> - 2.0.5-2
+- Add Requires: vlc (fix rfbz#4394).
+
+* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 2.0.5-1
+- update to 2.0.5 release
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
+- rebuilt
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
+- revert last commit
+
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-3
+- use kinit requires macro
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-2
+- add some missing runtime deps
+
+* Thu Jul 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-1
+- update to 2.0.4 release
+
+* Mon Jun 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Oct 23 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.2-7
+- Rebuild for xine-lib 1.2.
-%changelog
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -204,7 +316,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
- BR: kdelibs3-devel
-* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
- multiarch conflicts in kaffeine (#341681)
* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
diff --git a/sources b/sources
index 5a867c7..0020cf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
+SHA512 (kaffeine-2.0.18.tar.xz) = 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
commit f54d7038e22f3bff261830dc8882672d8aad5a70
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Dec 18 13:40:50 2023 +0100
Unretirement request: https://pagure.io/releng/issue/11840
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3798cee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/kaffeine.png
+/kaffeine-1.1.tar.gz
+/kaffeine-1.2.2.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index a621cab..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister(a)gmail.com>
+Date: Wed Apr 4 21:22:09 2012 +0200
+
+ fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
+
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
new file mode 100644
index 0000000..ff25edf
--- /dev/null
+++ b/kaffeine.spec
@@ -0,0 +1,347 @@
+Name: kaffeine
+Version: 1.2.2
+Release: 6%{?dist}
+
+License: GPLv2+
+Summary: KDE media player
+Group: Applications/Multimedia
+URL: http://kaffeine.kde.org/
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: xine-lib-devel libXScrnSaver-devel
+
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
+
+Requires: kdebase-runtime
+
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+
+%description
+Kaffeine is a KDE media player.
+
+
+%prep
+%setup -q -n kaffeine-%{version}
+%patch100 -p1 -b .gcc47
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf %{buildroot}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database %{_datadir}/applications &>/dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING README
+%{_kde4_bindir}/kaffeine
+%{_kde4_bindir}/kaffeine-xbu
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+
+
+%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme
+
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
+
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/sources b/sources
new file mode 100644
index 0000000..5a867c7
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 95d66162001360cf742d8d97ee1b45c5dcc873e5
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Oct 24 01:02:54 2013 +0200
Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3798cee..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/kaffeine.png
-/kaffeine-1.1.tar.gz
-/kaffeine-1.2.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a621cab
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Moved to RPM Fusion together with xine-lib 1.2+
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
deleted file mode 100644
index e74563e..0000000
--- a/kaffeine-1.2.2-gcc47.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfister(a)gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
deleted file mode 100644
index ff25edf..0000000
--- a/kaffeine.spec
+++ /dev/null
@@ -1,347 +0,0 @@
-Name: kaffeine
-Version: 1.2.2
-Release: 6%{?dist}
-
-License: GPLv2+
-Summary: KDE media player
-Group: Applications/Multimedia
-URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-## upstream patches
-# fix build with g++ 4.7 (Christoph Pfister)
-# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
-Patch100: kaffeine-1.2.2-gcc47.patch
-
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel libXScrnSaver-devel
-
-Obsoletes: kaffeine-libs < 1.0
-Obsoletes: kaffeine-devel < 1.0
-
-Requires: kdebase-runtime
-
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
-
-%description
-Kaffeine is a KDE media player.
-
-
-%prep
-%setup -q -n kaffeine-%{version}
-%patch100 -p1 -b .gcc47
-
-
-%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
-
-
-%install
-rm -rf %{buildroot}
-
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-%find_lang %{name} --with-kde
-
-
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-fi
-
-%posttrans
-update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_kde4_bindir}/kaffeine
-%{_kde4_bindir}/kaffeine-xbu
-%{_kde4_appsdir}/kaffeine/
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/kaffeine.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/profiles/kaffeine.profile.xml
-
-
-%changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
-- backport upstream patch to fix FTBFS with g++ 4.7
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
-- 1.2.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
-- kaffeine 1.1
-- fixes #618718
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
-- reverted to source
-
-* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
-- use ln now to have a kaffeine icon in hicolor
-- working with upstream to get it fixed
-- fixes #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
-- changed Requires to kdebase-runtime
-- added kaffeine.png to fix #611273
-
-* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme
-
-* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
-- Unexpanded macro in kdelibs4 dependency (#606134)
-- remove old/unused patches
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
-- removed Require libXss, added BR libXss-devel
-
-* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
-- kaffeine 1.0
-- new dep libXss
-- lots of improvements and bugfixes
-
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
-- deinterlace-optional patch thanks to Kevin Kofler
-
-* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
-- kaffeine-1.0-pre3
-- adjust summary/description: no longer phonon based (uses xine-lib)
-
-* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
-- kaffeine-1.0-pre2
-- update %%description/%%summary
-- %%check: use desktop-file-validate
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
-- kaffeine-1.0-pre1
-
-* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
-- re-enable dvb (#495379)
-
-* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
-- Improve icon cache and desktop database update scriptlets.
-- Update URL.
-
-* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
-- s/nonfree/freeworld/
-- --without-dvb (f11+)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
-- EPG and OSD patch (#452421).
-
-* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
-- Unfuzz optflags patch.
-
-* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
-- kaffeine-0.8.7
-
-* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
-- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
-
-* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
-- fix deps wrt kaffeine-libs (#436442)
-- f7: xcb support (#373411)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
-- Autorebuild for GCC 4.3
-
-* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
-- kaffeine-0.8.6
-
-* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
-- Require kdelibs3-devel instead of kdelibs-devel in -devel.
-
-* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
-- BR: kdelibs3-devel
-
-* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
-- multiarch conflicts in kaffeine (#341681)
-
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
-- Avoid autotools re-run after configure (unclean upstream tarball?)
-
-* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
-- respin (BuildID)
-
-* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
-- License: GPLv2+
-- BR: libxcb-devel (really)
-
-* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
-- kaffeine-0.8.5
-- BR: libxcb-devel
-
-* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4 (#243823)
-
-* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
-- disable gst08 support (for now), it's been orphaned
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
-- less globbing in %%files
-
-* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
-
-* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
-- 0.8.3
-
-* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
-- %%doc README
-
-* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
-- fix chmod so it actually works.
-
-* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
-- chmod -x AUTHORS ChangeLog TODO
-- use rel symlinks under %%_docdir
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
-- update %%description to not mention any specific mm containers
- (like AVI, WMV).
-
-* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
-- fixup for Extras
-- support building kaffeine-extras-nonfree for that other repo.
-
-* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
-- 0.8.2
-
-* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
-- for kdelibs >= 3.5.4, omit
- /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
-
-* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
-- BR: libXtst-devel libXinerama-devel (fc5+)
-
-* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
-- (re)enable gstreamer support (fc3+)
-
-* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
-- avoid re-auto'ing thing, breaks locale/po-files
-
-* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
-- 0.8.1
-- cdda patch (upsgream bug #1463542)
-
-* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
-- drop --vendor=livna
-- fdo icon spec fix
-- kaffeine-0.7.x-CVE-2006-0051.patch
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
-- update-desktop-database (#645)
-- -devel pkg (#645)
-- -gstreamer subpkg, marked experimental (due to upstream #1254363)
-- omit -desktop patch (#645)
-- use desktop-file-install (#645)
-
-* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
-- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
-
-* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
-- 0.7.1, gcc visibility hack no longer needed.
-
-* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
-- 0.7, now with DVB support (FC4+ only).
-- GStreamer support disabled by default due to upstream #1254363, rebuild
- with "--with gstreamer" to enable.
-- Quick and dirty workaround for upstream #1253989.
-
-* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
-- 0.6.
-
-* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
-- Update to 0.5.
-
-* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
-- Update to 0.5rc2.
-
-* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
-- Update to 0.5rc1.
-- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
-- Purge libselinux workarounds, no longer needed.
-- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
-- Disable dependency tracking to speed up the build.
-- Provide -devel.
-
-* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
-- Update to 0.4.3b.
-- Add workaround for https://bugzilla.redhat.com/123853
-
-* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
-- Update to 0.4.3.
-
-* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
-- Update to 0.4.2.
-
-* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
-- Update to 0.4.1, patches applied upstream.
-- Update description.
-
-* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
-- Update to 0.4.
-- Disable rpath.
-- Add Gnome icon.
-
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
-- Own directories under %%{_datadir}/icons.
-
-* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
-- First build.
diff --git a/sources b/sources
deleted file mode 100644
index 5a867c7..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 04c7400ab654980857705f4a5cf594ea2cefba31
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 16:57:53 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index d60cd14..ff25edf 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit 09df2d736c792d0800a42c2f1c9bde7e4b4b208d
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 21:07:43 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 5f0735f..d60cd14 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit 05bdf49b4c724688de0466ec8ce53066f9c07827
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jul 19 11:59:20 2012 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 7072380..5f0735f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
- backport upstream patch to fix FTBFS with g++ 4.7
commit 64eb96749f4ab07f607f395e2403c63b856cdbb3
Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Sun Apr 22 00:27:49 2012 +0200
backport upstream patch to fix FTBFS with g++ 4.7
* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
- backport upstream patch to fix FTBFS with g++ 4.7
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister(a)gmail.com>
+Date: Wed Apr 4 21:22:09 2012 +0200
+
+ fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
+
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
index 5cbf877..7072380 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -9,7 +9,10 @@ URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstreamable patches
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -29,6 +32,7 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
+%patch100 -p1 -b .gcc47
%build
@@ -88,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Sat Apr 21 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit ea46631f4a8a7ad1ea5c86c738e2c3231dbb7419
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jan 13 00:39:23 2012 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 551d436..5cbf877 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -88,6 +88,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
- 1.2.2
commit 1151e9ffa0020cf9abad5e507bfe224fe5a9e2f6
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon May 9 20:08:03 2011 -0500
1.2.2
diff --git a/.gitignore b/.gitignore
index bcaf79a..3798cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-kaffeine-1.0.tar.gz
-kaffeine.png
-/kaffeine-1.0.tar.gz
/kaffeine.png
/kaffeine-1.1.tar.gz
+/kaffeine-1.2.2.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index cace8ac..551d436 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,12 @@
Name: kaffeine
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -46,11 +45,6 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-mv %{buildroot}%{_kde4_iconsdir}/oxygen \
- %{buildroot}%{_kde4_iconsdir}/hicolor
-
-install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
-
%find_lang %{name} --with-kde
@@ -64,32 +58,39 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
update-desktop-database %{_datadir}/applications &>/dev/null
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO
+%doc COPYING README
%{_kde4_bindir}/kaffeine
%{_kde4_bindir}/kaffeine-xbu
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
+* Mon May 09 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.2-1
+- 1.2.2
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 852e1cf..5a867c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
-72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
+690e48d2e5fe123887109aa9b1bc1c31 kaffeine-1.2.2.tar.gz
commit 87e1665531d0a1874fb378b56486e639dd22bc09
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 19:32:53 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index f0ffba4..cace8ac 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -90,6 +90,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
- kaffeine 1.1
- fixes #618718
commit 432e44083158ac4b16ef1f67516ea5bf76869d81
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Mon Sep 6 22:19:02 2010 +0200
kaffeine 1.1, seems i forgot the kaffeine.png file
diff --git a/sources b/sources
index f748375..852e1cf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
commit 09668aff683545b5c8b50e2ee4cc6f956d9f9123
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Mon Sep 6 22:11:30 2010 +0200
kaffeine 1.1
diff --git a/.gitignore b/.gitignore
index 145deaf..bcaf79a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ kaffeine-1.0.tar.gz
kaffeine.png
/kaffeine-1.0.tar.gz
/kaffeine.png
+/kaffeine-1.1.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 535b106..f0ffba4 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
-Version: 1.0
-Release: 7%{?dist}
+Version: 1.1
+Release: 1%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -90,6 +90,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Mon Sep 06 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.1-1
+- kaffeine 1.1
+- fixes #618718
+
* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
- reverted to source
diff --git a/sources b/sources
index 13aa78c..f748375 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
-d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
+72284197b1c90adf75149311e4422efe kaffeine-1.1.tar.gz
commit 55b72552b9d37b597483f2b68eeb78807f293ea6
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Tue Aug 17 20:50:38 2010 +0200
reverted to source1
diff --git a/.gitignore b/.gitignore
index 76e79b5..145deaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
kaffeine-1.0.tar.gz
kaffeine.png
+/kaffeine-1.0.tar.gz
+/kaffeine.png
diff --git a/kaffeine.spec b/kaffeine.spec
index e72e343..535b106 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-
+Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -49,6 +49,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
+
%find_lang %{name} --with-kde
@@ -62,7 +64,6 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-ln -f -s %{_kde4_iconsdir}/oxygen/48x48/apps/kaffeine.png %{_kde4_iconsdir}/hicolor/48x48/apps/
%postun
if [ $1 -eq 0 ] ; then
@@ -89,6 +90,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-7
+- reverted to source
+
* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
- use ln now to have a kaffeine icon in hicolor
- working with upstream to get it fixed
commit e9fd27aa4c9bc7fe7b8bd92ae7db760b1f23e98d
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Tue Aug 17 19:25:35 2010 +0200
short-term-fix #611273
diff --git a/kaffeine.spec b/kaffeine.spec
index 42e1e90..e72e343 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Source1: kaffeine.png
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -49,8 +49,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
-
%find_lang %{name} --with-kde
@@ -64,6 +62,7 @@ rm -rf %{buildroot}
%post
touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+ln -f -s %{_kde4_iconsdir}/oxygen/48x48/apps/kaffeine.png %{_kde4_iconsdir}/hicolor/48x48/apps/
%postun
if [ $1 -eq 0 ] ; then
@@ -90,6 +89,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-6
+- use ln now to have a kaffeine icon in hicolor
+- working with upstream to get it fixed
+- fixes #611273
+
* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
- changed Requires to kdebase-runtime
- added kaffeine.png to fix #611273
commit fe6952751953f7b80fd01200ad6c0ee961222bff
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Wed Jul 28 18:58:12 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index dda970f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: kaffeine
-# $Id: Makefile,v 1.1 2006/11/14 04:10:42 rdieter Exp $
-NAME := kaffeine
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 4bfb0687213cb16e43927e6f94f2bf7f59a773a8
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jul 22 18:14:32 2010 +0000
kaffeine.png : remove from cvs, put into sources instead
diff --git a/.cvsignore b/.cvsignore
index 88c4c51..76e79b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
kaffeine-1.0.tar.gz
+kaffeine.png
diff --git a/kaffeine.png b/kaffeine.png
deleted file mode 100644
index 5eb32a4..0000000
Binary files a/kaffeine.png and /dev/null differ
diff --git a/sources b/sources
index 9787ead..13aa78c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
+d3c40c38c24d30e73b90ac6aa81f0059 kaffeine.png
commit 8432d7b9245c5f35ee7deee0eb9b301e54dad0b4
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jul 5 00:19:08 2010 +0000
minor esthetics wrt macros in scriptlets
diff --git a/kaffeine.spec b/kaffeine.spec
index 0139354..42e1e90 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -49,8 +49,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
-install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
%find_lang %{name} --with-kde
@@ -64,18 +63,18 @@ rm -rf %{buildroot}
%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%files -f %{name}.lang
commit d7834782e04e85fc0d91fcd2307db02c28c423ee
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 21:06:45 2010 +0000
man.. tired, forgot mkdir first
diff --git a/kaffeine.spec b/kaffeine.spec
index c22de69..0139354 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,6 +48,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+
+mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 7d3c3cbf9872ae74ac8c8d5c21b62eafc78937f9
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:58:20 2010 +0000
fixed a typo in spec
diff --git a/kaffeine.spec b/kaffeine.spec
index e16bfb1..c22de69 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,7 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-nstall -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+install -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 5dc55d207ffc1b4abc36b0f03a0a5585b84a3eeb
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:47:32 2010 +0000
spec fix
diff --git a/kaffeine.spec b/kaffeine.spec
index 5e07c4d..e16bfb1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -48,7 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-mv kaffeine.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
+nstall -pm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
commit 73db330336a18ce4bde9b5db61d2c09293b1d54f
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 20:37:13 2010 +0000
added kaffeine.png into hicolor to fix #611273
diff --git a/kaffeine.png b/kaffeine.png
new file mode 100644
index 0000000..5eb32a4
Binary files /dev/null and b/kaffeine.png differ
diff --git a/kaffeine.spec b/kaffeine.spec
index cc5629b..5e07c4d 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,12 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Source1: kaffeine.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -19,8 +20,7 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
-# fix bug #611273
-Requires: oxygen-icon-theme
+Requires: kdebase-runtime
%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
@@ -48,6 +48,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
+mv kaffeine.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
%find_lang %{name} --with-kde
@@ -88,8 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme #611273
+- added Requires oxygen-icon-theme
* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
- Unexpanded macro in kdelibs4 dependency (#606134)
commit d5d0cdbc92fe7205f8f11efd868e796f149dcddf
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jul 4 17:17:05 2010 +0000
added Requires: oxygen-icon-theme #611273
diff --git a/kaffeine.spec b/kaffeine.spec
index 926bd3f..cc5629b 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,6 @@
-
Name: kaffeine
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -20,6 +19,9 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
+# fix bug #611273
+Requires: oxygen-icon-theme
+
%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
%description
@@ -86,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 04 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-4
+- added Requires oxygen-icon-theme #611273
+
* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
- Unexpanded macro in kdelibs4 dependency (#606134)
- remove old/unused patches
commit 26798436e8ac96d9b9a428c1ff7312c4382c9cd9
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jun 21 12:24:54 2010 +0000
- Unexpanded macro in kdelibs4 dependency (#606134)
- remove old/unused patches
diff --git a/kaffeine-1.0-pre3-deinterlace-optional.patch b/kaffeine-1.0-pre3-deinterlace-optional.patch
deleted file mode 100644
index f4d7272..0000000
--- a/kaffeine-1.0-pre3-deinterlace-optional.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp
---- kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp 2010-01-31 18:04:50.000000000 +0100
-+++ kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp 2010-04-15 21:16:04.000000000 +0200
-@@ -44,8 +44,8 @@
- };
-
- XineObject::XineObject() : engine(NULL), audioOutput(NULL), videoOutput(NULL), stream(NULL),
-- eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), aspectRatio(XineAspectRatioAuto),
-- videoSize(0)
-+ eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), deinterlacing(false),
-+ aspectRatio(XineAspectRatioAuto), videoSize(0)
- {
- reader = new XinePipeReader(3, this);
- parentProcess = new XineParent(4, this);
-@@ -154,11 +154,13 @@
- break;
- }
- case XineCommands::SetDeinterlacing: {
-- bool deinterlacing_ = reader->readBool();
-+ if (deinterlacer != NULL) {
-+ bool deinterlacing_ = reader->readBool();
-
-- if (reader->isValid()) {
-- deinterlacing = deinterlacing_;
-- dirtyFlags |= SetDeinterlacing;
-+ if (reader->isValid()) {
-+ deinterlacing = deinterlacing_;
-+ dirtyFlags |= SetDeinterlacing;
-+ }
- }
-
- break;
-@@ -391,35 +393,32 @@
- xine_event_create_listener_thread(eventQueue, &event_listener_cb, this);
- deinterlacer = xine_post_init(engine, "tvtime", 1, 0, &videoOutput);
-
-- if (deinterlacer == NULL) {
-- parentProcess->initFailed("Cannot create deinterlace plugin.");
-- return;
-- }
--
-- xine_post_api_t *deinterlacerApi =
-- static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
-- xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
--
-- for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
-- xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
--
-- if ((parameter.type == POST_PARAM_TYPE_INT) &&
-- (strcmp(parameter.name, "method") == 0)) {
-- QByteArray parameterData;
-- parameterData.resize(deinterlacerParameters->struct_size);
-- char *data = parameterData.data();
-- deinterlacerApi->get_parameters(deinterlacer, data);
-- int *method = reinterpret_cast<int *>(data + parameter.offset);
--
-- for (char **value = parameter.enum_values; *value != NULL; ++value) {
-- if (strcmp(*value, "Greedy2Frame") == 0) {
-- *method = value - parameter.enum_values;
-- break;
-+ if (deinterlacer != NULL) {
-+ xine_post_api_t *deinterlacerApi =
-+ static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
-+ xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
-+
-+ for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
-+ xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
-+
-+ if ((parameter.type == POST_PARAM_TYPE_INT) &&
-+ (strcmp(parameter.name, "method") == 0)) {
-+ QByteArray parameterData;
-+ parameterData.resize(deinterlacerParameters->struct_size);
-+ char *data = parameterData.data();
-+ deinterlacerApi->get_parameters(deinterlacer, data);
-+ int *method = reinterpret_cast<int *>(data + parameter.offset);
-+
-+ for (char **value = parameter.enum_values; *value != NULL; ++value) {
-+ if (strcmp(*value, "Greedy2Frame") == 0) {
-+ *method = value - parameter.enum_values;
-+ break;
-+ }
- }
-- }
-
-- deinterlacerApi->set_parameters(deinterlacer, data);
-- break;
-+ deinterlacerApi->set_parameters(deinterlacer, data);
-+ break;
-+ }
- }
- }
diff --git a/kaffeine-1.0-pre3-mkfifo.patch.patch b/kaffeine-1.0-pre3-mkfifo.patch.patch
deleted file mode 100644
index 09ef7f8..0000000
--- a/kaffeine-1.0-pre3-mkfifo.patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo kaffeine-1.0-pre3/src/mediawidget.cpp
---- kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo 2010-01-31 11:04:50.000000000 -0600
-+++ kaffeine-1.0-pre3/src/mediawidget.cpp 2010-02-08 12:54:32.323917100 -0600
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/stat.h>
- #include "backend-xine/xinemediawidget.h"
- #include "osdwidget.h"
-
diff --git a/kaffeine.spec b/kaffeine.spec
index 0d294a6..926bd3f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,7 @@
Name: kaffeine
Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-#Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -30,7 +29,6 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
-#%patch60 -p1
%build
mkdir -p %{_target_platform}
@@ -86,7 +84,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
+
%changelog
+* Mon Jun 21 2010 Rex Dieter <rdieter(a)fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
- removed Require libXss, added BR libXss-devel
commit 7818e38cd989e23f660c5b4e85c1f9526a2074fc
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Sun Jun 20 20:56:10 2010 +0000
fixed a typo in the spec
diff --git a/kaffeine.spec b/kaffeine.spec
index 2342499..0d294a6 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -21,7 +21,7 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
%description
Kaffeine is a KDE media player.
commit b33b78ddf35f3e9cd9a5841e06e496e9f29cd0ef
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 16:30:27 2010 +0000
removed Requires libXss, added BR libXss-devel
diff --git a/kaffeine.spec b/kaffeine.spec
index ceb39b7..2342499 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,7 @@
Name: kaffeine
Version: 1.0
-Release: 0%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -16,9 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel
-
-Requires: libXScrnSaver
+BuildRequires: xine-lib-devel libXScrnSaver-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
@@ -89,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
- kaffeine 1.0
- new dep libXss
commit a14f22dc00f872c0b6fbf0647459483811ae2386
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 14:10:02 2010 +0000
spec fix 4
diff --git a/kaffeine.spec b/kaffeine.spec
index 0d90ca2..ceb39b7 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -86,7 +86,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
-
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
%changelog
* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
commit ea83020fb5f6638afb8aa445667dbf703e3ed631
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:59:56 2010 +0000
spec fix 3
diff --git a/kaffeine.spec b/kaffeine.spec
index dfa07df..0d90ca2 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -86,7 +86,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/kaffeinedvb.so
%changelog
commit 3819797869ddfe7f3cf7ed67157d5d6deb7e669f
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:47:25 2010 +0000
spec fix 2
diff --git a/kaffeine.spec b/kaffeine.spec
index a83a9a8..dfa07df 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,7 +11,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
+#Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -32,7 +32,7 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}
-%patch60 -p1
+#%patch60 -p1
%build
mkdir -p %{_target_platform}
commit acfc3cc58a5a17305934fb2efe09b127801b88b0
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:33:36 2010 +0000
spec fix
diff --git a/kaffeine.spec b/kaffeine.spec
index 956075c..a83a9a8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,7 +11,6 @@ Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
-Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
@@ -31,9 +30,8 @@ Kaffeine is a KDE media player.
%prep
-%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%setup -q -n kaffeine-%{version}
-%patch50 -p1 -b .mkfifo
%patch60 -p1
%build
commit 1b5f1dd1e249566e0643a6f864c5d6efb5b7ad32
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Tue Jun 1 13:23:35 2010 +0000
kaffeine 1.0
diff --git a/.cvsignore b/.cvsignore
index 4436234..88c4c51 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre3.tar.gz
+kaffeine-1.0.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 6e74a51..956075c 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,15 +1,13 @@
-%define pre pre3
-
Name: kaffeine
Version: 1.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0%{?dist}
License: GPLv2+
Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -21,6 +19,8 @@ BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: xine-lib-devel
+Requires: libXScrnSaver
+
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
@@ -92,6 +92,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Jun 01 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss
+- lots of improvements and bugfixes
+
* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
- deinterlace-optional patch thanks to Kevin Kofler
diff --git a/sources b/sources
index d407339..9787ead 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-919e29a95b599db5eef74b5983f135f4 kaffeine-1.0-pre3.tar.gz
+81bac76f931245a75f20ed26a37c55e3 kaffeine-1.0.tar.gz
commit 691e754e1ad3b72496e94122ca75bdd8e971b473
Author: Kevin Kofler <kkofler(a)fedoraproject.org>
Date: Tue Apr 27 13:02:16 2010 +0000
Bump Release for upgrade path.
diff --git a/kaffeine.spec b/kaffeine.spec
index f9ff44b..6e74a51 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -2,8 +2,8 @@
%define pre pre3
Name: kaffeine
-Version: 1.0
-Release: 0.4.%{pre}%{?dist}
+Version: 1.0
+Release: 0.5.%{pre}%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -92,7 +92,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.4.pre3
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.5.pre3
- deinterlace-optional patch thanks to Kevin Kofler
* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
commit bd1805774999b28d01ffccfa870c62cdd55c1dca
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Thu Apr 15 19:54:49 2010 +0000
patch try2
diff --git a/kaffeine.spec b/kaffeine.spec
index 7554d52..f9ff44b 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -34,7 +34,7 @@ Kaffeine is a KDE media player.
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
%patch50 -p1 -b .mkfifo
-%patch60 -p0
+%patch60 -p1
%build
mkdir -p %{_target_platform}
commit c8e7d9ec21d3f097df47e019d6ae3e535b664001
Author: thomasj <thomasj(a)fedoraproject.org>
Date: Thu Apr 15 19:32:16 2010 +0000
deinterlace-optional patch
diff --git a/kaffeine-1.0-pre3-deinterlace-optional.patch b/kaffeine-1.0-pre3-deinterlace-optional.patch
new file mode 100644
index 0000000..f4d7272
--- /dev/null
+++ b/kaffeine-1.0-pre3-deinterlace-optional.patch
@@ -0,0 +1,91 @@
+diff -ur kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp
+--- kaffeine-1.0-pre3/src/backend-xine/xineapplication.cpp 2010-01-31 18:04:50.000000000 +0100
++++ kaffeine-1.0-pre3-deinterlace-optional/src/backend-xine/xineapplication.cpp 2010-04-15 21:16:04.000000000 +0200
+@@ -44,8 +44,8 @@
+ };
+
+ XineObject::XineObject() : engine(NULL), audioOutput(NULL), videoOutput(NULL), stream(NULL),
+- eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), aspectRatio(XineAspectRatioAuto),
+- videoSize(0)
++ eventQueue(NULL), widgetSize(0), dirtyFlags(NotReady), deinterlacing(false),
++ aspectRatio(XineAspectRatioAuto), videoSize(0)
+ {
+ reader = new XinePipeReader(3, this);
+ parentProcess = new XineParent(4, this);
+@@ -154,11 +154,13 @@
+ break;
+ }
+ case XineCommands::SetDeinterlacing: {
+- bool deinterlacing_ = reader->readBool();
++ if (deinterlacer != NULL) {
++ bool deinterlacing_ = reader->readBool();
+
+- if (reader->isValid()) {
+- deinterlacing = deinterlacing_;
+- dirtyFlags |= SetDeinterlacing;
++ if (reader->isValid()) {
++ deinterlacing = deinterlacing_;
++ dirtyFlags |= SetDeinterlacing;
++ }
+ }
+
+ break;
+@@ -391,35 +393,32 @@
+ xine_event_create_listener_thread(eventQueue, &event_listener_cb, this);
+ deinterlacer = xine_post_init(engine, "tvtime", 1, 0, &videoOutput);
+
+- if (deinterlacer == NULL) {
+- parentProcess->initFailed("Cannot create deinterlace plugin.");
+- return;
+- }
+-
+- xine_post_api_t *deinterlacerApi =
+- static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
+- xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
+-
+- for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
+- xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
+-
+- if ((parameter.type == POST_PARAM_TYPE_INT) &&
+- (strcmp(parameter.name, "method") == 0)) {
+- QByteArray parameterData;
+- parameterData.resize(deinterlacerParameters->struct_size);
+- char *data = parameterData.data();
+- deinterlacerApi->get_parameters(deinterlacer, data);
+- int *method = reinterpret_cast<int *>(data + parameter.offset);
+-
+- for (char **value = parameter.enum_values; *value != NULL; ++value) {
+- if (strcmp(*value, "Greedy2Frame") == 0) {
+- *method = value - parameter.enum_values;
+- break;
++ if (deinterlacer != NULL) {
++ xine_post_api_t *deinterlacerApi =
++ static_cast<xine_post_api_t *>(xine_post_input(deinterlacer, "parameters")->data);
++ xine_post_api_descr_t *deinterlacerParameters = deinterlacerApi->get_param_descr();
++
++ for (int i = 0; deinterlacerParameters->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
++ xine_post_api_parameter_t ¶meter = deinterlacerParameters->parameter[i];
++
++ if ((parameter.type == POST_PARAM_TYPE_INT) &&
++ (strcmp(parameter.name, "method") == 0)) {
++ QByteArray parameterData;
++ parameterData.resize(deinterlacerParameters->struct_size);
++ char *data = parameterData.data();
++ deinterlacerApi->get_parameters(deinterlacer, data);
++ int *method = reinterpret_cast<int *>(data + parameter.offset);
++
++ for (char **value = parameter.enum_values; *value != NULL; ++value) {
++ if (strcmp(*value, "Greedy2Frame") == 0) {
++ *method = value - parameter.enum_values;
++ break;
++ }
+ }
+- }
+
+- deinterlacerApi->set_parameters(deinterlacer, data);
+- break;
++ deinterlacerApi->set_parameters(deinterlacer, data);
++ break;
++ }
+ }
+ }
diff --git a/kaffeine.spec b/kaffeine.spec
index 91a79fb..7554d52 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
+Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -33,7 +34,7 @@ Kaffeine is a KDE media player.
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
%patch50 -p1 -b .mkfifo
-
+%patch60 -p0
%build
mkdir -p %{_target_platform}
@@ -91,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Apr 15 2010 Thomas Janssen <thomasj(a)fedoraproject.org> 1.0-0.4.pre3
+- deinterlace-optional patch thanks to Kevin Kofler
+
* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
- kaffeine-1.0-pre3
- adjust summary/description: no longer phonon based (uses xine-lib)
commit 6f85f8fc047398063a092902a9ca0dc9f57dae69
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Feb 8 18:56:24 2010 +0000
#include <sys/stat.h> for mkfifo
diff --git a/kaffeine-1.0-pre1-kernel_headers.patch b/kaffeine-1.0-pre1-kernel_headers.patch
deleted file mode 100644
index be98188..0000000
--- a/kaffeine-1.0-pre1-kernel_headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
---- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers 2009-04-26 13:38:11.000000000 -0500
-+++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp 2009-04-26 14:34:24.526814875 -0500
-@@ -24,7 +24,7 @@
- * workaround buggy kernel includes
- * asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
- */
--typedef quint64 __u64;
-+//typedef quint64 __u64;
-
- #include <cmath>
- #include <errno.h>
diff --git a/kaffeine-1.0-pre3-mkfifo.patch.patch b/kaffeine-1.0-pre3-mkfifo.patch.patch
new file mode 100644
index 0000000..09ef7f8
--- /dev/null
+++ b/kaffeine-1.0-pre3-mkfifo.patch.patch
@@ -0,0 +1,11 @@
+diff -up kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo kaffeine-1.0-pre3/src/mediawidget.cpp
+--- kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo 2010-01-31 11:04:50.000000000 -0600
++++ kaffeine-1.0-pre3/src/mediawidget.cpp 2010-02-08 12:54:32.323917100 -0600
+@@ -43,6 +43,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ #include "backend-xine/xinemediawidget.h"
+ #include "osdwidget.h"
+
diff --git a/kaffeine.spec b/kaffeine.spec
index b150456..91a79fb 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,6 +12,9 @@ URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
@@ -29,6 +32,8 @@ Kaffeine is a KDE media player.
%prep
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%patch50 -p1 -b .mkfifo
+
%build
mkdir -p %{_target_platform}
commit d1dede66587370b36b65f1f3bad407354b358584
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Feb 8 18:45:28 2010 +0000
- kaffeine-1.0-pre3
- adjust summary/description: no longer phonon based (uses xine-lib)
diff --git a/.cvsignore b/.cvsignore
index 1782054..4436234 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre2.tar.gz
+kaffeine-1.0-pre3.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 80bd65c..b150456 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,12 +1,12 @@
-%define pre pre2
+%define pre pre3
Name: kaffeine
Version: 1.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
License: GPLv2+
-Summary: Phonon-based media player
+Summary: KDE media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
@@ -15,13 +15,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: phonon-devel
+BuildRequires: xine-lib-devel
Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+
%description
-Kaffeine is a phonon-based media player.
+Kaffeine is a KDE media player.
%prep
@@ -39,12 +41,13 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%{buildroot}%{_kde4_iconsdir}/hicolor
-%find_lang %{name}
+%find_lang %{name} --with-kde
%check
@@ -52,7 +55,7 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.de
%clean
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+rm -rf %{buildroot}
%post
@@ -74,6 +77,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_kde4_bindir}/kaffeine
+%{_kde4_bindir}/kaffeine-xbu
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
%{_kde4_datadir}/applications/kde4/kaffeine.desktop
@@ -82,6 +86,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Feb 08 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
- kaffeine-1.0-pre2
- update %%description/%%summary
diff --git a/sources b/sources
index a5dd102..d407339 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24eee004427d6b3f73ffb85a94fc6e3b kaffeine-1.0-pre2.tar.gz
+919e29a95b599db5eef74b5983f135f4 kaffeine-1.0-pre3.tar.gz
commit b814da633e5ce60b7d0a35e9d226d59c94820c63
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 23:51:13 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index b8f8bd6..dda970f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: kaffeine
-# $Id$
+# $Id: Makefile,v 1.1 2006/11/14 04:10:42 rdieter Exp $
NAME := kaffeine
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit beb1df806de4d7002750f7c654ad06b1383481a4
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Aug 14 13:38:15 2009 +0000
- kaffeine-1.0-pre2
- update %description/%summary
- %check: use desktop-file-validate
diff --git a/.cvsignore b/.cvsignore
index efe08f3..1782054 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-1.0-pre1.tar.gz
+kaffeine-1.0-pre2.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 1006115..80bd65c 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,19 +1,18 @@
-%define pre pre1
+%define pre pre2
Name: kaffeine
Version: 1.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
License: GPLv2+
-Summary: Xine-based media player
+Summary: Phonon-based media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-
+BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: phonon-devel
@@ -22,14 +21,12 @@ Obsoletes: kaffeine-libs < 1.0
Obsoletes: kaffeine-devel < 1.0
%description
-Kaffeine is a xine-based media player for KDE.
+Kaffeine is a phonon-based media player.
%prep
%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-%patch1 -p1 -b .kernel_headers
-
%build
mkdir -p %{_target_platform}
@@ -50,8 +47,12 @@ mv %{buildroot}%{_kde4_iconsdir}/oxygen \
%find_lang %{name}
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%post
@@ -73,13 +74,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO
%{_kde4_bindir}/kaffeine
-%{_kde4_datadir}/applications/kde4/*.desktop
%{_kde4_appsdir}/kaffeine/
%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/kaffeinedvb.so
%changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index b84a9fd..a5dd102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecae6fd84103a268daf17b61784d837f kaffeine-1.0-pre1.tar.gz
+24eee004427d6b3f73ffb85a94fc6e3b kaffeine-1.0-pre2.tar.gz
commit 82742d49984469ef154da9e717ac4b2800ad6abc
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Jul 25 04:17:07 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index 762af32..1006115 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -3,7 +3,7 @@
Name: kaffeine
Version: 1.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
License: GPLv2+
Summary: Xine-based media player
@@ -80,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-0.2.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
- kaffeine-1.0-pre1
commit 39775ce63b110cf1bdfca22f4cb002af9e10de3f
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Apr 26 19:41:58 2009 +0000
- kaffeine-1.0-pre1
diff --git a/.cvsignore b/.cvsignore
index acd27b1..efe08f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-0.8.7.tar.bz2
+kaffeine-1.0-pre1.tar.gz
diff --git a/kaffeine-0.8.7-codecs.patch b/kaffeine-0.8.7-codecs.patch
deleted file mode 100644
index 0d6fb97..0000000
--- a/kaffeine-0.8.7-codecs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp
---- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs 2007-06-03 08:55:14.000000000 -0500
-+++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp 2008-07-06 13:50:12.000000000 -0500
-@@ -61,6 +61,8 @@ void InstWizard::internalWizard()
- setHelpEnabled(page1, false);
- setFinishEnabled(page1, false);
-
-+ QDir d;
-+
- QString infoString;
- QTextStream info(&infoString, IO_WriteOnly);
-
-@@ -106,14 +108,16 @@ void InstWizard::internalWizard()
- << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
- */
- //WIN32-CODECS
-+ /*
- info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
-- QDir d("/usr/lib/win32");
-+ d = DDir("@libdir@/codecs");
- QStringList entries = d.entryList("wmv*");
- if (entries.count())
- info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
- else
-- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
-+ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
-+ */
-
- //LIBDVDCSS
- info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
diff --git a/kaffeine-0.8.7-epg.patch b/kaffeine-0.8.7-epg.patch
deleted file mode 100644
index 574f111..0000000
--- a/kaffeine-0.8.7-epg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp.orig 2008-01-20 19:50:45.000000000 +0200
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp 2008-08-30 10:15:10.000000000 +0300
-@@ -171,10 +171,10 @@ EventSid *EventSource::getEventSid( int
- }
- }
- if ( !et ) {
-- if ( nid==0) {
-- mutex.unlock();
-- return 0;
-- }
-+ // if ( nid==0) {
-+ // mutex.unlock();
-+ // return 0;
-+ // }
- et = new EventTsid( nid, tsid );
- tsidList.append( et );
- }
diff --git a/kaffeine-0.8.7-optflags.patch b/kaffeine-0.8.7-optflags.patch
deleted file mode 100644
index 0ac33c6..0000000
--- a/kaffeine-0.8.7-optflags.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig 2008-07-01 16:35:02.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -9,4 +9,4 @@ libdvbapi_la_SOURCES = dvbaudio.c \
- dvbnet.c \
- dvbvideo.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig 2008-07-01 16:34:53.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -21,4 +21,4 @@ libdvben50221_la_SOURCES = asn_1.c \
- en50221_stdcam_llci.c \
- en50221_stdcam_hlci.c
-
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -100,7 +100,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
- tva_container_section.c \
- types.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -16,4 +16,4 @@ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.
- ./dvb/libdvbdvb.la \
- ./atsc/libdvbatsc.la
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -103,7 +103,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig 2008-07-01 16:34:55.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-08-28 22:09:10.000000000 +0300
-@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
- pmt_section.c \
- tsdt_section.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
---- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
-+++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-08-28 22:09:10.000000000 +0300
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine-1.0-pre1-kernel_headers.patch b/kaffeine-1.0-pre1-kernel_headers.patch
new file mode 100644
index 0000000..be98188
--- /dev/null
+++ b/kaffeine-1.0-pre1-kernel_headers.patch
@@ -0,0 +1,12 @@
+diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
+--- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers 2009-04-26 13:38:11.000000000 -0500
++++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp 2009-04-26 14:34:24.526814875 -0500
+@@ -24,7 +24,7 @@
+ * workaround buggy kernel includes
+ * asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
+ */
+-typedef quint64 __u64;
++//typedef quint64 __u64;
+
+ #include <cmath>
+ #include <errno.h>
diff --git a/kaffeine.spec b/kaffeine.spec
index 72c16e4..762af32 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,233 +1,88 @@
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define kdelibs3 kdelibs3
-BuildRequires: libxcb-devel
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-## define to build freeworld bits (for that other repo)
-#define freeworld 1
-
-# FIXME
-#if 0%{?fedora} > 10
-#define _without_dvb --without-dvb
-#endif
-
-Version: 0.8.7
-Release: 7%{?dist}
-
-%if 0%{?freeworld:1} == 0
-# Fedora Review: http://bugzilla.redhat.com/213432
+%define pre pre1
+
Name: kaffeine
-%else
-Name: kaffeine-freeworld
-%endif
+Version: 1.0
+Release: 0.1.%{pre}%{?dist}
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kaffeine-0.8.7-optflags.patch
-Patch1: kaffeine-0.8.7-codecs.patch
-Patch2: kaffeine-0.8.7-epg.patch
+Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
-BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
-BuildRequires: %{kdelibs3}-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
-BuildRequires: xine-lib-devel
-
-%if 0%{?freeworld:1}
-Requires: kaffeine = %{version}
-%define _with_lame --with-lame
-%{?_with_lame:BuildRequires: lame-devel}
-%if 0%{?fedora} > 4
-# can view dvd's if libdvdcss is available
-#Requires(hint): libdvdcss
-# extra/freeworld codec support
-Requires(hint): xine-lib-extras-freeworld
-%endif
-
-%description
-Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
+BuildRequires: kdelibs4-devel
+BuildRequires: phonon-devel
-%else
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides: %{name}-libs = %{version}-%{release}
-%endif
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
%description
-Kaffeine is a xine-based media player for KDE. It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{kdelibs3}-devel
-%description devel
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%endif
-
+Kaffeine is a xine-based media player for KDE.
%prep
-%setup -q -n kaffeine-%{version}
+%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-%patch0 -p1 -b .optflags
-# FIXME
-#patch1 -p1 -b .codecs
-#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
-%patch2 -p1 -b .epg
-
-# FIXME, must be a better workaround here
-sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
+%patch1 -p1 -b .kernel_headers
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --disable-final \
- --with-extra-includes=%{_includedir}/cdda \
- --with-gstreamer \
- %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
- %{?_with_lame} %{!?_with_lame:--without-lame}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-%if 0%{?freeworld:1}
-make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
-%else
-make %{?_smp_mflags}
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
-%if 0%{?freeworld:1}
-make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
-%else
-make install DESTDIR=%{buildroot}
-
-## File lists
-# locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
+mv %{buildroot}%{_kde4_iconsdir}/oxygen \
+ %{buildroot}%{_kde4_iconsdir}/hicolor
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
-%endif
+%find_lang %{name}
%clean
rm -rf %{buildroot}
-%if 0%{?freeworld:1}
-%files
-%defattr(-,root,root,-)
-%{_libdir}/kde3/libkaffeinemp3lame.*
-%{_datadir}/services/kaffeinemp3lame.desktop
-%else
-
%post
-%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-%{!?libs:/sbin/ldconfig}
if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?libs}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%endif
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kaffeine
-%{_libdir}/libkaffeinepart.so
-%{_libdir}/kde3/lib*.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/gstreamerpart/
-%{_datadir}/apps/kaffeine/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/profiles/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-
-%if 0%{?libs}
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kaffeine/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
-
-%endif
+%doc AUTHORS COPYING TODO
+%{_kde4_bindir}/kaffeine
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
%changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
- re-enable dvb (#495379)
diff --git a/sources b/sources
index 512216a..b84a9fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2
+ecae6fd84103a268daf17b61784d837f kaffeine-1.0-pre1.tar.gz
commit 9919ecd1ee7d13a06a44b173eb61484ef3a919a3
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Apr 12 18:25:20 2009 +0000
- re-enable dvb (#495379)
diff --git a/kaffeine.spec b/kaffeine.spec
index 115cc0a..72c16e4 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,12 +11,12 @@ BuildRequires: libutempter-devel
#define freeworld 1
# FIXME
-%if 0%{?fedora} > 10
-%define _without_dvb --without-dvb
-%endif
+#if 0%{?fedora} > 10
+#define _without_dvb --without-dvb
+#endif
Version: 0.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -228,6 +228,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Apr 12 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-7
+- re-enable dvb (#495379)
+
* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
- Improve icon cache and desktop database update scriptlets.
- Update URL.
commit 8187d933c3706ceacbc3ffbaeefcc1d8f9c3dd99
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Tue Mar 17 22:23:40 2009 +0000
- Improve icon cache and desktop database update scriptlets.
- Update URL.
diff --git a/kaffeine.spec b/kaffeine.spec
index 53029db..115cc0a 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -16,7 +16,7 @@ BuildRequires: libutempter-devel
%endif
Version: 0.8.7
-Release: 5%{?dist}
+Release: 6%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -28,7 +28,7 @@ Name: kaffeine-freeworld
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
-URL: http://kaffeine.sourceforge.net/
+URL: http://kaffeine.kde.org/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -176,15 +176,19 @@ rm -rf %{buildroot}
%post
%{!?libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
%{!?libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+if [ $1 -eq 0 ] ; then
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database %{_datadir}/applications &>/dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if 0%{?libs}
%post libs -p /sbin/ldconfig
@@ -224,6 +228,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Mar 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-6
+- Improve icon cache and desktop database update scriptlets.
+- Update URL.
+
* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
- s/nonfree/freeworld/
- --without-dvb (f11+)
commit 0c60a5c9f30f1b02c9d8f2787b9df3450cf7152a
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 6 20:25:02 2009 +0000
Release++
diff --git a/kaffeine.spec b/kaffeine.spec
index 2651a46..53029db 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -16,7 +16,7 @@ BuildRequires: libutempter-devel
%endif
Version: 0.8.7
-Release: 4%{?dist}
+Release: 5%{?dist}
%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
commit ece6c9f37f4b33c334629a03fc972f5259b1f407
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 6 20:22:24 2009 +0000
- s/nonfree/freeworld/
- --without-dvb (f11+)
diff --git a/kaffeine.spec b/kaffeine.spec
index 5161a27..2651a46 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,25 +1,28 @@
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define _with_gstreamer --with-gstreamer
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+%define kdelibs3 kdelibs3
+BuildRequires: libxcb-devel
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
%endif
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
+## define to build freeworld bits (for that other repo)
+#define freeworld 1
-## define to build nonfree bits (for that other repo)
-#define nonfree 1
+# FIXME
+%if 0%{?fedora} > 10
+%define _without_dvb --without-dvb
+%endif
Version: 0.8.7
Release: 4%{?dist}
-%if 0%{?nonfree:1} == 0
+%if 0%{?freeworld:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%else
-Name: kaffeine-extras-nonfree
+Name: kaffeine-freeworld
%endif
License: GPLv2+
@@ -35,31 +38,25 @@ Patch2: kaffeine-0.8.7-epg.patch
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
-# dvb
-BuildRequires: glibc-kernheaders
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-BuildRequires: kdelibs3-devel
-BuildRequires: libxcb-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
+BuildRequires: %{kdelibs3}-devel
BuildRequires: libvorbis-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
BuildRequires: xine-lib-devel
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
Requires: kaffeine = %{version}
%define _with_lame --with-lame
%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
-Requires(hint): libdvdcss
-# extra/nonfree codec support
-Requires(hint): xine-lib-extras-nonfree
+#Requires(hint): libdvdcss
+# extra/freeworld codec support
+Requires(hint): xine-lib-extras-freeworld
%endif
%description
-Nonfree support bits for kaffeine, including DVD playback, MP3
+Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.
%else
@@ -83,19 +80,17 @@ Konqueror plugin, OSD and much more.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs3-devel
+Requires: %{kdelibs3}-devel
%description devel
%{summary}.
-%if 0%{?libs}
%package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
-%endif
%endif
@@ -123,10 +118,11 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
--with-extra-includes=%{_includedir}/cdda \
- %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
+ --with-gstreamer \
+ %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
%{?_with_lame} %{!?_with_lame:--without-lame}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
@@ -136,7 +132,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=%{buildroot}
@@ -171,7 +167,7 @@ rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
rm -rf %{buildroot}
-%if 0%{?nonfree:1}
+%if 0%{?freeworld:1}
%files
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
@@ -204,7 +200,7 @@ update-desktop-database >& /dev/null ||:
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
-%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
+%{_datadir}/apps/gstreamerpart/
%{_datadir}/apps/kaffeine/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/profiles/
@@ -228,6 +224,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.8.7-5
+- s/nonfree/freeworld/
+- --without-dvb (f11+)
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit de498330fae52590f128f36ba477ab9497a579e0
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 25 10:07:50 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/kaffeine.spec b/kaffeine.spec
index cc3f5b8..5161a27 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 3%{?dist}
+Release: 4%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
- EPG and OSD patch (#452421).
commit 25fe34985f2acb259246dcbffdf9df5f9ca2ae13
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Feb 6 17:16:52 2009 +0000
- EPG and OSD patch (#452421).
diff --git a/kaffeine-0.8.7-epg.patch b/kaffeine-0.8.7-epg.patch
new file mode 100644
index 0000000..574f111
--- /dev/null
+++ b/kaffeine-0.8.7-epg.patch
@@ -0,0 +1,17 @@
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp.orig 2008-01-20 19:50:45.000000000 +0200
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp 2008-08-30 10:15:10.000000000 +0300
+@@ -171,10 +171,10 @@ EventSid *EventSource::getEventSid( int
+ }
+ }
+ if ( !et ) {
+- if ( nid==0) {
+- mutex.unlock();
+- return 0;
+- }
++ // if ( nid==0) {
++ // mutex.unlock();
++ // return 0;
++ // }
+ et = new EventTsid( nid, tsid );
+ tsidList.append( et );
+ }
diff --git a/kaffeine.spec b/kaffeine.spec
index e7faf02..cc3f5b8 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: kaffeine-0.8.7-optflags.patch
Patch1: kaffeine-0.8.7-codecs.patch
+Patch2: kaffeine-0.8.7-epg.patch
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
@@ -107,6 +108,7 @@ Requires: %{name} = %{version}-%{release}
# FIXME
#patch1 -p1 -b .codecs
#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+%patch2 -p1 -b .epg
# FIXME, must be a better workaround here
sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
@@ -226,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
- Unfuzz optflags patch.
commit 5c458d9d0abe37c0464017276ceaeca682124912
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Thu Aug 28 19:28:48 2008 +0000
- Unfuzz optflags patch.
diff --git a/kaffeine-0.8.6-optflags.patch b/kaffeine-0.8.6-optflags.patch
deleted file mode 100644
index ee2bf6f..0000000
--- a/kaffeine-0.8.6-optflags.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ 2008-01-20 19:50:43.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -8,4 +8,4 @@ libdvbapi_la_SOURCES = diseqc.c \
- dvbfe.c \
- dvbnet.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-03-20 21:39:50.000000000 +0200
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
- en50221_session.c \
- en50221_transport.c
-
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-03-20 21:40:10.000000000 +0200
-@@ -98,7 +98,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ 2008-01-20 19:50:41.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
- tva_container_section.c \
- types.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-03-20 21:40:28.000000000 +0200
-@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -14,4 +14,4 @@ libucsi_la_LDFLAGS = ./mpeg \
- libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \
- ./dvb/libdvbdvb.la
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-03-20 21:40:49.000000000 +0200
-@@ -102,7 +102,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-03-20 21:39:04.000000000 +0200
-@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
- pmt_section.c \
- tsdt_section.c
-
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
---- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
-+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-03-20 21:41:09.000000000 +0200
-@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
-+CFLAGS = @CFLAGS@
-+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
- CFLAGS_DPMS = @CFLAGS_DPMS@
- CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
- CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine-0.8.7-optflags.patch b/kaffeine-0.8.7-optflags.patch
new file mode 100644
index 0000000..0ac33c6
--- /dev/null
+++ b/kaffeine-0.8.7-optflags.patch
@@ -0,0 +1,110 @@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am.orig 2008-07-01 16:35:02.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -9,4 +9,4 @@ libdvbapi_la_SOURCES = dvbaudio.c \
+ dvbnet.c \
+ dvbvideo.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am.orig 2008-07-01 16:34:53.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -21,4 +21,4 @@ libdvben50221_la_SOURCES = asn_1.c \
+ en50221_stdcam_llci.c \
+ en50221_stdcam_hlci.c
+
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -100,7 +100,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
+ tva_container_section.c \
+ types.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am.orig 2008-07-01 16:35:01.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -16,4 +16,4 @@ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.
+ ./dvb/libdvbdvb.la \
+ ./atsc/libdvbatsc.la
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -103,7 +103,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am.orig 2008-07-01 16:34:55.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-08-28 22:09:10.000000000 +0300
+@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
+ pmt_section.c \
+ tsdt_section.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
+--- kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in.orig 2008-07-06 18:20:22.000000000 +0300
++++ kaffeine-0.8.7/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-08-28 22:09:10.000000000 +0300
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine.spec b/kaffeine.spec
index 4e686c5..e7faf02 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -29,7 +29,7 @@ URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kaffeine-0.8.6-optflags.patch
+Patch0: kaffeine-0.8.7-optflags.patch
Patch1: kaffeine-0.8.7-codecs.patch
BuildRequires: cdparanoia-devel cdparanoia
@@ -226,6 +226,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
+- Unfuzz optflags patch.
+
* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
- kaffeine-0.8.7
commit 9db1f4f087c7bcbfb9ee967fcc9f54c44f0564f1
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Jul 6 19:28:34 2008 +0000
- kaffeine-0.8.7
diff --git a/.cvsignore b/.cvsignore
index 4c62d87..acd27b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kaffeine-0.8.6.tar.bz2
+kaffeine-0.8.7.tar.bz2
diff --git a/kaffeine-0.8.7-codecs.patch b/kaffeine-0.8.7-codecs.patch
new file mode 100644
index 0000000..0d6fb97
--- /dev/null
+++ b/kaffeine-0.8.7-codecs.patch
@@ -0,0 +1,31 @@
+diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp
+--- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs 2007-06-03 08:55:14.000000000 -0500
++++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp 2008-07-06 13:50:12.000000000 -0500
+@@ -61,6 +61,8 @@ void InstWizard::internalWizard()
+ setHelpEnabled(page1, false);
+ setFinishEnabled(page1, false);
+
++ QDir d;
++
+ QString infoString;
+ QTextStream info(&infoString, IO_WriteOnly);
+
+@@ -106,14 +108,16 @@ void InstWizard::internalWizard()
+ << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
+ */
+ //WIN32-CODECS
++ /*
+ info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
+- QDir d("/usr/lib/win32");
++ d = DDir("@libdir@/codecs");
+ QStringList entries = d.entryList("wmv*");
+ if (entries.count())
+ info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
+ else
+- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
++ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
+ << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
++ */
+
+ //LIBDVDCSS
+ info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
diff --git a/kaffeine.spec b/kaffeine.spec
index 77f470a..4e686c5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,10 +12,10 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.6
-Release: 4%{?dist}
+Version: 0.8.7
+Release: 1%{?dist}
-%if "%{?nonfree:1}" != "1"
+%if 0%{?nonfree:1} == 0
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%else
@@ -27,24 +27,27 @@ Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
-Patch0: %{name}-0.8.6-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: kaffeine-0.8.6-optflags.patch
+Patch1: kaffeine-0.8.7-codecs.patch
+
+BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
+# dvb
+BuildRequires: glibc-kernheaders
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: kdelibs3-devel
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: libvorbis-devel
-BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 6
BuildRequires: libxcb-devel
+%else
+BuildRequires: kdelibs-devel
%endif
-# dvb
-BuildRequires: glibc-kernheaders
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
%define _with_lame --with-lame
%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
@@ -87,8 +90,6 @@ Requires: kdelibs3-devel
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-# helps multilib upgrades
-Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
@@ -101,26 +102,29 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kaffeine-%{version}
+
%patch0 -p1 -b .optflags
-%{?nonfree:%patch1 -p1 -b .codecs}
+# FIXME
+#patch1 -p1 -b .codecs
+#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+
+# FIXME, must be a better workaround here
+sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-# easier than patching, and using
-# --with-extra-includes=%{_includedir}/cdda below -- Rex
-CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
-
%configure \
--disable-rpath \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
+ --with-extra-includes=%{_includedir}/cdda \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
@@ -128,20 +132,20 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%if "%{?nonfree:1}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
+%if 0%{?nonfree:1}
+make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
%else
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
## File lists
# locale's
%find_lang %{name}
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -156,16 +160,16 @@ done
fi
# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
+rm -f %{buildroot}%{_libdir}/lib*.la
+rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
%files
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
@@ -217,10 +221,14 @@ update-desktop-database >& /dev/null ||:
%{_includedir}/kaffeine/
%{_libdir}/lib*.so
%exclude %{_libdir}/libkaffeinepart.so
+
%endif
%changelog
+* Sun Jul 06 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
diff --git a/sources b/sources
index a38852f..512216a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-102cced6a686f5ffffee94652ca2a093 kaffeine-0.8.6.tar.bz2
+3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2
commit 43ee022d88d8ada4ed85ac2f4fa8862559783f40
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Thu Mar 20 19:53:46 2008 +0000
- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
diff --git a/kaffeine-0.8.6-optflags.patch b/kaffeine-0.8.6-optflags.patch
new file mode 100644
index 0000000..ee2bf6f
--- /dev/null
+++ b/kaffeine-0.8.6-optflags.patch
@@ -0,0 +1,110 @@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ 2008-01-20 19:50:43.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -8,4 +8,4 @@ libdvbapi_la_SOURCES = diseqc.c \
+ dvbfe.c \
+ dvbnet.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in 2008-03-20 21:39:50.000000000 +0200
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
+ en50221_session.c \
+ en50221_transport.c
+
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in 2008-03-20 21:40:10.000000000 +0200
+@@ -98,7 +98,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ 2008-01-20 19:50:41.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
+ tva_container_section.c \
+ types.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in 2008-03-20 21:40:28.000000000 +0200
+@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -14,4 +14,4 @@ libucsi_la_LDFLAGS = ./mpeg \
+ libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \
+ ./dvb/libdvbdvb.la
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in 2008-03-20 21:40:49.000000000 +0200
+@@ -102,7 +102,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ 2008-01-20 19:50:42.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am 2008-03-20 21:39:04.000000000 +0200
+@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
+ pmt_section.c \
+ tsdt_section.c
+
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
+--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ 2008-01-20 19:52:20.000000000 +0200
++++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in 2008-03-20 21:41:09.000000000 +0200
+@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
++CFLAGS = @CFLAGS@
++AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+ CFLAGS_DPMS = @CFLAGS_DPMS@
+ CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
+ CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff --git a/kaffeine.spec b/kaffeine.spec
index 0badbb1..77f470a 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 3%{?dist}
+Release: 4%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -27,6 +27,7 @@ Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
+Patch0: %{name}-0.8.6-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -100,7 +101,7 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kaffeine-%{version}
-
+%patch0 -p1 -b .optflags
%{?nonfree:%patch1 -p1 -b .codecs}
@@ -220,6 +221,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
- fix deps wrt kaffeine-libs (#436442)
- f7: xcb support (#373411)
commit 610ec24c59fe2f3bd41847caad7da477a95216a0
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Mar 7 15:02:13 2008 +0000
- fix deps wrt kaffeine-libs (#436442)
- f7: xcb support (#373411)
diff --git a/kaffeine.spec b/kaffeine.spec
index e9446c2..0badbb1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 2%{?dist}
+Release: 3%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -34,7 +34,7 @@ BuildRequires: kdelibs3-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 7
+%if 0%{?fedora} > 6
BuildRequires: libxcb-devel
%endif
# dvb
@@ -51,21 +51,21 @@ Patch1: kaffeine-0.8.2-codecs.patch
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
+%endif
+
+%description
+Nonfree support bits for kaffeine, including DVD playback, MP3
+decoding, as well as extended audio/video codec support.
+
%else
+
%if 0%{?libs}
Requires: %{name}-libs = %{version}-%{release}
%else
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release}
%endif
-%endif
-
-
-%description
-Nonfree support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
-%else
%description
Kaffeine is a xine-based media player for KDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
@@ -86,7 +86,6 @@ Requires: kdelibs3-devel
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: kdelibs3 >= %{version}
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
@@ -221,6 +220,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Mar 07 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-3
+- fix deps wrt kaffeine-libs (#436442)
+- f7: xcb support (#373411)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
- Autorebuild for GCC 4.3
commit 882298a4f0de9d83c83daa6c67b98450fadb48d8
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 19 21:14:28 2008 +0000
- Autorebuild for GCC 4.3
diff --git a/kaffeine.spec b/kaffeine.spec
index 4903d0e..e9446c2 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -221,6 +221,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 0.8.6-2
+- Autorebuild for GCC 4.3
+
* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
- kaffeine-0.8.6
commit 87dda81904a69f116af3a56eb3e5234f65c1ffd8
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jan 21 07:05:11 2008 +0000
fix %files
diff --git a/kaffeine.spec b/kaffeine.spec
index dd9188f..4903d0e 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -210,14 +210,13 @@ update-desktop-database >& /dev/null ||:
%files libs
%defattr(-,root,root,-)
%endif
-%{_libdir}/libkaffeineaudioencoder.so.*
-%{_libdir}/libkaffeinedvbplugin.so.*
+%{_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/kaffeine/
-%{_libdir}/libkaffeineaudioencoder.so
-%{_libdir}/libkaffeinedvbplugin.so
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
%endif
commit c0a0092d5f1741a704e68a60cb8cd2c3f10a4a80
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Jan 20 22:46:07 2008 +0000
- kaffeine-0.8.6
diff --git a/.cvsignore b/.cvsignore
index a20337e..4c62d87 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-kaffeine-0.8.2.tar.bz2
-kaffeine-0.8.3.tar.bz2
-kaffeine-0.8.4.tar.bz2
-kaffeine-0.8.5.tar.bz2
+kaffeine-0.8.6.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index daaacac..dd9188f 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,8 +12,8 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.5
-Release: 7%{?dist}
+Version: 0.8.6
+Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -26,7 +26,7 @@ License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -104,12 +104,6 @@ Requires: %{name} = %{version}-%{release}
%{?nonfree:%patch1 -p1 -b .codecs}
-# fix perms on docs
-chmod -x AUTHORS ChangeLog INSTALL TODO ||:
-
-# avoid autofoo rerun in 0.8.5
-touch -r acinclude.m4 admin/acinclude.m4.in
-
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -228,6 +222,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Jan 20 2008 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.6-1
+- kaffeine-0.8.6
+
* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
- Require kdelibs3-devel instead of kdelibs-devel in -devel.
diff --git a/sources b/sources
index 2d99076..a38852f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2
+102cced6a686f5ffffee94652ca2a093 kaffeine-0.8.6.tar.bz2
commit 9e3794ac088c5a978652b2f4ba06e7aea7d03c96
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Sun Jan 13 19:13:01 2008 +0000
- Require kdelibs3-devel instead of kdelibs-devel in -devel.
diff --git a/kaffeine.spec b/kaffeine.spec
index baad037..daaacac 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 6%{?dist}
+Release: 7%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -78,7 +78,7 @@ Konqueror plugin, OSD and much more.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs-devel
+Requires: kdelibs3-devel
%description devel
%{summary}.
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Jan 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-7
+- Require kdelibs3-devel instead of kdelibs-devel in -devel.
+
* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
- BR: kdelibs3-devel
commit 84294ad53190f7ef2672004cf6309397070e4c47
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Dec 9 03:18:53 2007 +0000
- BR: kdelibs3-devel
diff --git a/kaffeine.spec b/kaffeine.spec
index 0e0d35e..baad037 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -13,7 +13,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 5%{?dist}
+Release: 6%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -30,7 +30,7 @@ Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
-BuildRequires: kdelibs-devel
+BuildRequires: kdelibs3-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
@@ -228,6 +228,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-6
+- BR: kdelibs3-devel
+
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
- multiarch conflicts in kaffeine (#341681)
commit c4fc2fa967303a50ffd1b20cc73eec476b81eca2
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Tue Oct 30 13:41:15 2007 +0000
- multiarch conflicts in kaffeine (#341681)
diff --git a/kaffeine.spec b/kaffeine.spec
index 03e0da5..0e0d35e 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -4,11 +4,16 @@
BuildRequires: libXext-devel libXinerama-devel libXtst-devel
%endif
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
## define to build nonfree bits (for that other repo)
#define nonfree 1
Version: 0.8.5
-Release: 4%{?dist}
+Release: 5%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -46,8 +51,16 @@ Patch1: kaffeine-0.8.2-codecs.patch
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
+%else
+%if 0%{?libs}
+Requires: %{name}-libs = %{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{version}-%{release}
+Provides: %{name}-libs = %{version}-%{release}
+%endif
%endif
+
%description
Nonfree support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.
@@ -64,12 +77,27 @@ Konqueror plugin, OSD and much more.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: kdelibs-devel
%description devel
%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group: System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
%endif
+%endif
+
+
%prep
%setup -q -n kaffeine-%{version}
@@ -79,6 +107,9 @@ Requires: kdelibs-devel
# fix perms on docs
chmod -x AUTHORS ChangeLog INSTALL TODO ||:
+# avoid autofoo rerun in 0.8.5
+touch -r acinclude.m4 admin/acinclude.m4.in
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -87,8 +118,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
-touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
-
%configure \
--disable-rpath \
--enable-new-ldflags \
@@ -150,23 +179,28 @@ rm -rf $RPM_BUILD_ROOT
%else
%post
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%postun
-/sbin/ldconfig ||:
+%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
-%{_libdir}/libkaffeineaudioencoder.so.*
-%{_libdir}/libkaffeinedvbplugin.so.*
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
@@ -178,6 +212,13 @@ update-desktop-database >& /dev/null ||:
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/kaffeine/
@@ -187,7 +228,10 @@ update-desktop-database >& /dev/null ||:
%changelog
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-5
+- multiarch conflicts in kaffeine (#341681)
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.5-4
- Avoid autotools re-run after configure (unclean upstream tarball?)
* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
commit e2b680e6ec666831cd6ccb47bc211e49fab2183b
Author: Ville Skyttä <scop(a)fedoraproject.org>
Date: Wed Sep 19 20:16:29 2007 +0000
- Avoid autotools re-run after configure (unclean upstream tarball?)
diff --git a/kaffeine.spec b/kaffeine.spec
index c54fcc1..03e0da5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -87,6 +87,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
%configure \
--disable-rpath \
--enable-new-ldflags \
@@ -185,6 +187,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
- respin (BuildID)
commit 4b22c0ea87a7d40ebde15962e39678d756ad49cb
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sat Aug 25 14:25:38 2007 +0000
- respin (BuildID)
diff --git a/kaffeine.spec b/kaffeine.spec
index a7727e5..c54fcc1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -185,6 +185,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
- License: GPLv2+
- BR: libxcb-devel (really)
commit ae2c9352d92ab6f618257f7906dd55172c5d6be5
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Aug 12 03:00:26 2007 +0000
- License: GPLv2+
- BR: libxcb-devel (really)
diff --git a/kaffeine.spec b/kaffeine.spec
index 5ced824..a7727e5 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -8,7 +8,7 @@ BuildRequires: libXext-devel libXinerama-devel libXtst-devel
#define nonfree 1
Version: 0.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
@@ -17,7 +17,7 @@ Name: kaffeine
Name: kaffeine-extras-nonfree
%endif
-License: GPL
+License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
@@ -30,7 +30,7 @@ BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
%if 0%{?fedora} > 7
-#BuildRequires: libxcb-devel
+BuildRequires: libxcb-devel
%endif
# dvb
BuildRequires: glibc-kernheaders
@@ -185,6 +185,10 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
- kaffeine-0.8.5
- BR: libxcb-devel
commit 720a802735795c8ce7db695aaf514220a1514437
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Mon Jul 30 13:08:31 2007 +0000
- kaffeine-0.8.5
- BR: libxcb-devel
diff --git a/.cvsignore b/.cvsignore
index 9f081e7..a20337e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
kaffeine-0.8.2.tar.bz2
kaffeine-0.8.3.tar.bz2
kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.5.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index e39e9b1..5ced824 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define _with_gstreamer --with-gstreamer
-BuildRequires: libXinerama-devel libXtst-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
@@ -29,8 +29,9 @@ BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-# FIXME/TODO: http://xcb.freedesktop.org/
+%if 0%{?fedora} > 7
#BuildRequires: libxcb-devel
+%endif
# dvb
BuildRequires: glibc-kernheaders
%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
@@ -184,8 +185,12 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
-- kaffeine-0.8.4
+- kaffeine-0.8.4 (#243823)
* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
- disable gst08 support (for now), it's been orphaned
diff --git a/sources b/sources
index 352ef9c..2d99076 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f62ebb7a6f88ff49f452856a1660d95 kaffeine-0.8.4.tar.bz2
+71814e7612f1f7e1b6cd954d352e4201 kaffeine-0.8.5.tar.bz2
commit e6ae6d268ffed84481fd4d1593963d44c158162b
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Fri Jun 8 14:40:06 2007 +0000
- kaffeine-0.8.4
diff --git a/.cvsignore b/.cvsignore
index 7a0985a..9f081e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
kaffeine-0.8.2.tar.bz2
kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index e1e6307..e39e9b1 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,32 +1,20 @@
-%if 0%{?fedora} > 2
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define _with_gstreamer --with-gstreamer
-%endif
-
-%if 0%{?fedora} > 4
-%define gst 08
-# gstreamer08 has been orphaned
-%undefine _with_gstreamer
BuildRequires: libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
-Version: 0.8.3
-Release: 4%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
%if "%{?nonfree:1}" != "1"
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
-
%else
Name: kaffeine-extras-nonfree
-%define _with_lame --with-lame
-Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
-# split occurred here
-Conflicts: kaffeine < 0.8.2-2
%endif
License: GPL
@@ -41,22 +29,17 @@ BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
-%{!?_without_dvb:BuildRequires: glibc-kernheaders }
-%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
-# not included in Extras, disabled
-%{?_with_lame:BuildRequires: lame-devel}
-
-## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
-## everybondy should be using kde >= 3.5.4 by now... (:
-#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
-#if "%{?kdelibs_ver}" >= "3.5.4"
-%define x_mplayer2_hack 1
-Requires: kdelibs >= 6:3.5.4
-#or
-#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
-#endif
+# FIXME/TODO: http://xcb.freedesktop.org/
+#BuildRequires: libxcb-devel
+# dvb
+BuildRequires: glibc-kernheaders
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
%if "%{?nonfree:1}" == "1"
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+%define _with_lame --with-lame
+%{?_with_lame:BuildRequires: lame-devel}
%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
@@ -99,16 +82,15 @@ chmod -x AUTHORS ChangeLog INSTALL TODO ||:
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+# easier than patching, and using
+# --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
%configure \
--disable-rpath \
- --disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
- %{?_without_dvb} \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
@@ -149,7 +131,7 @@ fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
%endif
@@ -202,6 +184,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4
+
* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
- disable gst08 support (for now), it's been orphaned
diff --git a/sources b/sources
index b95fe41..352ef9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24 kaffeine-0.8.3.tar.bz2
+6f62ebb7a6f88ff49f452856a1660d95 kaffeine-0.8.4.tar.bz2
commit 159526e2d6f5d2a6ad961c36c622042ee5066a6c
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jan 18 14:22:53 2007 +0000
- disable gst08 support (for now), it's been orphaned
diff --git a/kaffeine.spec b/kaffeine.spec
index c207b5d..e1e6307 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,36 +1,39 @@
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 2
%define _with_gstreamer --with-gstreamer
%endif
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4
%define gst 08
-BuildRequires: libXtst-devel libXinerama-devel
+# gstreamer08 has been orphaned
+%undefine _with_gstreamer
+BuildRequires: libXinerama-devel libXtst-devel
%endif
## define to build nonfree bits (for that other repo)
#define nonfree 1
Version: 0.8.3
-Release: 2%{?dist}
+Release: 4%{?dist}
-%if "%{?nonfree:1}" == "1"
+%if "%{?nonfree:1}" != "1"
+# Fedora Review: http://bugzilla.redhat.com/213432
+Name: kaffeine
+
+%else
Name: kaffeine-extras-nonfree
%define _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2
-%else
-# Fedora Review: http://bugzilla.redhat.com/213432
-Name: kaffeine
%endif
License: GPL
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -54,7 +57,7 @@ Requires: kdelibs >= 6:3.5.4
#endif
%if "%{?nonfree:1}" == "1"
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
# extra/nonfree codec support
@@ -177,7 +180,8 @@ update-desktop-database >& /dev/null ||:
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
@@ -191,15 +195,21 @@ update-desktop-database >& /dev/null ||:
%files devel
%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
%endif
%changelog
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
- 0.8.3
commit 883458d04df17a413f0cb254989fb2014e9a1185
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Wed Nov 29 18:14:55 2006 +0000
- include libkaffeinepart.so in main pkg (not -devel)
diff --git a/kaffeine.spec b/kaffeine.spec
index 3d14863..c207b5d 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -12,7 +12,7 @@ BuildRequires: libXtst-devel libXinerama-devel
#define nonfree 1
Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
%if "%{?nonfree:1}" == "1"
Name: kaffeine-extras-nonfree
@@ -34,7 +34,6 @@ Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
-BuildRequires: desktop-file-utils
BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
@@ -125,11 +124,6 @@ make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
- --vendor="" \
- --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
## File lists
# locale's
%find_lang %{name}
@@ -184,6 +178,7 @@ update-desktop-database >& /dev/null ||:
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -198,10 +193,14 @@ update-desktop-database >& /dev/null ||:
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
%endif
%changelog
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
- 0.8.3
commit b707eb2d0f9735aea8a8a7d463840cd6444d2779
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sun Nov 26 23:57:34 2006 +0000
- 0.8.3
diff --git a/.cvsignore b/.cvsignore
index 22e4aa6..7a0985a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
index 4fcf639..3d14863 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -11,29 +11,26 @@ BuildRequires: libXtst-devel libXinerama-devel
## define to build nonfree bits (for that other repo)
#define nonfree 1
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
+%if "%{?nonfree:1}" == "1"
Name: kaffeine-extras-nonfree
-
%define _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2
-
%else
# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
%endif
-Version: 0.8.2
-Release: 5%{?dist}
-
License: GPL
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -108,7 +105,7 @@ CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
--disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
+ --disable-dependency-tracking --disable-final \
%{?_without_dvb} \
%{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
%{?_with_lame} %{!?_with_lame:--without-lame}
@@ -205,6 +202,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
- %%doc README
diff --git a/sources b/sources
index 8ef1f11..b95fe41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41 kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24 kaffeine-0.8.3.tar.bz2
commit 4930e9539f4e81025bde6da1bceb346746231b65
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Tue Nov 14 04:11:06 2006 +0000
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm
diff --git a/.cvsignore b/.cvsignore
index e69de29..22e4aa6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+kaffeine-0.8.2.tar.bz2
diff --git a/kaffeine.spec b/kaffeine.spec
new file mode 100644
index 0000000..4fcf639
--- /dev/null
+++ b/kaffeine.spec
@@ -0,0 +1,316 @@
+
+%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%define _with_gstreamer --with-gstreamer
+%endif
+
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%define gst 08
+BuildRequires: libXtst-devel libXinerama-devel
+%endif
+
+## define to build nonfree bits (for that other repo)
+#define nonfree 1
+
+%if "%{?nonfree:1}" == "1"
+
+Name: kaffeine-extras-nonfree
+
+%define _with_lame --with-lame
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+# split occurred here
+Conflicts: kaffeine < 0.8.2-2
+
+%else
+# Fedora Review: http://bugzilla.redhat.com/213432
+Name: kaffeine
+%endif
+
+Version: 0.8.2
+Release: 5%{?dist}
+
+License: GPL
+Summary: Xine-based media player
+Group: Applications/Multimedia
+URL: http://kaffeine.sourceforge.net/
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs-devel
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
+%{!?_without_dvb:BuildRequires: glibc-kernheaders }
+%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
+# not included in Extras, disabled
+%{?_with_lame:BuildRequires: lame-devel}
+
+## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
+## everybondy should be using kde >= 3.5.4 by now... (:
+#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
+#if "%{?kdelibs_ver}" >= "3.5.4"
+%define x_mplayer2_hack 1
+Requires: kdelibs >= 6:3.5.4
+#or
+#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
+#endif
+
+%if "%{?nonfree:1}" == "1"
+%if "%{?fedora}" > "4"
+# can view dvd's if libdvdcss is available
+Requires(hint): libdvdcss
+# extra/nonfree codec support
+Requires(hint): xine-lib-extras-nonfree
+%endif
+
+%description
+Nonfree support bits for kaffeine, including DVD playback, MP3
+decoding, as well as extended audio/video codec support.
+
+%else
+%description
+Kaffeine is a xine-based media player for KDE. It plays back CDs,
+and VCDs, and can decode all (local or streamed) multimedia formats
+supported by xine-lib.
+Additionally, Kaffeine is fully integrated in KDE, it supports drag
+and drop and provides an editable playlist, a bookmark system, a
+Konqueror plugin, OSD and much more.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs-devel
+%description devel
+%{summary}.
+%endif
+
+
+%prep
+%setup -q -n kaffeine-%{version}
+
+%{?nonfree:%patch1 -p1 -b .codecs}
+
+# fix perms on docs
+chmod -x AUTHORS ChangeLog INSTALL TODO ||:
+
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
+# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
+
+%configure \
+ --disable-rpath \
+ --disable-gcc-hidden-visibility \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
+ %{?_without_dvb} \
+ %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
+ %{?_with_lame} %{!?_with_lame:--without-lame}
+
+%if "%{?nonfree:1}" == "1"
+make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
+%else
+make %{?_smp_mflags}
+%endif
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%if "%{?nonfree:1}" == "1"
+make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
+%else
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install \
+ --vendor="" \
+ --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
+ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+
+## File lists
+# locale's
+%find_lang %{name}
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+ if [ -d $lang_dir ]; then
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+ # replace absolute symlinks with relative ones
+ pushd $lang_dir
+ for i in *; do
+ [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+ done
+ popd
+ fi
+done
+fi
+
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%if "%{?nonfree:1}" == "1"
+%files
+%defattr(-,root,root,-)
+%{_libdir}/kde3/libkaffeinemp3lame.*
+%{_datadir}/services/kaffeinemp3lame.desktop
+%else
+
+%post
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun
+/sbin/ldconfig ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_bindir}/kaffeine
+%{_libdir}/lib*.so.*
+%{_libdir}/kde3/lib*.*
+%{_datadir}/appl*/*/*.desktop
+%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
+%{_datadir}/apps/kaffeine/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/profiles/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/mimelnk/*/*.desktop
+%{_datadir}/service*/*.desktop
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+%endif
+
+
+%changelog
+* Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
+- %%doc README
+
+* Fri Nov 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-5
+- fix chmod so it actually works.
+
+* Thu Nov 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-4
+- chmod -x AUTHORS ChangeLog TODO
+- use rel symlinks under %%_docdir
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-3
+- update %%description to not mention any specific mm containers
+ (like AVI, WMV).
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-2
+- fixup for Extras
+- support building kaffeine-extras-nonfree for that other repo.
+
+* Tue Sep 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Thu Aug 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- for kdelibs >= 3.5.4, omit
+ /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)
+
+* Thu May 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
+- BR: libXtst-devel libXinerama-devel (fc5+)
+
+* Tue Apr 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-3
+- (re)enable gstreamer support (fc3+)
+
+* Mon Apr 24 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.8.1-2
+- avoid re-auto'ing thing, breaks locale/po-files
+
+* Mon Apr 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-1
+- 0.8.1
+- cdda patch (upsgream bug #1463542)
+
+* Sat Mar 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.1-4
+- drop --vendor=livna
+- fdo icon spec fix
+- kaffeine-0.7.x-CVE-2006-0051.patch
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Nov 03 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.1-0.lvn.3
+- update-desktop-database (#645)
+- -devel pkg (#645)
+- -gstreamer subpkg, marked experimental (due to upstream #1254363)
+- omit -desktop patch (#645)
+- use desktop-file-install (#645)
+
+* Wed Sep 7 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:0.7.1-0.lvn.2
+- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64
+
+* Sun Sep 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.lvn.1
+- 0.7.1, gcc visibility hack no longer needed.
+
+* Mon Aug 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7-0.lvn.1
+- 0.7, now with DVB support (FC4+ only).
+- GStreamer support disabled by default due to upstream #1254363, rebuild
+ with "--with gstreamer" to enable.
+- Quick and dirty workaround for upstream #1253989.
+
+* Sun Mar 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6-0.lvn.1
+- 0.6.
+
+* Thu Dec 23 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.1
+- Update to 0.5.
+
+* Fri Nov 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc2
+- Update to 0.5rc2.
+
+* Sun Oct 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5-0.lvn.0.1.rc1
+- Update to 0.5rc1.
+- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
+- Purge libselinux workarounds, no longer needed.
+- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
+- Disable dependency tracking to speed up the build.
+- Provide -devel.
+
+* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1.b
+- Update to 0.4.3b.
+- Add workaround for https://bugzilla.redhat.com/123853
+
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.3-0.lvn.1
+- Update to 0.4.3.
+
+* Wed Mar 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.2-0.lvn.1
+- Update to 0.4.2.
+
+* Sat Jan 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.1-0.lvn.1
+- Update to 0.4.1, patches applied upstream.
+- Update description.
+
+* Mon Nov 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4-0.lvn.1
+- Update to 0.4.
+- Disable rpath.
+- Add Gnome icon.
+
+* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.2
+- Own directories under %%{_datadir}/icons.
+
+* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.2-0.fdr.1
+- First build.
diff --git a/sources b/sources
index e69de29..8ef1f11 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bfb57b62fa72267cc5b01ce9b037cb41 kaffeine-0.8.2.tar.bz2
1
0