[xsp] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org
Christian Krause
chkr at fedoraproject.org
Sat Nov 12 10:11:35 UTC 2011
commit 82238cafb1e6054bdc6a765c1a97bd50e3ee4cc0
Author: Christian Krause <chkr at fedoraproject.org>
Date: Sat Nov 12 11:11:30 2011 +0100
Change paths for mono assemblies according to updated packaging
guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
xsp.spec | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/xsp.spec b/xsp.spec
index c6f4586..e174292 100644
--- a/xsp.spec
+++ b/xsp.spec
@@ -1,6 +1,6 @@
Name: xsp
Version: 2.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
URL: http://www.mono-project.com/Main_Page
Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -39,26 +39,19 @@ Files for testing the xsp server
%prep
%setup -q
-find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
- -or -name \*.make -or -name \*.in -or -name \*.ac \
- | while read f ;
- do
- sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
- sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f"
- sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
- sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f"
- sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
- done
autoreconf -I build/m4/shamrock -I build/m4/shave
%build
-%configure
+%configure --libdir=%{_prefix}/lib
make
%install
make DESTDIR=%{buildroot} install
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+
%files
%defattr(-, root, root,-)
%doc NEWS README COPYING
@@ -67,20 +60,20 @@ make DESTDIR=%{buildroot} install
%{_bindir}/mod-mono*
%{_bindir}/xsp*
%{_bindir}/fastcgi-mono-server*
-%{_libdir}/xsp
-%{_libdir}/mono/gac/Mono.WebServer*/
-%{_libdir}/mono/gac/fastcgi-mono-server2
-%{_libdir}/mono/gac/mod-mono-server*/
-%{_libdir}/mono/gac/xsp*/
-%{_libdir}/mono/2.0/*.dll
-%{_libdir}/mono/2.0/*.exe
-%{_libdir}/monodoc/sources/Mono.WebServer.*
-%{_libdir}/monodoc/sources/Mono.FastCGI.*
-%{_libdir}/mono/4.0/Mono.WebServer2.dll
-%{_libdir}/mono/4.0/fastcgi-mono-server4.exe
-%{_libdir}/mono/4.0/mod-mono-server4.exe
-%{_libdir}/mono/4.0/xsp4.exe
-%{_libdir}/mono/gac/fastcgi-mono-server4
+%{_prefix}/lib/xsp
+%{_prefix}/lib/mono/gac/Mono.WebServer*/
+%{_prefix}/lib/mono/gac/fastcgi-mono-server2
+%{_prefix}/lib/mono/gac/mod-mono-server*/
+%{_prefix}/lib/mono/gac/xsp*/
+%{_prefix}/lib/mono/2.0/*.dll
+%{_prefix}/lib/mono/2.0/*.exe
+%{_prefix}/lib/monodoc/sources/Mono.WebServer.*
+%{_prefix}/lib/monodoc/sources/Mono.FastCGI.*
+%{_prefix}/lib/mono/4.0/Mono.WebServer2.dll
+%{_prefix}/lib/mono/4.0/fastcgi-mono-server4.exe
+%{_prefix}/lib/mono/4.0/mod-mono-server4.exe
+%{_prefix}/lib/mono/4.0/xsp4.exe
+%{_prefix}/lib/mono/gac/fastcgi-mono-server4
%{_mandir}/man1/asp*
%{_mandir}/man1/dbsessmgr*
%{_mandir}/man1/mod-mono-server*
@@ -93,10 +86,14 @@ make DESTDIR=%{buildroot} install
%files tests
%defattr(-, root, root,-)
-%{_libdir}/xsp/2.0
-%{_libdir}/xsp/test
+%{_prefix}/lib/xsp/2.0
+%{_prefix}/lib/xsp/test
%changelog
+* Sat Nov 12 2011 Christian Krause <chkr at fedoraproject.org> - 2.10.2-2
+- Change paths for mono assemblies according to updated packaging
+ guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
* Wed Apr 27 2011 Christian Krause <chkr at fedoraproject.org> - 2.10.2-1
- Update to 2.10.2
More information about the scm-commits
mailing list