rpms/mock/FC-3 mock.spec,1.4,1.5

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Sun Jun 12 20:28:26 UTC 2005


Author: katzj

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12095

Modified Files:
	mock.spec 
Log Message:
* Sun Jun 12 2005 Jeremy Katz <katzj at redhat.com> 
- set default.cfg based on both arch and distro built for



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mock.spec	12 Jun 2005 05:29:00 -0000	1.4
+++ mock.spec	12 Jun 2005 20:28:24 -0000	1.5
@@ -26,8 +26,21 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 # make the default.cfg link
 cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-ln -s fedora-development-i386-core.cfg default.cfg
 
+%if %{?fedora}
+if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
+   	ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
+fi
+%endif
+
+# if we haven't created a default link yet, try to do so as devel
+if [ ! -f default.cfg ]; then
+    if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
+    else
+        ln -s fedora-development-i386-core.cfg default.cfg
+    fi
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +63,9 @@
 
 
 %changelog
+* Sun Jun 12 2005 Jeremy Katz <katzj at redhat.com> 
+- set default.cfg based on both arch and distro built for
+
 * Sat Jun 11 2005  Seth Vidal <skvidal at phy.duke.edu>
 - mock 0.3 - security release
 - mock-helper allowed execution of arbitrary commands by member of mock




More information about the fedora-extras-commits mailing list