rpms/rpmfusion-nonfree-package-config-smart/F-17 rpmfusion-nonfree-package-config-smart.spec, 1.9, 1.10

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25864/F-17

Modified Files:
	rpmfusion-nonfree-package-config-smart.spec 
Log Message:
Bump for F-18
Add support for secondary-arches



Index: rpmfusion-nonfree-package-config-smart.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-17/rpmfusion-nonfree-package-config-smart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-nonfree-package-config-smart.spec	1 May 2012 20:37:20 -0000	1.9
+++ rpmfusion-nonfree-package-config-smart.spec	7 Sep 2012 20:55:57 -0000	1.10
@@ -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
 
-Summary:    RPM Fusion (nonfree) configuration files for the Smart package manager
-Name:       rpmfusion-nonfree-package-config-smart
+%global repo nonfree
+
+Summary:    RPM Fusion (%{repo}) configuration files for the Smart package manager
+Name:       rpmfusion-free-package-config-smart
 Version:    17
-Release:    1.1
+Release:    2
 License:    GPLv2+
 Group:      System Environment/Base
 URL:        http://rpmfusion.org/
 Source0:    COPYING
-Source1:    rpmfusion-nonfree.channel
-Source2:    rpmfusion-nonfree-rawhide.channel
-Source3:    rpmfusion-nonfree-updates.channel
-Source4:    rpmfusion-nonfree-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-%{repo} = %{version}-%{release}
+%if %repo == "nonfree"
 Requires:   rpmfusion-free-package-config-smart >= %{version}
-Provides:   smart-config-rpmfusion-nonfree = %{version}-%{release}
+%endif
 
 %description
 This package provides the configuration files required by the Smart package
-manager to use RPM Fusion's "nonfree" software repository.
+manager to use RPM Fusion's "%{repo}" software repository.
+
 
 %prep
 %setup -cT
 cp %{SOURCE0} .
-sleep 3m
 
 %build
 
@@ -40,9 +52,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels
 for channel in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4};do
   name=$(basename $channel)
-  %{__install} -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+  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,17 +70,11 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Tue May 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 17-1
-- Update to 17
-
-* Thu Feb 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 16-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Fri Sep 07 2012 Nicolas Chauvet <kwizart at gmail.com> - 17-2
+- Add support for secondary-arches
 
-* Fri Nov 04 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-3
-- Fix version requirement for rpmfusion-free
-
-* Wed Oct 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-2
-- Fix basearch on i386 - rfbz#2000
+* Tue May 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 17-1
+- Update for F-17
 
 * Mon Oct 17 2011 Nicolas Chauvet <kwizart at gmail.com> - 16-1
 - Update for F-16
@@ -72,12 +82,22 @@
 * Mon Oct 17 2011 Nicolas Chauvet <kwizart at gmail.com> - 15-1
 - Update for F-15
 
+* Sat Apr 9 2011 Stewart Adam <s.adam at diffingo.com> - 14-1
+- Update for F-14
+- Use hardcoded %%{basearch} instead of %%{_target_cpu} (fixes #1268)
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11-0.4
 - rebuild for new F11 features
 
-* Fri Dec 26 2008 Stewart Adam <s.adam at diffingo.com> 11-0.3
+* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> 11-0.3
 - Add "sleep 3m" to workaround buildsys bug
+
+* Mon Dec 22 2008 Stewart Adam <s.adam at diffingo.com> 11-0.2
+- Another workaround since buildsys doesn't seem to like ||:
+
+* Sun Dec 21 2008 Stewart Adam <s.adam at diffingo.com> 11-0.1
 - Update .channel files for devel
+- Append ||: to cp so build doesn't fail on "make local"
 
 * Thu Dec 11 2008 Stewart Adam <s.adam at diffingo.com> 10-2
 - Make summary and description fields clearer
@@ -85,5 +105,4 @@
 * Sat Dec 6 2008 Stewart Adam <s.adam at diffingo.com> 10-1
 - Split rpmfusion-package-config-smart into free and nonfree
 - Don't use %%{__commandname} in some places but not others
-- Add rpmfusion-free-package-config-smart requires