- added pic,nolibnsl patches, fixed dglib_fix_so patch

- cleanups, pl description, removed COPYING (just GPL)
- release .0.3

Changed files:
    dgee.spec -> 1.11

diff --git a/dgee.spec b/dgee.spec
index 76fbe6d6b2b2fbb49f45a29a83efbeb5e8f2f2bc..28c3824edd6a10754849be4b57c95a38914321f6 100644 (file)
--- a/dgee.spec
+++ b/dgee.spec
@@ -8,9 +8,12 @@
 %define         apxs   /usr/sbin/apxs
 %define                _rel    2
 Summary:       The DotGNU Execution Environment Core
+Summary(pl):   Podstawa ¶rodowiska wykonawczego DotGNU
 Name:          dgee
 Version:       0.1.6
-Release:       %{_rel}.0.2
+Release:       %{_rel}.0.3
+License:       GPL
+Group:         Networking/Daemons
 Source0:       http://www.nfluid.com/download/src/%{name}-%{version}-%{_rel}.tgz
 # Source0-md5: a2573a076832c4c7212479cabda15eff
 Source1:       %{name}.init
@@ -19,38 +22,49 @@ Patch0:             %{name}-DESTDIR.patch
 Patch1:                %{name}-apache.patch
 Patch2:                %{name}-dglib_fix_so.patch
 Patch3:                %{name}-pythonvm.patch
-License:       GPL
-Vendor:                DotGNU
-Group:         Networking/Daemons
+Patch4:                %{name}-pic.patch
+Patch5:                %{name}-nolibnsl.patch
+URL:           http://www.dotgnu.org/dgee.html
 BuildRequires: apache-devel
+BuildRequires: autoconf >= 2.13
+BuildRequires: automake
 BuildRequires: expat-devel
 BuildRequires: goldwater-devel => 0.3.4
 BuildRequires: phlib-devel => 1.20
 BuildRequires: pnet-devel => 0.6.0-2
 BuildRequires: %{apxs}
-Requires:      apache
-Requires:      goldwater
+Requires(post):        /sbin/ldconfig
 Requires(post,preun):  %{apxs}
 Requires(post,preun):   /sbin/chkconfig
-Requires(post,postun):  /sbin/ldconfig
+Requires:      apache
+Requires:      goldwater
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The core DotGNU Execution Environment that provides the functionality
 of accepting, validating and satisfying web service requests.
 
+%description -l pl
+Ten pakiet zawiera podstawê ¶rodowiska wykonawczego DotGNU (DotGNU
+Execution Environment) dostarczaj±c± funkcjonalno¶æ przyjmowania,
+sprawdzania poprawno¶ci i wykonywania ¿±dañ us³ug WWW.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
+       cflags=our \
        --with-goldwater=%{_prefix} \
        --with-pnet=%{_prefix} \
        --with-repository=/var/lib/%{name} \
@@ -73,6 +87,7 @@ of accepting, validating and satisfying web service requests.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %if %{with apache1}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT 
@@ -81,13 +96,14 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        APACHE=
 %endif
+
 # Thise files should be installed by Makefile (I can't fix it):
 install cslib/DotGNU/DGEE/DotGNU.DGEE.dll \
-       $RPM_BUILD_ROOT/%{_libdir}/%{name}
+       $RPM_BUILD_ROOT%{_libdir}/%{name}
 install cslib/System/Web/Services/System.Web.Services.dll \
-       $RPM_BUILD_ROOT/%{_libdir}/%{name}
+       $RPM_BUILD_ROOT%{_libdir}/%{name}
 install cslib/DotGNU/DGEE/Protocols/XmlRpc/XmlRpcService.exe \
-       $RPM_BUILD_ROOT/%{_libdir}/%{name}
+       $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 install -d $RPM_BUILD_ROOT/var/lib/%{name}/{index,data}
 install -d $RPM_BUILD_ROOT/var/log/%{name}
@@ -98,8 +114,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 %if %{with apache1}
 if [ -f /etc/httpd/httpd.conf ] && \
     ! grep -q "^Include.*/mod_dgee.conf" /etc/httpd/httpd.conf; then
@@ -112,8 +131,6 @@ if [ -f /var/lock/subsys/httpd ]; then
         /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
-/sbin/ldconfig
-
 if [ -f /var/lock/subsys/dgee ]; then
         /etc/rc.d/init.d/dgee restart 1>&2
 else
@@ -139,23 +156,19 @@ if [ "$1" = "0" ]; then
         /sbin/chkconfig --del dgee
 fi
 
-%postun
-/sbin/ldconfig
-
-%clean
-#rm -rf $RPM_BUILD_ROOT
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc BINARYINSTALL INSTALL QUICKSTART README COPYING
+%doc BINARYINSTALL INSTALL QUICKSTART README
 %attr(755,root,root) %{_bindir}/*
-%config %{_sysconfdir}/%{name}*
+%attr(755,root,root) %{_libdir}/libdgee.so.*.*
+%attr(755,root,root) %{_libdir}/libdgxml.so.*.*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*
-%{_libdir}/libdgee.*
-%{_libdir}/libdgxml.*
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}*
 %if %{with apache1}
-%config %{_sysconfdir}/httpd/mod_%{name}.conf
+%config %verify(not size mtime md5) %{_sysconfdir}/httpd/mod_%{name}.conf
 %{_libdir}/apache/mod_%{name}.so
 %else
 #%config %{_sysconfdir}/httpd/mod_%{name}.conf
@@ -167,8 +180,4 @@ fi
 %attr(730,root,http) %dir /var/log/%{name}
 %attr(660,root,http) /var/log/%{name}/*
 %attr(750,root,root) %dir /var/log/archiv/%{name}
-%attr(640,root,root) %config(noreplace) /etc/logrotate.d/*
-
-# Local variables:
-# mode: rpm-spec
-# end:
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*