SPECS: gubed.spec - fixed server bcond - others
glen
glen at pld-linux.org
Mon Jan 1 22:24:10 CET 2007
Author: glen Date: Mon Jan 1 21:24:09 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed server bcond
- others
---- Files affected:
SPECS:
gubed.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/gubed.spec
diff -u SPECS/gubed.spec:1.2 SPECS/gubed.spec:1.3
--- SPECS/gubed.spec:1.2 Sat Dec 30 20:18:16 2006
+++ SPECS/gubed.spec Mon Jan 1 22:23:59 2007
@@ -9,10 +9,10 @@
Summary: Gubed - a PHP debuger
Name: gubed
Version: 0.2.2
-Release: 0.5
+Release: 0.6
License: GPL
Group: Development/Languages/PHP
-Source0: http://dl.sourceforge.net/sourceforge/gubed/Gubed%{version}.tar.gz
+Source0: http://dl.sourceforge.net/gubed/Gubed%{version}.tar.gz
# Source0-md5: 16c5b36c24f701aaf5d5e8a553b7341e
Source1: %{name}-gtk.desktop
Source2: %{name}-x11.desktop
@@ -22,11 +22,11 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.268
%{?with_gtk2:BuildRequires: wxGTK2-devel}
%{?with_x11univ:BuildRequires: wxX11-devel}
-BuildRequires: rpmbuild(macros) >= 1.268
-Requires: webapps
Requires(triggerpostun): sed >= 4.0
+Requires: webapps
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _webapps /etc/webapps
@@ -69,6 +69,16 @@
%setup -q -n Gubed
%patch0 -p1
+%if %{with server}
+cat > apache.conf <<'EOF'
+Alias /%{name} %{_appdir}/ServerScripts
+<Directory %{_appdir}>
+ Order Allow,Deny
+ Allow from all
+</Directory>
+EOF
+%endif
+
%build
%if %{with gtk2}
cp -af Client{,-gtk2}
@@ -107,7 +117,8 @@
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure
+
%{__make}
cd ..
%endif
@@ -146,21 +157,13 @@
%endif
%if %{with server}
-cat > apache.conf <<'EOF'
-Alias /%{name} %{_appdir}/ServerScripts
-<Directory %{_appdir}>
- Order Allow,Deny
- Allow from all
-</Directory>
-EOF
-
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
-
install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a ServerScripts $RPM_BUILD_ROOT%{_appdir}
mv -f $RPM_BUILD_ROOT%{_appdir}/ServerScripts/localsettings_dist.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.php
+%endif
%triggerin server -- apache1 < 1.3.37-3, apache1-base
%webapp_register apache %{_webapp}
@@ -173,7 +176,6 @@
%triggerun server -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -197,6 +199,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gbdproxy
+%if %{with server}
%files server
%defattr(644,root,root,755)
%dir %attr(750,root,http) %{_sysconfdir}
@@ -204,6 +207,7 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
%{_appdir}
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -212,14 +216,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2007/01/01 21:23:59 glen
+- fixed server bcond
+- others
+
Revision 1.2 2006/12/30 19:18:16 twittner
- finished: added server subpkg. with server side scripts
- works with php-4.4.4
- with php-5.2.0 doesn't work - msg. from gubed client window:
- 20:13:57: Welcome to Gubed PHP Debugger
- 20:14:08: Warning: , line , error :
+ 20:13:57: Welcome to Gubed PHP Debugger
+ 20:14:08: Warning: , line , error :
Revision 1.1 2006/12/30 14:07:59 twittner
- added - NFY, builds & runs but I'm not able to get it working
(AFAIR I've managed to run this long time ago, maybe with php4?)
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gubed.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list