[svn] r6240 - trunk/rpms/rpmforge-release

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu Mar 27 20:27:20 CET 2008


Author: dag
Date: 2008-03-27 19:27:20 +0000 (Thu, 27 Mar 2008)
New Revision: 6240

Modified:
   trunk/rpms/rpmforge-release/rpmforge-release.spec
Log:
Updates

Modified: trunk/rpms/rpmforge-release/rpmforge-release.spec
===================================================================
--- trunk/rpms/rpmforge-release/rpmforge-release.spec	2008-03-27 17:48:32 UTC (rev 6239)
+++ trunk/rpms/rpmforge-release/rpmforge-release.spec	2008-03-27 19:27:20 UTC (rev 6240)
@@ -2,15 +2,18 @@
 # Authority: dag
 # Upstream: Dag Wieers <dag at wieers.com>
 
+### Tag as test until we have replaced fabian's fingerprint and tested the new package
+# Tag: test
+
 %{?dtag: %{expand: %%define %dtag 1}}
 
 %{?rh7:%define _without_rpmpubkey 1}
 %{?el2:%define _without_rpmpubkey 1}
 %{?rh6:%define _without_rpmpubkey 1}
 
-Summary: RPMforge release file and package configuration
+Summary: RPMforge release file and RPM repository configuration
 Name: rpmforge-release
-Version: 0.3.6
+Version: 0.4.0
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -19,7 +22,7 @@
 Source0: mirrors-rpmforge
 Source1: RPM-GPG-KEY-rpmforge-dag
 Source2: RPM-GPG-KEY-rpmforge-dries
-Source3: RPM-GPG-KEY-rpmforge-matthias
+Source3: RPM-GPG-KEY-rpmforge-fabian
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -30,13 +33,22 @@
 %prep
 %setup -c
 
+%ifarch ppc
+%{?el5:name='Red Hat Enterprise'; version='5'; path="redhat/el"; builder='fabian'}
+%{?el4:name='Red Hat Enterprise'; version='4'; path="redhat/el"; builder='fabian'}
+%{?el3:name='Red Hat Enterprise'; version='3'; path="redhat/el"; builder='fabian'}
+%{?el2:name='Red Hat Enterprise'; version='2.1'; path="redhat/el"; builder='fabian'}
+%else
 %{?el5:name='Red Hat Enterprise'; version='5'; path="redhat/el"; builder='dag'}
 %{?el4:name='Red Hat Enterprise'; version='4'; path="redhat/el"; builder='dag'}
 %{?el3:name='Red Hat Enterprise'; version='3'; path="redhat/el"; builder='dag'}
 %{?el2:name='Red Hat Enterprise'; version='2.1'; path="redhat/el"; builder='dag'}
-%{?fc6:name='Fedora Core'; version='6'; path="fedora/"; builder='dries'; driesrepomdsuffix='/RPMS'}
-%{?fc5:name='Fedora Core'; version='5'; path="fedora/"; builder='dries'; driesrepomdsuffix='/RPMS'}
-%{?fc4:name='Fedora Core'; version='4'; path="fedora/"; builder='dries'; driesrepomdsuffix='/RPMS'}
+%endif
+%{?fc8:name='Fedora Core'; version='8'; path="fedora/"; builder='dries'}
+%{?fc7:name='Fedora Core'; version='7'; path="fedora/"; builder='dries'}
+%{?fc6:name='Fedora Core'; version='6'; path="fedora/"; builder='dries'}
+%{?fc5:name='Fedora Core'; version='5'; path="fedora/"; builder='dries'}
+%{?fc4:name='Fedora Core'; version='4'; path="fedora/"; builder='dries'}
 %{?fc3:name='Fedora Core'; version='3'; path="fedora/"; builder='dag'}
 %{?fc2:name='Fedora Core'; version='2'; path="fedora/"; builder='dag'}
 %{?fc1:name='Fedora Core'; version='1'; path="fedora/"; builder='dag'}
@@ -48,8 +60,8 @@
 %{__cat} <<EOF >rpmforge.apt
 # Name: RPMforge RPM Repository for $name $version - $builder
 # URL: http://rpmforge.net/
-#rpm http://apt.sw.be $path\$(VERSION)/en/\$(ARCH) $builder
-repomd http://apt.sw.be $path\$(VERSION)/en/\$(ARCH)/$builder$driesrepomdsuffix
+#rpm http://rpmforge.sw.be $path\$(VERSION)/en/\$(ARCH) $builder
+repomd http://rpmforge.sw.be $path\$(VERSION)/en/\$(ARCH)/rpmforge
 EOF
 
 %{__cat} <<EOF >rpmforge.smart
