X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-devel-native.spec;h=d0ecea38ef041e5ea72be5fe7b733da7e9f7d2ba;hb=89ede0c83d5ef88261e19b1aa969a1480179581e;hp=6249eb9ca47acd2685066facadccba74b8c0ff2c;hpb=24fef6922e8c6f3d25d2054efc98bbd6fdafedf1;p=myplc.git

diff --git a/myplc-devel-native.spec b/myplc-devel-native.spec
index 6249eb9..d0ecea3 100644
--- a/myplc-devel-native.spec
+++ b/myplc-devel-native.spec
@@ -41,13 +41,13 @@ Requires: gperf
 Requires: graphviz
 Requires: gzip
 Requires: httpd
-%if "%{fedora}" >= "7"
+%if "%{distroname}" == "Fedora" && "%{distrorelease}" >= "7"
 Requires: inotify-tools-devel
 %endif
 Requires: iptables
 Requires: less
 Requires: libpcap
-%if "%{fedora}" >= "6"
+%if ("%{distroname}" == "Fedora" && "%{distrorelease}" >= "6") || ("%{distroname}" == "CentOS" && "%{distrorelease}" >= "5")
 Requires: libpcap-devel
 %endif
 Requires: libtool
@@ -76,7 +76,7 @@ Requires: postgresql-python
 Requires: postgresql-server
 Requires: python
 Requires: python-devel
-%if "%{fedora}" >= "5"
+%if ("%{distroname}" == "Fedora" && "%{distrorelease}" >= "5") || ("%{distroname}" == "CentOS" && "%{distrorelease}" >= "5")
 Requires: python-pycurl
 Requires: python-psycopg2
 %endif
@@ -140,21 +140,42 @@ fi
 
 %post
 
+if [ -h "/sbin/new-kernel-pkg" ] ; then
+	filename=$(readlink -f /sbin/new-kernel-pkg)
+	if [ "$filename" == "/sbin/true"] ; then
+		echo "WARNING: /sbin/new-kernel-pkg symlinked to /sbin/true"
+		echo "\tmost likely /etc/rpm/macros has /sbin/new-kernel-pkg declared in _netsharedpath."
+		echo "\tPlease remove /sbin/new-kernel-pkg from _netsharedpath and reintall mkinitrd."
+		exit 1
+	fi
+fi
+
 uid=2000
 gid=2000
 
+# add a "build" user to the system
 builduser=$(grep "^build" /etc/passwd | wc -l)
 if [ $builduser -eq 0 ] ; then
 	groupadd -o -g $gid build;
 	useradd -o -c 'Automated Build' -u $uid -g $gid -n -M -s /bin/bash build;
 fi
 
+# myplc-devel on a shared box requires that we set up max loop devices
+for i in $(seq 0 255) ; do
+	mknod -m 640 /dev/loop$i b 7 $i
+done
+
 # Allow build user to build certain RPMs as root
 buildsudo=$(grep "^build.*ALL=(ALL).*NOPASSWD:.*ALL"  /etc/sudoers | wc -l)
 if [ $buildsudo -eq 0 ] ; then
 	echo "build   ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers
 fi
 
+# Don't requiretty for sudo. Needed to build myplc from cron job
+ttysudo=$(grep "^Defaults.*requiretty" /etc/sudoers | wc -l)
+if [ $ttysudo -eq 1 ] ; then
+	sed -i 's,^Defaults.*requiretty,#Defaults requiretty,' /etc/sudoers
+fi
 
 %preun
 # 0 = erase, 1 = upgrade