rpms/njb-sharp/devel njb-sharp.spec,1.1,1.2

Linus Walleij (snirkel) fedora-extras-commits at redhat.com
Sat Dec 2 21:05:28 UTC 2006


Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29080

Modified Files:
	njb-sharp.spec 
Log Message:
Dropping FC-5



Index: njb-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/devel/njb-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- njb-sharp.spec	22 Nov 2006 19:48:01 -0000	1.1
+++ njb-sharp.spec	2 Dec 2006 21:04:58 -0000	1.2
@@ -1,14 +1,6 @@
-# This is only a temporary fix until FC5 is brought in
-# line with FC6.
-%if "%{?fedora}" == "5"
-%define monodir %{_prefix}/lib
-%else
-%define monodir %{_libdir}
-%endif
-
 Name: 		njb-sharp
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://banshee-project.org/Subprojects/Njb-sharp
 Summary:	C sharp library to control the Nomad jukebox database
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
@@ -35,9 +27,7 @@
 
 %prep
 %setup -q
-%if "%{?fedora}" > "5"
 %patch0 -p1
-%endif
 
 %build
 %configure
@@ -48,11 +38,11 @@
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-rm -f %{buildroot}%{monodir}/%{name}/*.a
-cat > %{buildroot}%{monodir}/%{name}/%{name}.dll.config << EOF
+rm -f %{buildroot}%{_libdir}/%{name}/*.a
+cat > %{buildroot}%{_libdir}/%{name}/%{name}.dll.config << EOF
 <configuration>
   <dllmap dll="libnjb" target="libnjb.so.5">
-  <dllmap dll="libnjbglue" target="%{monodir}/%{name}/libnjbglue.so">
+  <dllmap dll="libnjbglue" target="%{_libdir}/%{name}/libnjbglue.so">
 </configuration>
 EOF
 
@@ -69,14 +59,17 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{monodir}/%{name}
-%{monodir}/monodoc/sources/*
+%{_libdir}/%{name}
+%{_libdir}/monodoc/sources/*
 
 %files devel
 %defattr(-,root,root)
-%{monodir}/pkgconfig/*
+%{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Dec 2 2006 Linus Walleij <triad at df.lth.se> 0.3.0-6
+- Dropping FC-5, it's too broken in monoland.
+
 * Sat Oct 21 2006 Linus Walleij <triad at df.lth.se> 0.3.0-5
 - More picking around in the spec...
 




More information about the fedora-extras-commits mailing list