- don't use %{without ...}, it may not work after inverting bcond

[packages/changepassword.git] / changepassword.spec

diff --git a/changepassword.spec b/changepassword.spec
index c0d82359f7d1ffe85f5427a40dfcde141d01bd18..ff46e44fd762b1104204ecf10a3791816bd228ff 100644 (file)
--- a/changepassword.spec
+++ b/changepassword.spec
@@ -3,7 +3,7 @@
 %bcond_without samba   # without samba passwords support
 %bcond_without squid   # without squid passwords support
 
-#TODO
+# TODO
 # - move cgi binary to /usr/share/changepassword
 # - write changepassword.conf for apache redirection + execution
 # - get sources for libdes and compile then instead of using
@@ -19,7 +19,7 @@ Source0:      http://dl.sourceforge.net/changepassword/%{name}-%{version}.tar.gz
 # Source0-md5: 7449a80c65db2e37c0aa3bb709926127
 Source1:       pldlogo.png
 URL:           http://changepassword.sourceforge.net/
-Requires:      apache
+Requires:      webserver = apache
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _cgidir         /home/services/httpd/cgi-bin
@@ -45,10 +45,10 @@ cp %{SOURCE1} .
        --enable-logo=pldlogo.png \
        --enable-smbpasswd=%{_sysconfdir}/smbpasswd \
        --enable-squidpasswd=%{_sysconfdir}/squid/passwd \
-%if %{without samba}
+%if !%{with samba}
        --disable-smbpasswd \
 %endif
-%if %{without squid}
+%if !%{with squid}
        --disable-squidpasswd
 %endif
 
@@ -70,4 +70,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc BUGS CHANGELOG README TODO
 %lang(pt_BR) %doc README.brazilian
 %attr(755,root,root) %{_cgidir}/changepassword.cgi
-%attr(644,root,root) /home/services/httpd/html/pldlogo.png
+/home/services/httpd/html/pldlogo.png