Author: kwizart
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25292/devel
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
Update for F-18
Add secondary-arches support
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file:
/cvs/free/rpms/rpmfusion-free-package-config-smart/devel/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmfusion-free-package-config-smart.spec 1 May 2012 20:03:23 -0000 1.6
+++ rpmfusion-free-package-config-smart.spec 7 Sep 2012 20:49:47 -0000 1.7
@@ -1,36 +1,48 @@
-%define debug_package %{nil}
+%global debug_package %{nil}
+
+%global basearch %{_target_cpu}
%ifarch %{ix86}
-%define basearch i386
+%global basearch i386
+%endif
+
+%ifarch %{arm}
+%ifarch armv7hl armv7hnl
+%global basearch armhfp
%else
-%define basearch %{_target_cpu}
+%global basearch arm
%endif
+%endif
+
+%global repo free
-Summary: RPM Fusion (free) configuration files for the Smart package manager
+Summary: RPM Fusion (%{repo}) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
-Version: 17
+Version: 18
Release: 1
License: GPLv2+
Group: System Environment/Base
URL:
http://rpmfusion.org/
Source0: COPYING
-Source1: rpmfusion-free.channel
-Source2: rpmfusion-free-rawhide.channel
-Source3: rpmfusion-free-updates.channel
-Source4: rpmfusion-free-updates-testing.channel
+Source1: rpmfusion-%{repo}.channel
+Source2: rpmfusion-%{repo}-rawhide.channel
+Source3: rpmfusion-%{repo}-updates.channel
+Source4: rpmfusion-%{repo}-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Provides: smart-config-rpmfusion-free = %{version}-%{release}
+Provides: smart-config-rpmfusion-%{repo} = %{version}-%{release}
+%if %repo == "nonfree"
+Requires: rpmfusion-free-package-config-smart >= %{version}
+%endif
%description
This package provides the configuration files required by the Smart package
-manager to use RPM Fusion's "free" software repository.
+manager to use RPM Fusion's "%{repo}" software repository.
%prep
%setup -cT
cp %{SOURCE0} .
-sleep 3m
%build
@@ -43,6 +55,10 @@
install -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$basearch/%{basearch}/'
$RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$releasever/%{fedora}/'
$RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%ifnarch %{ix86} x86_64
+ #Fedora secondary
+ sed -i 's/free\/fedora\//free\/fedora-secondary\//'
$RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+%endif
done
%clean
@@ -54,6 +70,12 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 18-1
+- Update for F-18
+
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-2
+- Add support for secondary-arches
+
* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 17-1
- Update for F-17