- 0.19

Changed files:
    monodevelop-MOZILLA_FIVE_HOME.patch -> 1.12
    monodevelop-desktop.patch -> 1.6
    monodevelop-libdir.patch -> 1.9
    monodevelop.spec -> 1.60

diff --git a/monodevelop-MOZILLA_FIVE_HOME.patch b/monodevelop-MOZILLA_FIVE_HOME.patch
index e70753393bca6c2d2a712c1f368908114268b765..629694aaccc2dcd81a5fff8ec27af31708d30394 100644 (file)
--- a/monodevelop-MOZILLA_FIVE_HOME.patch
+++ b/monodevelop-MOZILLA_FIVE_HOME.patch
@@ -1,6 +1,6 @@
 --- monodevelop-0.18/monodevelop.in~   2007-12-19 16:47:09.004304700 +0100
 +++ monodevelop-0.18/monodevelop.in    2007-12-19 16:48:28.498841222 +0100
-@@ -16,41 +16,7 @@
+@@ -16,42 +16,7 @@
      echo "$ret"
  }
  
@@ -18,6 +18,7 @@
 -      mozilla_script=$(which mozilla 2> /dev/null)
 -      firefox_script=$(which firefox 2> /dev/null)
 -      
+-      if [ -z $mozilla_script ] && [ -z $firefox_script ]; then return; fi
 -      for runtime_script in "$firefox_script $mozilla_script"; do
 -              MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
 -              if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi

diff --git a/monodevelop-desktop.patch b/monodevelop-desktop.patch
index e95983ffd46d706a6e42a021bba5971d78eca32b..cfa639e32d6df487ce980856f986ae5a9d987acd 100644 (file)
--- a/monodevelop-desktop.patch
+++ b/monodevelop-desktop.patch
@@ -1,7 +1,7 @@
 diff -ur monodevelop-0.10/monodevelop.desktop monodevelop-0.10-desktop_patch/monodevelop.desktop
 --- monodevelop-0.10/monodevelop.desktop       2006-04-04 21:29:37.000000000 +0200
 +++ monodevelop-0.10-desktop_patch/monodevelop.desktop 2006-04-05 18:13:56.000000000 +0200
-@@ -3,15 +3,17 @@
+@@ -3,7 +3,9 @@
  Encoding=UTF-8
  Name=MonoDevelop
  GenericName=Integrated Development Environment
@@ -10,13 +10,12 @@ diff -ur monodevelop-0.10/monodevelop.desktop monodevelop-0.10-desktop_patch/mon
 +Comment[pl]=Rozwijaj aplikacje .NET w Zintegrowanym Środowisku Programistycznym
  Exec=monodevelop
  TryExec=monodevelop
--Icon=monodevelop.png
-+Icon=monodevelop
- StartupNotify=true
+ Icon=monodevelop
+@@ -11,7 +11,7 @@
  Terminal=false
  Type=Application
- MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;
--Categories=Application;Development;
+ MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;application/x-csproj;application/x-vbproj;application/x-sln;
+-Categories=Development;
 +Categories=GTK;GNOME;Development;IDE;
  X-GNOME-Bugzilla-Bugzilla=Ximian
  X-GNOME-Bugzilla-Product=MonoDevelop

diff --git a/monodevelop-libdir.patch b/monodevelop-libdir.patch
index d14b2c0fd6a11485c54bc74b5cc13a67891d1ae2..1d57d4446a2daaa19ca449032e37bc2b408152cd 100644 (file)
--- a/monodevelop-libdir.patch
+++ b/monodevelop-libdir.patch
@@ -22,22 +22,20 @@
  if ENABLE_UPDATE_MIMEDB
 --- monodevelop/mdtool.in~     2007-12-18 20:11:34.000000000 +0100
 +++ monodevelop/mdtool.in      2007-12-19 16:53:48.476849862 +0100
-@@ -16,12 +16,12 @@
+@@ -16,11 +16,10 @@
      echo "$ret"
  }
   
 -MD_BIN_PATH=@prefix@/lib/monodevelop/bin
 +MD_BIN_PATH=@libdir@/monodevelop/bin
  
+ ### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and monodevelop.in
+-MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
+-if test -d /usr/lib64; then MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/; fi
++MD_PKG_CONFIG_PATH=@libdir@/pkgconfig/
+ ### END BLOCK
+ 
  if [ -n $PKG_CONFIG_PATH ]; then
--      export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@gtksharp_prefix@/lib/pkgconfig/
-+      export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@libdir@/pkgconfig/
- else
--      export PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/
-+      export PKG_CONFIG_PATH=@libdir@/pkgconfig/
- fi
- 
- ARGS=`reWrite "$@"`
 --- monodevelop/monodevelop.pc.in~     2007-12-18 20:11:34.000000000 +0100
 +++ monodevelop/monodevelop.pc.in      2007-12-19 16:54:14.475063064 +0100
 @@ -1,6 +1,6 @@

diff --git a/monodevelop.spec b/monodevelop.spec
index 5bb07791aaa7ec1c6a1d52d6be1f5da8aab7b218..fa993ae5ee7aab1fe06bd0c733b75a124cc69e2c 100644 (file)
--- a/monodevelop.spec
+++ b/monodevelop.spec
@@ -14,15 +14,14 @@
 Summary:       Mono IDE
 Summary(pl.UTF-8):     IDE dla Mono
 Name:          monodevelop
-Version:       0.18.1
-Release:       2
+Version:       0.19
+Release:       1
 License:       GPL/MIT
 Group:         Development/Tools
 #Source0Download: http://go-mono.com/sources-stable/
 Source0:       http://go-mono.com/sources/monodevelop/%{name}-%{version}.tar.bz2
-# Source0-md5: 3d3c9c717e2fb809c7880a8a9efd8178
+# Source0-md5: 420d7aa9608771477156353eceb3b0c8
 Patch0:                %{name}-MOZILLA_FIVE_HOME.patch
-Patch1:                %{name}-locale_names.patch
 Patch2:                %{name}-desktop.patch
 Patch3:                %{name}-install.patch
 Patch4:                %{name}-libdir.patch
@@ -47,6 +46,7 @@ BuildRequires:        sed >= 4.0
 BuildRequires: shared-mime-info
 %{?with_asp:BuildRequires:     xsp}
 Requires(post,postun): desktop-file-utils
+Requires(post,postun): hicolor-icon-theme
 Requires:      gtkhtml
 #%ifarch %{x8664} ia64 ppc64 s390x sparc64
 #Requires:     libgtkembedmoz.so()(64bit)
@@ -102,16 +102,12 @@ możliwości, a wśród nich:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-mv po/sl{_SI,}.po
-
 %build
 rm -rf autom4te.cache
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__automake}
@@ -139,10 +135,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_desktop_database_post
 %update_mime_database
+%update_icon_cache hicolor
 
 %postun
 %update_desktop_database_postun
 %update_mime_database
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -151,6 +149,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}
 %{_datadir}/mime/packages/*
 %{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
 %{_pkgconfigdir}/*
+%{_iconsdir}/hicolor/*/apps/monodevelop.png
+%{_iconsdir}/hicolor/*/apps/monodevelop.svg
 %{_mandir}/man1/mdtool.1*
+%{_mandir}/man1/monodevelop.1*