Author: qboosh                       Date: Mon Mar  7 21:46:51 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed one more x86ism (builds now); unified pre script, release 2

---- Files affected:
SPECS:
   maradns.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/maradns.spec
diff -u SPECS/maradns.spec:1.31 SPECS/maradns.spec:1.32
--- SPECS/maradns.spec:1.31     Sun Mar  6 13:46:42 2005
+++ SPECS/maradns.spec  Mon Mar  7 22:46:44 2005
@@ -3,7 +3,7 @@
 Summary(pl):   Tylko autorytatywny (na razie) serwer DNS zrobiony z myślą o 
bezpieczeństwie
 Name:          maradns
 Version:       1.1.29
-Release:       1
+Release:       2
 License:       Public Domain
 Group:         Networking/Daemons
 Source0:       http://www.maradns.org/download/1.1/%{name}-%{version}.tar.bz2
@@ -65,7 +65,7 @@
 %patch0 -p1
 
 # kill precompiled x86 objects
-rm -f {qual,tcp}/*.o
+rm -f {parse,qual,tcp}/*.o
 
 %build
 %{__make} \
@@ -102,8 +102,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`getgid named`" ]; then
-       if [ "`getgid named`" != "58" ]; then
+if [ -n "`/usr/bin/getgid named`" ]; then
+       if [ "`/usr/bin/getgid named`" != "58" ]; then
                echo "Error: group named doesn't have gid=58. Correct this 
before installing maradns." 1>&2
                exit 1
        fi
@@ -114,13 +114,13 @@
                /usr/sbin/groupadd -g 58 named
        fi
 fi
-if [ -n "`id -u named 2>/dev/null`" ]; then
-       if [ "`id -u named`" != "58" ]; then
+if [ -n "`/bin/id -u named 2>/dev/null`" ]; then
+       if [ "`/bin/id -u named`" != "58" ]; then
                echo "Error: user named doesn't have uid=58. Correct this 
before installing maradns." 1>&2
                exit 1
        fi
 else
-       if [ -n "`id -u maradns 2>/dev/null`" -a "`id -u maradns`" = "58" ]; 
then
+       if [ -n "`/bin/id -u maradns 2>/dev/null`" -a "`/bin/id -u maradns`" = 
"58" ]; then
                /usr/sbin/usermod -d /tmp -l named maradns
        else
                /usr/sbin/useradd -u 58 -g 58 -d /tmp -s /bin/false -c "maraDNS 
user" named
@@ -202,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2005/03/07 21:46:44  qboosh
+- killed one more x86ism (builds now); unified pre script, release 2
+
 Revision 1.31  2005/03/06 12:46:42  darekr
 - missing manual
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/maradns.spec?r1=1.31&r2=1.32&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to