commit xsp for openSUSE:Factory
Hello community, here is the log from the commit of package xsp for openSUSE:Factory checked in at Tue Apr 7 14:18:40 CEST 2009. -------- --- xsp/xsp.changes 2008-10-01 23:17:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/xsp/xsp.changes 2009-03-31 21:42:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 31 13:40:45 MDT 2009 - ajorgensen@novell.com + +- Update to 2.4 + * http://www.mono-project.com/Release_Notes_Mono_2.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xsp-2.0.tar.bz2 New: ---- xsp-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.X14382/_old 2009-04-07 14:18:32.000000000 +0200 +++ /var/tmp/diff_new_pack.X14382/_new 2009-04-07 14:18:32.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xsp (Version 2.0) +# spec file for package xsp (Version 2.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,26 +20,24 @@ Name: xsp Url: http://go-mono.com/ -License: GPL v2 or later +License: X11/MIT Group: Productivity/Networking/Web/Servers AutoReqProv: on -Version: 2.0 -Release: 13 +Version: 2.4 +Release: 1 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.bz2 -#Patch: xsp-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: mono-data-oracle mono-data-sqlite mono-devel mono-extras mono-jscript mono-nunit mono-web pkgconfig -# One of the test runs requires this -BuildRequires: sqlite -# This must be manually entered according to xsp's protocol version -# Since this package is currently noarch, and mod_mono's name is different -# on different distros, we can't use this... yet -#Requires: mod_mono >= %{version} +BuildRequires: mono-data-oracle mono-devel mono-jscript mono-nunit mono-web pkgconfig sqlite ##### suse #### %if 0%{?suse_version} +PreReq: %insserv_prereq %fillup_prereq %define old_suse_buildrequires mono-data mono-winforms +%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services +%if %suse_version == 1000 +BuildRequires: %{old_suse_buildrequires} +%endif %if %sles_version == 9 BuildRequires: %{old_suse_buildrequires} %endif @@ -48,6 +46,9 @@ %if 0%{?fedora_version} || 0%{?rhel_version} %define env_options export MONO_SHARED_DIR=/tmp %endif +%define xspConfigsLocation %{_sysconfdir}/xsp/2.0 +%define xspAvailableApps %{xspConfigsLocation}/applications-available +%define xspEnabledApps %{xspConfigsLocation}/applications-enabled %description The XSP server is a small Web server that hosts the Mono System.Web @@ -64,24 +65,53 @@ ./configure --prefix=%{_prefix} \ --libexecdir=%{_prefix}/lib \ --libdir=%{_prefix}/lib \ - --mandir=%{_prefix}/share/man \ - --infodir=%{_prefix}/share/info \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir} make %install %{?env_options} -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p ${RPM_BUILD_ROOT}/usr/share -mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig ${RPM_BUILD_ROOT}/usr/share +make install DESTDIR=%{buildroot} +rm -rf %{buildroot}%{_prefix}/lib/xsp/unittests +mkdir -p %{buildroot}%{_datadir} +mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_datadir} +%if 0%{?suse_version} +mkdir -p %{buildroot}/%{_fwdefdir} +mkdir -p %{buildroot}/%{xspAvailableApps} +mkdir -p %{buildroot}/%{xspEnabledApps} +mkdir -p %{buildroot}/etc/init.d/ +mkdir -p %{buildroot}/etc/logrotate.d/ +mkdir -p %{buildroot}/srv/xsp2 +mkdir -p %{buildroot}/var/adm/fillup-templates +mkdir -p %{buildroot}/var/run/xsp2 +install -m 644 man/mono-asp-apps.1 %{buildroot}%{_mandir}/man1/mono-asp-apps.1 +install -m 644 packaging/opensuse/sysconfig.xsp2 %{buildroot}/var/adm/fillup-templates +install -m 644 packaging/opensuse/xsp2.fw %{buildroot}/%{_fwdefdir}/xsp2 +install -m 644 packaging/opensuse/xsp2.logrotate %{buildroot}/etc/logrotate.d/xsp2 +install -m 755 packaging/opensuse/xsp2.init %{buildroot}/etc/init.d/xsp2 +install -m 755 tools/mono-asp-apps/mono-asp-apps %{buildroot}%{_bindir}/mono-asp-apps +%endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} +%if 0%{?suse_version} + +%post +%{fillup_and_insserv -n xsp2 xsp2} + +%preun +%stop_on_removal xsp2 + +%postun +%restart_on_update xsp2 +%{insserv_cleanup} +%endif %files %defattr(-,root,root) -%{_prefix}/bin/* -%{_prefix}/share/pkgconfig/* +%{_bindir}/* +%{_datadir}/pkgconfig/* %{_prefix}/share/man/*/* %{_prefix}/lib/xsp %{_prefix}/lib/mono/gac/Mono.WebServer @@ -100,15 +130,27 @@ %{_prefix}/lib/mono/1.0/fastcgi-mono-server.exe %{_prefix}/lib/mono/gac/fastcgi-mono-server2 %{_prefix}/lib/mono/2.0/fastcgi-mono-server2.exe +%if 0%{?suse_version} +%config %{_fwdefdir}/xsp2 +%config /etc/init.d/xsp2 +%config /etc/logrotate.d/xsp2 +/var/adm/fillup-templates/* +%attr(0711,wwwrun,www) /srv/xsp2 +%attr(0711,wwwrun,www) /var/run/xsp2 +%{_sysconfdir}/%{name} +%endif %doc NEWS README %if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif -%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' +%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort -u' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort -u' %changelog +* Tue Mar 31 2009 ajorgensen@novell.com +- Update to 2.4 + * http://www.mono-project.com/Release_Notes_Mono_2.4 * Wed Oct 01 2008 ajorgensen@novell.com - Update to 2.0 RC4 * Fixes bnc#431121 ++++++ xsp-2.0.tar.bz2 -> xsp-2.4.tar.bz2 ++++++ ++++ 3069 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de