- updated to 3.0.3; -devel no longer conflicts with 0.x

- updated monodir patch

diff --git a/dotnet-notify-sharp3.spec b/dotnet-notify-sharp3.spec
index 192d823d035883584081090d1e2e61178189a509..132bfecf934f26833560ca454da6038d82939669 100644 (file)
--- a/dotnet-notify-sharp3.spec
+++ b/dotnet-notify-sharp3.spec
@@ -2,12 +2,12 @@
 Summary:       C# client implementation for Desktop Notifications
 Summary(pl.UTF-8):     Implementacja C# klienta usługi Desktop Notifications
 Name:          dotnet-notify-sharp3
-Version:       3.0.0
+Version:       3.0.3
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       https://www.meebey.net/projects/notify-sharp/downloads/notify-sharp-%{version}.tar.gz
-# Source0-md5: f3d84da137f6812ebada48c9adeaf01e
+# Source0-md5: 827ad0436e6540a8b9f621c3fa77e137
 Patch0:                monodir.patch
 URL:           https://www.meebey.net/projects/notify-sharp/
 BuildRequires: autoconf >= 2.50
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_prefix}/lib/mono/notify-sharp
-%{_prefix}/lib/mono/notify-sharp/notify-sharp.dll
+%dir %{_prefix}/lib/mono/notify-sharp-3.0
+%{_prefix}/lib/mono/notify-sharp-3.0/notify-sharp.dll
 %{_prefix}/lib/monodoc/sources/notify-sharp-3-docs.*
 %{_pkgconfigdir}/notify-sharp-3.0.pc

diff --git a/monodir.patch b/monodir.patch
index f42d19888190517268fe229f659e910cf49ab438..8a76b83ac91a3a8c5dd1b54e75302cd8b703875b 100644 (file)
--- a/monodir.patch
+++ b/monodir.patch
@@ -1,21 +1,21 @@
---- notify-sharp-0.4.0/src/Makefile.am~        2007-06-11 19:45:45.000000000 +0200
-+++ notify-sharp-0.4.0/src/Makefile.am 2009-01-30 09:57:10.494082466 +0100
+--- notify-sharp-3.0.3/src/Makefile.am.orig    2014-12-27 15:44:37.680518762 +0100
++++ notify-sharp-3.0.3/src/Makefile.am 2014-12-27 15:51:06.313835786 +0100
 @@ -20,14 +20,14 @@
  
  install-data-local:
        @if test -n '$(TARGET)'; then                       \
 -          echo "$(GACUTIL) /i $(TARGET) /f /gacdir $(DESTDIR)$(libdir)";    \
--          $(GACUTIL) /i $(TARGET) /package $(ASSEMBLY) /f /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
+-          $(GACUTIL) /i $(TARGET) /package $(ASSEMBLY)-$(API_VERSION) /f /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
 +          echo "$(GACUTIL) /i $(TARGET) /f /gacdir $(DESTDIR)$(prefix)/lib";    \
-+          $(GACUTIL) /i $(TARGET) /package $(ASSEMBLY) /f /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1; \
++          $(GACUTIL) /i $(TARGET) /package $(ASSEMBLY)-$(API_VERSION) /f /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1; \
          fi
  
  uninstall-local:
        @if test -n '$(TARGET)'; then                       \
 -          echo "$(GACUTIL) /u $(ASSEMBLY) /gacdir $(DESTDIR)$(libdir)";  \
--          $(GACUTIL) /u $(ASSEMBLY) /package $(ASSEMBLY) /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
+-          $(GACUTIL) /u $(ASSEMBLY) /package $(ASSEMBLY)-$(API_VERSION) /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
 +          echo "$(GACUTIL) /u $(ASSEMBLY) /gacdir $(DESTDIR)$(prefix)/lib";  \
-+          $(GACUTIL) /u $(ASSEMBLY) /package $(ASSEMBLY) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1;   \
++          $(GACUTIL) /u $(ASSEMBLY) /package $(ASSEMBLY)-$(API_VERSION) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib || exit 1;   \
          fi
  
  EXTRA_DIST = \