- actually use %{_prefix}/lib

[packages/dotnet-flickrnet.git] / dotnet-flickrnet.spec

diff --git a/dotnet-flickrnet.spec b/dotnet-flickrnet.spec
index 93a71fbdd81a5ef03da3173a0a2b74dd0d8f51f7..3f5342ad488791a3b03640d2e9119bfe2f847b79 100644 (file)
--- a/dotnet-flickrnet.spec
+++ b/dotnet-flickrnet.spec
@@ -1,15 +1,17 @@
 %include       /usr/lib/rpm/macros.mono
 Summary:       .NET support for Flickr
 Name:          dotnet-flickrnet
-Version:       2.1.5
-Release:       3
+Version:       2.2.0
+Release:       1
 License:       MIT
 Group:         Libraries
-Source0:       FlickrNet-25207.zip
-# Source0-md5: d20fe0d25a3888300f21e5ad3895c141
+Source0:       FlickrNet2.2-Src-48055.zip
+# Source0-md5: 534b3436762ce1bfb2568c9774340f0c
 Source1:       flickrnet.pc
 Patch0:                %{name}-assemblyinfo.patch
 URL:           http://www.codeplex.com/FlickrNet
+# FIXME: ugly workaround for broken patch handling in our CVS
+BuildRequires: dos2unix
 BuildRequires: mono-csharp >= 1.1.16.1
 BuildRequires: pkgconfig
 ExcludeArch:   i386
@@ -23,6 +25,7 @@ and Mono.
 
 %prep
 %setup -q -c -n FlickrNet
+dos2unix FlickrNet/AssemblyInfo.cs
 %patch0 -p1
 
 %build
@@ -31,15 +34,16 @@ gmcs -target:library -out:FlickrNet.dll -r:System.Web.dll *.cs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/pkgconfig/,%{_libdir}/mono/flickrnet-%{version}}
-install FlickrNet/FlickrNet.dll $RPM_BUILD_ROOT%{_libdir}/mono/flickrnet-%{version}
-install -Dm644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-sed -i "s/@VERSION@/%{version}/" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/flickrnet.pc
+install -d $RPM_BUILD_ROOT{%{_datadir}/pkgconfig/,%{_prefix}/lib/mono/flickrnet-%{version}}
+install FlickrNet/FlickrNet.dll $RPM_BUILD_ROOT%{_prefix}/lib/mono/flickrnet-%{version}
+install -Dm644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
+sed -i "s/@VERSION@/%{version}/" $RPM_BUILD_ROOT%{_datadir}/pkgconfig/flickrnet.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/mono/flickrnet-%{version}/*.dll
-%{_pkgconfigdir}/flickrnet.pc
+%dir %{_prefix}/lib/mono/flickrnet-%{version}
+%{_prefix}/lib/mono/flickrnet-%{version}/*.dll
+%{_datadir}/pkgconfig/flickrnet.pc