rpms/rpmfusion-nonfree-release/F-9 RPM-GPG-KEY-rpmfusion-nonfree-fedora, NONE, 1.1 rpmfusion-nonfree-rawhide.repo, NONE, 1.1 rpmfusion-nonfree-release.spec, NONE, 1.1 rpmfusion-nonfree-updates-testing.repo, NONE, 1.1 rpmfusion-nonfree-updates.repo, NONE, 1.1 rpmfusion-nonfree.repo, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30808
Added Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora
rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec
rpmfusion-nonfree-updates-testing.repo
rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo
Log Message:
add rpmfusion-nonfree-release
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQGiBEh43oURBACjM0AB3YpQ9MLjCASiZg+/GPCiqI+iKpLmmynFmT+THbqqCxLu
oV7AcDKnaoZnrwNoVOj5ZG6ITFO2hQ+D4KPsbAXZLfhZv/5tiXqEV8XUbHlEIVpw
iuLBGX8JK/gPZGsoBQgOUKn2FFiSJCCa8uBRbX9ihccdEEuYvC2NWcsXIwCghH1A
7+ltEEI9MoLNFNio25Sqs6kD/ii/fG02JFPi8JDN8R2BWHcbCd59FDDIdXvbHXld
m9SngJaIYZ5cECx5iOPlqmZTrJyqmoG0RzQRGA7kj/7yTal4LIqsfaLRLMDI+EVa
cxA9zdnBEAQgwZmQ0QRsBDEBD2zKhMvHMMro00/8i01qfalfwLlCj7r58dOdB/wc
n6B4A/9cIpcV1zipJrOTgEA4t48ehDMPOH58v5DP8ZCtpdzJm9hKGa3HwDSZt+A4
HgdBKUODyBi5LqNDEySz9DdJn4+k9iro6rEgapWc/6IjuJrLlCPYAEOa17ka3kA9
0rRMeOUEdTqNSJpuOp8rGXCPCKZ5pGYdujx7QWXIPHAVLHxxiLRRUlBNIEZ1c2lv
biByZXBvc2l0b3J5IChGZWRvcmEgLSBub25mcmVlKSA8cnBtZnVzaW9uLWJ1aWxk
c3lzQGxpc3RzLnJwbWZ1c2lvbi5vcmc+iGAEExECACAFAkh43oUCGwMGCwkIBwMC
BBUCCAMEFgIDAQIeAQIXgAAKCRAgb4GCsZgbaLXxAJoDQKjEweJjPsqRK6+ezh9h
tFh79gCfSLKkR/B4184aB7/LLCJZz7ilJ+O5Ag0ESHjemRAIANlJHiAsjpIBD1FD
NYZCtXnfh4Z5A4jZAN9Gp5pcguIUhIl0IdzOKRRtLezEMP8F6yB7CuQBCDUgl3bE
gJK1/MXBJTSCz/BYYzhSx3tE852gzQwN/gAbn/1/fW+L/cXCYPVcRluNYSg2I6AB
qLm2egNzd8FF+ars/dTLBb0SUODhW4IftCBYVA45sdewN5/HLVP7rHivqFZcOJoA
Epuyx23ZP47Vv5wEX+SrgsFERu7j0zv9QFaFNue/MsgEJ8ef4K8bWzQgleVCpegh
gpniSE9sToV/e1dCVewdQsmup/NCLSsTmB880LUoUMYJBQIrChRur2Tiu6Po8E8K
0MLToVsAAwYIAL/DcDGeepvhSyLuDsu875L7otoWwxRk2Y09/aME9KUB/h7vaWcv
YWdCdBtlzq7g7Fv9QK+s4B63ozM3HoMwQvtObQvksdD3vPbOaHymjE6Fqt+0+Qbd
OvJsxKK4Y62nDD9dRW2/1kdeURgl9VH0eWKEcUWNg1NPHUkZ2Mdh7DEzGCEvDDx7
aevKQYDXrYdTOcaByijXqswRZbJepZ32CUxQPYrZ0dwA4gjXs8UXDuLSnXNM/rUN
o1dAbSsgsOYCaqr1Z1nPF8RbTg6yA4gFqI/IGrgwVVe6DCTz2Shn57IpnZf0diO3
qJ6k5pw/8FvVm20nSuvhM/SdEH9nGQ2SuOWISQQYEQIACQUCSHjemQIbDAAKCRAg
b4GCsZgbaEu6AJ0ceO1s64zSr5fqbPv3A7JHFtMBLQCdGBcBFmKyvFvC1LwX9pb9
keJNaDc=
=UO0s
-----END PGP PUBLIC KEY BLOCK-----
--- NEW FILE rpmfusion-nonfree-rawhide.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-nonfree-rawhide]
name=RPM Fusion for Fedora $releasever - Non-Free - Rawhide
failovermethod=priority
#baseurl=http://download.rpmfusion.org/nonfree/fedora/development/$basearch/os/
mirrorlist=http://download1.rpmfusion.org/nonfree/fedora/.mirrorlist-nonf...
failovermethod=roundrobin
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-rawhide-debuginfo]
name=RPM Fusion for Fedora $releasever - Non-Free - Rawhide Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basear...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-rawhide-debug&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-rawhide-source]
name=RPM Fusion for Fedora $releasever - Non-Free - Rawhide Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/source/...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-rawhide-source&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
--- NEW FILE rpmfusion-nonfree-release.spec ---
#define repo free
%define repo nonfree
Name: rpmfusion-%{repo}-release
Version: 9
Release: 6
Summary: RPM Fusion (Free) Repository Configuration
Group: System Environment/Base
License: BSD
URL: http://rpmfusion.org
Source0: RPM-GPG-KEY-rpmfusion-%{repo}-fedora
Source1: rpmfusion-%{repo}.repo
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: fedora-release >= %{version}
# If apt is around, it needs to be a version with repomd support
Conflicts: apt < 0.5.15lorg3
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
# enable those once RPM Fusion is in full production and ready
# to obsolete the old repos:
#Provides: freshrpms-release = %{version}-%{release}
#Obsoletes: freshrpms-release <= %{version}-%{release}
#Provides: livna-release = %{version}-%{release}
#Obsoletes: livna-release <= %{version}-%{release}
#Provides: dribble-release = %{version}-%{release}
#Obsoletes: dribble-release <= %{version}-%{release}
%description
RPM Fusion repository contains open source and other distributable software for
Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "nonfree" repository, which holds
software that is not considered as Open Source Software according to the
Fedora packaging guidelines.
%else
%description
RPM Fusion repository contains open source and other distributable software for
Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "free" repository, which holds only
software that is considered as Open Source Software according to the Fedora
packaging guidelines.
%endif
%prep
echo "Nothing to prep"
%build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
# GPG Key
%{__install} -Dp -m644 %{SOURCE0} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-6
- Use temporary mirrorlists for now, and baseurl for the debug & source repos
* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5
- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist
- Use download.rpmfusion.org instead of download1.rpmfusion.org
* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4
- Only include provides/obsoletes for pre-merger release RPMs in nonfree
- Remove GPL doc
* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3
- add conditionals and macros to use one spec file for both free and nonfree
- some cleanups
* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2
- Split into free and non-free RPMs based on original release RPM
- Remove double BuildArch
- Remove GPL source
- Fix mirror URLs
- devel --> rawhide
* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1
- Initial RPM release
--- NEW FILE rpmfusion-nonfree-updates-testing.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-nonfree-updates-testing]
name=RPM Fusion for Fedora $releasever - Non-Free - Test Updates
failovermethod=priority
#baseurl=http://download.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://download1.rpmfusion.org/nonfree/fedora/.mirrorlist-nonf...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-updates-testing-debuginfo]
name=RPM Fusion for Fedora $releasever - Non-Free - Test Updates Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$re...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-updates-testing-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-updates-testing-source]
name=RPM Fusion for Fedora $releasever - Non-Free - Test Updates Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$re...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-updates-testing-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
--- NEW FILE rpmfusion-nonfree-updates.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-nonfree-updates]
name=RPM Fusion for Fedora $releasever - Non-Free - Updates
failovermethod=priority
#baseurl=http://download.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
mirrorlist=http://download1.rpmfusion.org/nonfree/fedora/.mirrorlist-nonf...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-updates-debuginfo]
name=RPM Fusion for Fedora $releasever - Non-Free - Updates Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-updates-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-updates-source]
name=RPM Fusion for Fedora $releasever - Non-Free - Updates Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-updates-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
--- NEW FILE rpmfusion-nonfree.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-nonfree]
name=RPM Fusion for Fedora $releasever - Non-Free
failovermethod=priority
#baseurl=http://download.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
mirrorlist=http://download1.rpmfusion.org/nonfree/fedora/.mirrorlist-nonf...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-debuginfo]
name=RPM Fusion for Fedora $releasever - Non-Free - Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releaseve...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
[rpmfusion-nonfree-source]
name=RPM Fusion for Fedora $releasever - Non-Free - Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releaseve...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-nonfree-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
15 years, 7 months
rpms/rpmfusion-nonfree-release/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsl30470/rpms/rpmfusion-nonfree-release/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module rpmfusion-nonfree-release
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: rpmfusion-nonfree-release
# $Id: Makefile,v 1.1 2008/09/27 20:04:29 thl Exp $
NAME := rpmfusion-nonfree-release
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
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)
--- NEW FILE sources ---
15 years, 7 months
rpms/rpmfusion-nonfree-release Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsl30470/rpms/rpmfusion-nonfree-release
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module rpmfusion-nonfree-release
--- NEW FILE Makefile ---
# Top level Makefile for module rpmfusion-nonfree-release
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 7 months
rpms/rpmfusion-nonfree-release/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsl30470/rpms/rpmfusion-nonfree-release/devel
Log Message:
Directory /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel added to the repository
15 years, 7 months
rpms/rpmfusion-nonfree-release - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsl30470/rpms/rpmfusion-nonfree-release
Log Message:
Directory /cvs/nonfree/rpms/rpmfusion-nonfree-release added to the repository
15 years, 7 months
rpms/rpmfusion-free-release/F-9 Makefile,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30000
Modified Files:
Makefile
Log Message:
update makefile
Index: Makefile
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-9/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 20 Jun 2008 15:45:16 -0000 1.1
+++ Makefile 27 Sep 2008 20:00:44 -0000 1.2
@@ -1,6 +1,6 @@
# Makefile for source rpm: rpmfusion-release
# $Id$
-NAME := rpmfusion-release
+NAME := rpmfusion-free-release
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
15 years, 7 months
rpms/rpmfusion-free-release/F-9 RPM-GPG-KEY-rpmfusion-free-fedora, NONE, 1.1 rpmfusion-free-rawhide.repo, NONE, 1.1 rpmfusion-free-release.spec, NONE, 1.1 rpmfusion-free-updates-testing.repo, NONE, 1.1 rpmfusion-free-updates.repo, NONE, 1.1 rpmfusion-free.repo, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29930
Added Files:
RPM-GPG-KEY-rpmfusion-free-fedora rpmfusion-free-rawhide.repo
rpmfusion-free-release.spec
rpmfusion-free-updates-testing.repo
rpmfusion-free-updates.repo rpmfusion-free.repo
Log Message:
import release package
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQGiBEh43fsRBADXpQLcyRQu1qFrq0C1T94j+wcLVsYcs3Gsiq82jjM7OCDuFGvw
FuWX93V1b0X0L/bnO8fseOsVP4N7ok7UHeuFWfyVT64NBk7pSXMCbYldRIJyJ4o+
KqHgejQEYRCJriJGoFVL53DeXbmlESjytMK1PTZwSX4zKctSUhQaYRmRhwCgufX6
g23aQ4+FS3RywyinvA23mZ0D/iiF/r3U2jKvBk/FgG/0qTaSFsSoBVdvKI5B/HWA
UUIkFewI12sdcwBKVXTzLppul6NyElh5KEY4ls7xadMWRyRl4BU8WzrUyMd0yxem
TqiBjG8s6EO0c2JwebzqBgEmU/nLpkyhEF0xN8trjzhK8lWbAdjnzyzw8xUAF5r0
uyO9BACj6Hyi/mAwLY+aSj58KBtScf3X8e1NSnZTqDoZlOXnm34/Y23Gfwin/RK5
omqa2ZshKNl+8UkPH50Y9x7sRmS2MiiFjuzXQdzLCmLGQMjK/HFUm4a2+byEZXOA
3Pu282Xz5P06/zX+eXTREn1RbBStXVEptWWxLAkqb66Kp4v9OrROUlBNIEZ1c2lv
biByZXBvc2l0b3J5IChGZWRvcmEgLSBmcmVlKSA8cnBtZnVzaW9uLWJ1aWxkc3lz
QGxpc3RzLnJwbWZ1c2lvbi5vcmc+iGAEExECACAFAkh43fsCGwMGCwkIBwMCBBUC
CAMEFgIDAQIeAQIXgAAKCRCFUJmySciIWpd7AJ9LI5/Ae7naPr49NNjQfd1AydJ3
wQCgtf460zaZZeHdzgr2cCg3vmuAPV+5Ag0ESHjeBRAIAIVouFaPtMhROoskFPhS
PA/3nzdi1HlmAYOlzulfAoCjjeo9O+gj6ZPJDJPeO/qG8UWyIn9fAvM+y4Jg32Jy
GWn+lfSHnL+S/ZBJxCgEKl5E2qCGE7nnSyB2HM7aLQzjn58L7JZtlf5EL+Nw/tAC
dfyzHJglteuGl4rrwa7QdWnhTvtmDA7KRDkYrw9A7zSRoH1qyaQkqOhz4YFXI4c+
bGAFBPgiIxu5FRSjMBJJHzrlZtTJx6z+oqCZjP5TLPHrqGbatcum9DmN65LvdV4Y
KMPyMmnTiPRH2YDIC6QleHxPKljol2vxzK2mUvBMr7S0X21i2ImRTXODXMScIZB8
r+sAAwYH/jN63OsS2aPXy9/Tj7bUwSp163O5FVBUtlqdisKECXU/86XlCVbL7wjb
Tn4FxQVPoYfNjzFoi89T4FXcKH3lvQ03vhhG2PNAIyudj/j35Q85xKfSkKBdPIUz
1u5rFMNvCr5cCA3dCFR3bUUykVh1xKvfMluUiZzUZkAQ1Ke/4/GCR9bpwfZDzr3c
RrTveDG1CLw4qakpIzC9KjAJdWMB/voifU1EhWxzt2R7J27c5zvTGvb746nyZUa+
3LBmklUdM4xRZcy25nqSSIwgmGx4Iak0fj0+6cMM47TliDeBNfJpSRb3qauuVEk8
m2gi1GvcJXIxq2jM77w8nIILdjxoxB6ISQQYEQIACQUCSHjeBQIbDAAKCRCFUJmy
SciIWlHZAKCJyGKXrfd45XI9lP/Jz3GF5RmWrQCfWdHtDXkY3PWz1qFPj7EfXc2b
pog=
=zozD
-----END PGP PUBLIC KEY BLOCK-----
--- NEW FILE rpmfusion-free-rawhide.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-free-rawhide]
name=RPM Fusion for Fedora $releasever - Free - Rawhide
failovermethod=priority
#baseurl=http://download.rpmfusion.org/free/fedora/development/$basearch/os/
mirrorlist=http://download1.rpmfusion.org/free/fedora/.mirrorlist-free-fe...
failovermethod=roundrobin
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-rawhide-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Rawhide Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-rawhide-debug&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-rawhide-source]
name=RPM Fusion for Fedora $releasever - Free - Rawhide Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/development/source/SRPMS/
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-rawhide-source&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
--- NEW FILE rpmfusion-free-release.spec ---
%define repo free
#define repo nonfree
Name: rpmfusion-%{repo}-release
Version: 9
Release: 7
Summary: RPM Fusion (Free) Repository Configuration
Group: System Environment/Base
License: BSD
URL: http://rpmfusion.org
Source0: RPM-GPG-KEY-rpmfusion-%{repo}-fedora
Source1: rpmfusion-%{repo}.repo
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: fedora-release >= %{version}
# If apt is around, it needs to be a version with repomd support
Conflicts: apt < 0.5.15lorg3
%if %{repo} == "nonfree"
Requires: rpmfusion-free-release >= %{version}
# enable those once RPM Fusion is in full production and ready
# to obsolete the old repos:
#Provides: freshrpms-release = %{version}-%{release}
#Obsoletes: freshrpms-release <= %{version}-%{release}
#Provides: livna-release = %{version}-%{release}
#Obsoletes: livna-release <= %{version}-%{release}
#Provides: dribble-release = %{version}-%{release}
#Obsoletes: dribble-release <= %{version}-%{release}
%description
RPM Fusion repository contains open source and other distributable software for
Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "nonfree" repository, which holds
software that is not considered as Open Source Software according to the
Fedora packaging guidelines.
%else
%description
RPM Fusion repository contains open source and other distributable software for
Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "free" repository, which holds only
software that is considered as Open Source Software according to the Fedora
packaging guidelines.
%endif
%prep
echo "Nothing to prep"
%build
echo "Nothing to build"
%install
rm -rf $RPM_BUILD_ROOT
# Create dirs
install -d -m755 \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
# GPG Key
%{__install} -Dp -m644 %{SOURCE0} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_sysconfdir}/pki/rpm-gpg/*
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7
- Use temporary mirrorlists for now, and baseurl for the debug & source repos
* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6
- Fix rpmfusion-rpmfusion typo
* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5
- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist
- Use download.rpmfusion.org instead of download1.rpmfusion.org
* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4
- Only include provides/obsoletes for pre-merger release RPMs in nonfree
- Remove GPL doc
* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3
- add conditionals and macros to use one spec file for both free and nonfree
- some cleanups
* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2
- Split into free and non-free RPMs based on original release RPM
- Remove double BuildArch
- Remove GPL source
- Fix mirror URLs
- devel --> rawhide
* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1
- Initial RPM release
--- NEW FILE rpmfusion-free-updates-testing.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-free-updates-testing]
name=RPM Fusion for Fedora $releasever - Free - Test Updates
failovermethod=priority
#baseurl=http://download.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://download1.rpmfusion.org/free/fedora/.mirrorlist-free-fe...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-updates-testing-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$relea...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-updates-testing-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-updates-testing-source]
name=RPM Fusion for Fedora $releasever - Free - Test Updates Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$relea...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-updates-testing-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
--- NEW FILE rpmfusion-free-updates.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-rpmfusion-free-updates]
name=RPM Fusion for Fedora $releasever - Free - Updates
failovermethod=priority
#baseurl=http://download.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
mirrorlist=http://download1.rpmfusion.org/free/fedora/.mirrorlist-free-fe...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-rpmfusion-free-updates-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Updates Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$b...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-updates-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-rpmfusion-free-updates-source]
name=RPM Fusion for Fedora $releasever - Free - Updates Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SR...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-updates-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
--- NEW FILE rpmfusion-free.repo ---
# Please note that the mirrorlists URLs are only temporary and will be changed soon.
# The debuginfo and source repos will also be switching from baseurl to a
# mirror list.
[rpmfusion-free]
name=RPM Fusion for Fedora $releasever - Free
failovermethod=priority
#baseurl=http://download.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
mirrorlist=http://download1.rpmfusion.org/free/fedora/.mirrorlist-free-fe...
failovermethod=roundrobin
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Debug
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/E...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-debug-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
[rpmfusion-free-source]
name=RPM Fusion for Fedora $releasever - Free - Source
failovermethod=priority
baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/E...
#mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=rpmfusion-free-source-f$releasever&arch=$basearch
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
15 years, 7 months
rpms/libdlna/F-8 libdlna-0.2.3-ffmpeg-header-move.patch, NONE, 1.1 libdlna.spec, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libdlna/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29521
Modified Files:
libdlna.spec
Added Files:
libdlna-0.2.3-ffmpeg-header-move.patch
Log Message:
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
- Fix build with even newer ffmpeg
libdlna-0.2.3-ffmpeg-header-move.patch:
--- NEW FILE libdlna-0.2.3-ffmpeg-header-move.patch ---
diff -up libdlna-0.2.3/configure~ libdlna-0.2.3/configure
--- libdlna-0.2.3/configure~ 2008-09-27 21:08:58.000000000 +0200
+++ libdlna-0.2.3/configure 2008-09-27 21:08:58.000000000 +0200
@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
fi
echolog "Checking for libavformat ..."
-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+check_lib ffmpeg/libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
echolog "Checking for libavcodec ..."
-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+check_lib ffmpeg/libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
#################################################
# version
diff -up libdlna-0.2.3/src/av_mpeg4_part10.c~ libdlna-0.2.3/src/av_mpeg4_part10.c
--- libdlna-0.2.3/src/av_mpeg4_part10.c~ 2008-09-27 21:38:31.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-09-27 21:38:31.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/av_mpeg4_part2.c~ libdlna-0.2.3/src/av_mpeg4_part2.c
--- libdlna-0.2.3/src/av_mpeg4_part2.c~ 2008-09-27 21:38:17.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-09-27 21:38:17.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/containers.c~ libdlna-0.2.3/src/containers.c
--- libdlna-0.2.3/src/containers.c~ 2008-09-27 21:38:40.000000000 +0200
+++ libdlna-0.2.3/src/containers.c 2008-09-27 21:38:40.000000000 +0200
@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "containers.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/profiles.h~ libdlna-0.2.3/src/profiles.h
--- libdlna-0.2.3/src/profiles.h~ 2008-09-27 21:38:42.000000000 +0200
+++ libdlna-0.2.3/src/profiles.h 2008-09-27 21:38:42.000000000 +0200
@@ -22,8 +22,8 @@
#ifndef _PROFILES_H_
#define _PROFILES_H_
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "dlna_internals.h"
#include "containers.h"
Index: libdlna.spec
===================================================================
RCS file: /cvs/free/rpms/libdlna/F-8/libdlna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdlna.spec 19 Aug 2008 09:06:55 -0000 1.1
+++ libdlna.spec 27 Sep 2008 19:57:13 -0000 1.2
@@ -1,12 +1,13 @@
Version: 0.2.3
Summary: Open-source implementation of DLNA (Digital Living Network Alliance) standards
Name: libdlna
-Release: 5%{?dist}
+Release: 8%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libdlna.geexbox.org/
Source: http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
Patch0: libdlna-pkgconfig.patch
+Patch1: libdlna-0.2.3-ffmpeg-header-move.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ffmpeg-devel
@@ -28,9 +29,10 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ffmpeg"
./configure --prefix=%{_prefix} --libdir=%{_libdir} --includedir=%{_includedir} --disable-static
make
@@ -57,6 +59,15 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
+- Fix build with even newer ffmpeg
+
+* Tue Aug 19 2008 Eric Tanguy <eric.tanguy(a)univ-nantes.fr> - 0.2.3-7
+- Fix build with new ffmpeg
+
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.3-6
+- rebuild
+
* Sun Feb 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.2.3-5
- rebuild for new ffmpeg
15 years, 7 months
rpms/libdlna/F-9 libdlna-0.2.3-ffmpeg-header-move.patch, NONE, 1.1 libdlna.spec, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libdlna/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29379
Modified Files:
libdlna.spec
Added Files:
libdlna-0.2.3-ffmpeg-header-move.patch
Log Message:
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
- Fix build with even newer ffmpeg
libdlna-0.2.3-ffmpeg-header-move.patch:
--- NEW FILE libdlna-0.2.3-ffmpeg-header-move.patch ---
diff -up libdlna-0.2.3/configure~ libdlna-0.2.3/configure
--- libdlna-0.2.3/configure~ 2008-09-27 21:08:58.000000000 +0200
+++ libdlna-0.2.3/configure 2008-09-27 21:08:58.000000000 +0200
@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
fi
echolog "Checking for libavformat ..."
-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+check_lib ffmpeg/libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
echolog "Checking for libavcodec ..."
-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+check_lib ffmpeg/libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
#################################################
# version
diff -up libdlna-0.2.3/src/av_mpeg4_part10.c~ libdlna-0.2.3/src/av_mpeg4_part10.c
--- libdlna-0.2.3/src/av_mpeg4_part10.c~ 2008-09-27 21:38:31.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-09-27 21:38:31.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/av_mpeg4_part2.c~ libdlna-0.2.3/src/av_mpeg4_part2.c
--- libdlna-0.2.3/src/av_mpeg4_part2.c~ 2008-09-27 21:38:17.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-09-27 21:38:17.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/containers.c~ libdlna-0.2.3/src/containers.c
--- libdlna-0.2.3/src/containers.c~ 2008-09-27 21:38:40.000000000 +0200
+++ libdlna-0.2.3/src/containers.c 2008-09-27 21:38:40.000000000 +0200
@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "containers.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/profiles.h~ libdlna-0.2.3/src/profiles.h
--- libdlna-0.2.3/src/profiles.h~ 2008-09-27 21:38:42.000000000 +0200
+++ libdlna-0.2.3/src/profiles.h 2008-09-27 21:38:42.000000000 +0200
@@ -22,8 +22,8 @@
#ifndef _PROFILES_H_
#define _PROFILES_H_
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "dlna_internals.h"
#include "containers.h"
Index: libdlna.spec
===================================================================
RCS file: /cvs/free/rpms/libdlna/F-9/libdlna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdlna.spec 26 Aug 2008 17:24:34 -0000 1.2
+++ libdlna.spec 27 Sep 2008 19:56:34 -0000 1.3
@@ -1,12 +1,13 @@
Version: 0.2.3
Summary: Open-source implementation of DLNA (Digital Living Network Alliance) standards
Name: libdlna
-Release: 6%{?dist}
+Release: 8%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libdlna.geexbox.org/
Source: http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
Patch0: libdlna-pkgconfig.patch
+Patch1: libdlna-0.2.3-ffmpeg-header-move.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ffmpeg-devel
@@ -28,9 +29,10 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ffmpeg"
./configure --prefix=%{_prefix} --libdir=%{_libdir} --includedir=%{_includedir} --disable-static
make
@@ -57,7 +59,13 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Aug 26 2008 Eric Tanguy <eric.tanguy(a)univ-nantes.fr> - 0.2.3-6
+* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
+- Fix build with even newer ffmpeg
+
+* Tue Aug 19 2008 Eric Tanguy <eric.tanguy(a)univ-nantes.fr> - 0.2.3-7
+- Fix build with new ffmpeg
+
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.3-6
- rebuild
* Sun Feb 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.2.3-5
15 years, 7 months
rpms/libdlna/devel libdlna-0.2.3-ffmpeg-header-move.patch, NONE, 1.1 libdlna.spec, 1.6, 1.7
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libdlna/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28299
Modified Files:
libdlna.spec
Added Files:
libdlna-0.2.3-ffmpeg-header-move.patch
Log Message:
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
- Fix build with even newer ffmpeg
libdlna-0.2.3-ffmpeg-header-move.patch:
--- NEW FILE libdlna-0.2.3-ffmpeg-header-move.patch ---
diff -up libdlna-0.2.3/configure~ libdlna-0.2.3/configure
--- libdlna-0.2.3/configure~ 2008-09-27 21:08:58.000000000 +0200
+++ libdlna-0.2.3/configure 2008-09-27 21:08:58.000000000 +0200
@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
fi
echolog "Checking for libavformat ..."
-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+check_lib ffmpeg/libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
echolog "Checking for libavcodec ..."
-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+check_lib ffmpeg/libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
#################################################
# version
diff -up libdlna-0.2.3/src/av_mpeg4_part10.c~ libdlna-0.2.3/src/av_mpeg4_part10.c
--- libdlna-0.2.3/src/av_mpeg4_part10.c~ 2008-09-27 21:38:31.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-09-27 21:38:31.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/av_mpeg4_part2.c~ libdlna-0.2.3/src/av_mpeg4_part2.c
--- libdlna-0.2.3/src/av_mpeg4_part2.c~ 2008-09-27 21:38:17.000000000 +0200
+++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-09-27 21:38:17.000000000 +0200
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avcodec.h>
+#include <ffmpeg/libavcodec/avcodec.h>
#include "dlna_internals.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/containers.c~ libdlna-0.2.3/src/containers.c
--- libdlna-0.2.3/src/containers.c~ 2008-09-27 21:38:40.000000000 +0200
+++ libdlna-0.2.3/src/containers.c 2008-09-27 21:38:40.000000000 +0200
@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "containers.h"
#include "profiles.h"
diff -up libdlna-0.2.3/src/profiles.h~ libdlna-0.2.3/src/profiles.h
--- libdlna-0.2.3/src/profiles.h~ 2008-09-27 21:38:42.000000000 +0200
+++ libdlna-0.2.3/src/profiles.h 2008-09-27 21:38:42.000000000 +0200
@@ -22,8 +22,8 @@
#ifndef _PROFILES_H_
#define _PROFILES_H_
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavformat/avformat.h>
#include "dlna_internals.h"
#include "containers.h"
Index: libdlna.spec
===================================================================
RCS file: /cvs/free/rpms/libdlna/devel/libdlna.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libdlna.spec 19 Aug 2008 09:57:47 -0000 1.6
+++ libdlna.spec 27 Sep 2008 19:40:07 -0000 1.7
@@ -1,12 +1,13 @@
Version: 0.2.3
Summary: Open-source implementation of DLNA (Digital Living Network Alliance) standards
Name: libdlna
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libdlna.geexbox.org/
Source: http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
Patch0: libdlna-pkgconfig.patch
+Patch1: libdlna-0.2.3-ffmpeg-header-move.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ffmpeg-devel
@@ -28,9 +29,10 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ffmpeg"
./configure --prefix=%{_prefix} --libdir=%{_libdir} --includedir=%{_includedir} --disable-static
make
@@ -57,6 +59,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.2.3-8
+- Fix build with even newer ffmpeg
+
* Tue Aug 19 2008 Eric Tanguy <eric.tanguy(a)univ-nantes.fr> - 0.2.3-7
- Fix build with new ffmpeg
15 years, 7 months