@@ -57,7 +69,7 @@
 # URL: http://rpmforge.net/
 [rpmforge]
 name = Extra packages from RPMforge.net for $name $version - %{_arch} - $builder
-baseurl = http://apt.sw.be/$path$version/en/%{_arch}/$builder$driesrepomdsuffix
+baseurl = http://rpmforge.sw.be/$path$version/en/%{_arch}/rpmforge
 type = rpm-md
 EOF
 
@@ -67,8 +79,8 @@
 # URL: http://rpmforge.net/
 [rpmforge]
 name = $name \$releasever - RPMforge.net - $builder
-#baseurl = http://apt.sw.be/$path$version/en/\$basearch/$builder$driesrepomdsuffix
-mirrorlist = http://apt.sw.be/$path$version/en/mirrors-rpmforge
+baseurl = http://rpmforge.sw.be/$path$version/en/\$basearch/rpmforge
+mirrorlist = http://mirrorlist.sw.be/mirrors-rpmforge-$dtag-\$basearch
 #mirrorlist = file:///etc/yum.repos.d/mirrors-rpmforge
 enabled = 1
 protect = 0
@@ -82,13 +94,13 @@
 #
 # Add the following line to /etc/sysconfig/rhn/sources
 #
-#	yum rpmforge http://apt.sw.be/$path$version/en/%{_arch}/$builder
+#	yum rpmforge http://apt.sw.be/$path$version/en/%{_arch}/rpmforge
 # or
-#	apt rpmforge http://apt.sw.be $path$version/en/%{_arch} $builder
+#	apt rpmforge http://apt.sw.be $path$version/en/%{_arch} rpmforge
 EOF
 
 for mirror in $(%{__cat} %{SOURCE0}); do
-	echo "$mirror/$path$version/en/\$ARCH/$builder$driesrepomdsuffix"
+	echo "$mirror/$path$version/en/\$ARCH/rpmforge"
 done >mirrors-rpmforge.yum
 
 %build
@@ -98,7 +110,7 @@
 %{__cp} -a %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 %{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dries
-%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-matthias
+%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-fabian
 %{__install} -Dp -m0644 rpmforge.apt %{buildroot}%{_sysconfdir}/apt/sources.list.d/rpmforge.list
 %{__install} -Dp -m0644 rpmforge.smart %{buildroot}%{_sysconfdir}/smart/channels/rpmforge.channel
 %{__install} -Dp -m0644 rpmforge.up2date %{buildroot}%{_sysconfdir}/sysconfig/rhn/sources.rpmforge.txt
@@ -112,7 +124,8 @@
 %if %{!?_without_rpmpubkey:1}0
 rpm -q gpg-pubkey-6b8d79e6-3f49313d &>/dev/null || rpm --import %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag || :
 rpm -q gpg-pubkey-1aa78495-3eb24301 &>/dev/null || rpm --import %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dries || :
-rpm -q gpg-pubkey-e42d547b-3960bdf1 &>/dev/null || rpm --import %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-matthias || :
+### FIXME: Insert fabian's fingerprint here
+rpm -q gpg-pubkey-e42d547b-3960bdf1 &>/dev/null || rpm --import %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-fabian || :
 %endif
 
 %files
@@ -121,7 +134,7 @@
 %if %{!?_without_rpmpubkey:1}0
 %pubkey RPM-GPG-KEY-rpmforge-dag
 %pubkey RPM-GPG-KEY-rpmforge-dries
-%pubkey RPM-GPG-KEY-rpmforge-matthias
+%pubkey RPM-GPG-KEY-rpmforge-fabian
 %endif
 %dir %{_sysconfdir}/apt/
 %dir %{_sysconfdir}/apt/sources.list.d/
@@ -138,6 +151,10 @@
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-*
 
 %changelog
+* Thu Mar 27 2008 Dag Wieers <dag at wieers.com> - 0.4.0-1
+- Added fabian's ppc repositories.
+- Removed a lot of cruft.
+
 * Thu Jan 18 2007 Dag Wieers <dag at wieers.com> - 0.3.6-1
 - Fixed the reference to the RHEL2.1 repository. (Thanassis)
 




More information about the commits mailing list