[Mageia-dev] [packages-commits] [230330] - fixed gtk makefile bug not allowing desktop file installation

Fri Apr 13 00:23:24 CEST 2012

-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+On 12/04/2012 16:17, Jani Välimaa wrote:
+> 2012/4/12  <root at mageia.org>:
+>> Revision 230330 Author matteo Date 2012-04-12 00:51:35 +0200
+>> (Thu, 12 Apr 2012)
+>> 
+>> Log Message
+>> 
+>> - fixed gtk makefile bug not allowing desktop file installation
+>> 
+>> Modified Paths
+>> 
+>> cauldron/scite/current/SPECS/scite.spec
+>> 
+>> Modified: cauldron/scite/current/SPECS/scite.spec 
+>> ===================================================================
+>>
+>> 
+- --- cauldron/scite/current/SPECS/scite.spec	2012-04-11 22:49:03 UTC (rev
+>> 230329) +++ cauldron/scite/current/SPECS/scite.spec	2012-04-11
+>> 22:51:35 UTC (rev 230330) @@ -9,9 +9,14 @@ # Patch0 available
+>> here: 
+>> http://sourceforge.net/tracker/index.php?func=detail&aid=3501321&group_id=2439&atid=102439
+>>
+>> 
+Patch0:		scintilla-scroll-mask.diff
+>> Patch1:		%{name}-desktopfile.patch +# missing gnomeprefix when
+>> building against gtk+3 +# if you don't want to apply the
+>> following patch, gtk+2-devel must be added as BR +Patch2:
+>> %{name}-gtk-makefile.patch + Url:
+>> http://www.scintilla.org/SciTE.html
+>> 
+>> BuildRequires:	gtk+3-devel +#BuildRequires:	gtk+2-devel 
+>> BuildRequires:	desktop-file-utils
+>> 
+>> %description @@ -23,6 +28,7 @@ %setup -q -c %patch0 -p1 -b
+>> .scrollmask %patch1 -p1 -b .desktopfile +%patch2 -p1 -b
+>> .gtkmakefile
+>> 
+>> %build %make OPTFLAGS="%{optflags}" GTK3=1 -C scintilla/gtk
+>> 
+> 
+> Another (and IMHO a bit better) way to fix this is just pass
+> GTK3=1 also to %makeinstall_std.
+Your way it's better. I removed patch2 and fixed %makeinstall_std
+arguments.
+I was making a mountain out of a molehill :-P
+Thank you
+- -- 
+Matteo
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
+
+iQEcBAEBAgAGBQJPh1XWAAoJED3LowjDDWbNJsgIALvHixZ3P+E9Hrw0/xZD4+L4
+jxg1Ofa95Th61lcCrWckyNh5UAScc1fng3oS2W9fZoF29Hz72/3V/H+qmEycFt1R
+VufMzw0NQC21cgmXFaGBS4ojodgVrCYqwlDxUqsZzPH5rhEyGmvpkmOf30IUk5Gk
+oQgK93tcuVbDXo5blk3pMa9hj285g9tOVJaHOWjFe0p34WlIF1Mz59NL8nIXrUDM
+zn6EBtzlIIQhMAAk5j5y5I5aIL2pvhC5irrJ+XV6WD3H6T6H0pRDP1aI+3AoYFB5
+bZHQ1hDpXHuumTeQADFxloFCvbPz872E2ZnAmqSkniSTG4Q19OtGQ/GeEdnQEOA=
+=im1q
+-----END PGP SIGNATURE-----
+