From: Mamoru T. <nu...@co...> - 2017-12-07 00:57:48
|
Mamoru TASAKA 2017-12-05 23:54:14 +0900 (Tue, 05 Dec 2017) New Revision: e15751814c459b8a07f6f06fd55358f5b957ca42 https://github.com/ruby-gnome2/ruby-gnome2/commit/e15751814c459b8a07f6f06fd55358f5b957ca42 Merged 36d452c: Merge pull request #1117 from mtasaka/pkgconfig-fedora-style Message: Use pkgconfig(foo) virtual provides for Red Hat based dependency Modified files: atk/dependency-check/Rakefile clutter-gstreamer/dependency-check/Rakefile clutter-gtk/dependency-check/Rakefile clutter/dependency-check/Rakefile gdk3/dependency-check/Rakefile gdk_pixbuf2/dependency-check/Rakefile goffice/dependency-check/Rakefile gsf/dependency-check/Rakefile gtksourceview3/dependency-check/Rakefile poppler/dependency-check/Rakefile rsvg2/dependency-check/Rakefile vte3/dependency-check/Rakefile webkit-gtk/dependency-check/Rakefile webkit2-gtk/dependency-check/Rakefile Modified: atk/dependency-check/Rakefile (+1 -1) =================================================================== --- atk/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (7692303cc) +++ atk/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (99ac8ff02) @@ -32,7 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("atk") unless NativePackageInstaller.install(:altlinux => "libatk-devel", :debian => "libatk1.0-dev", - :redhat => "atk-devel", + :redhat => "pkgconfig(atk)", :arch => "atk", :homebrew => "atk", :macports => "atk", Modified: clutter-gstreamer/dependency-check/Rakefile (+1 -0) =================================================================== --- clutter-gstreamer/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (db367a7f1) +++ clutter-gstreamer/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (b03362fb2) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("clutter-gst-3.0") unless NativePackageInstaller.install(:debian => "libclutter-gst-3.0-dev", + :redhat => "pkgconfig(clutter-gst-3.0)", :homebrew => "clutter-gst", :msys2 => "clutter-gst") exit(false) Modified: clutter-gtk/dependency-check/Rakefile (+1 -0) =================================================================== --- clutter-gtk/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (7a8f0482d) +++ clutter-gtk/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (d232e8169) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("clutter-gtk-1.0") unless NativePackageInstaller.install(:debian => "libclutter-gtk-1.0-dev", + :redhat => "pkgconfig(clutter-gtk-1.0)", :homebrew => "clutter-gtk", :msys2 => "clutter-gtk") exit(false) Modified: clutter/dependency-check/Rakefile (+1 -0) =================================================================== --- clutter/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (671ce0c36) +++ clutter/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (cd6c21fde) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("clutter-1.0") unless NativePackageInstaller.install(:debian => "libclutter-1.0-dev", + :redhat => "pkgconfig(clutter-1.0)", :homebrew => "clutter", :msys2 => "clutter") exit(false) Modified: gdk3/dependency-check/Rakefile (+1 -1) =================================================================== --- gdk3/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (24145228b) +++ gdk3/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (16b6527f7) @@ -32,7 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("gdk-3.0") unless NativePackageInstaller.install(:altlinux => "libgtk+3-devel", :debian => "libgtk-3-dev", - :redhat => "gtk3-devel", + :redhat => "pkgconfig(gdk-3.0)", :homebrew => "gtk+3", :macports => "gtk3", :msys2 => "gtk3") Modified: gdk_pixbuf2/dependency-check/Rakefile (+1 -2) =================================================================== --- gdk_pixbuf2/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (1efc53ecb) +++ gdk_pixbuf2/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (315d8cb2e) @@ -32,8 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("gdk-pixbuf-2.0") unless NativePackageInstaller.install(:altlinux => "gdk-pixbuf-devel", :debian => "libgdk-pixbuf2.0-dev", - :redhat => "gtk2-devel", - :fedora => "gdk-pixbuf2-devel", + :redhat => "pkgconfig(gdk-pixbuf-2.0)", :arch => "gdk-pixbuf2", :homebrew => "gdk-pixbuf", :macports => "gdk-pixbuf2", Modified: goffice/dependency-check/Rakefile (+2 -1) =================================================================== --- goffice/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (3a755eb54) +++ goffice/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (24771eff3) @@ -48,13 +48,14 @@ namespace :dependency do unless PKGConfig.check_version?("libgoffice-0.10") goffice010_spec = { :debian => "libgoffice-0.10-dev", + :redhat => "pkgconfig(libgoffice-0.10)", :homebrew => "goffice", } unless NativePackageInstaller.install(goffice010_spec) unless PKGConfig.check_version?("libgoffice-0.8") goffice08_spec = { :debian => "libgoffice-0.8-dev", - :redhat => "goffice08-devel", + :redhat => "pkgconfig(libgoffice-0.8)", :homebrew => "goffice", } unless NativePackageInstaller.install(goffice08_spec) Modified: gsf/dependency-check/Rakefile (+1 -0) =================================================================== --- gsf/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (f491b936f) +++ gsf/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (c1be70542) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("libgsf-1") unless NativePackageInstaller.install(:debian => "libgsf-1-dev", + :redhat => "pkgconfig(libgsf-1)", :homebrew => "libgsf", :msys2 => "libgsf") exit(false) Modified: gtksourceview3/dependency-check/Rakefile (+1 -1) =================================================================== --- gtksourceview3/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (03f3221ca) +++ gtksourceview3/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (47f5e74bc) @@ -32,7 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("gtksourceview-3.0") unless NativePackageInstaller.install(:altlinux => "libgtksourceview3-devel", :debian => "libgtksourceview-3.0-dev", - :redhat => "gtksourceview3-devel", + :redhat => "pkgconfig(gtksourceview-3.0)", :homebrew => "gtksourceview3", :macports => "gtksourceview3", :msys2 => "gtksourceview3") Modified: poppler/dependency-check/Rakefile (+1 -1) =================================================================== --- poppler/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (4f72fb3c0) +++ poppler/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (8647ac24e) @@ -32,7 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("poppler", 0, 12, 0) unless NativePackageInstaller.install(:alt_linux => "libpoppler-glib-devel", :debian => "libpoppler-glib-dev", - :redhat => "poppler-glib-devel", + :redhat => "pkgconfig(poppler-glib)", :arch_linux => "poppler", :homebrew => "poppler", :macports => "poppler", Modified: rsvg2/dependency-check/Rakefile (+1 -1) =================================================================== --- rsvg2/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (444db9e66) +++ rsvg2/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (fc7822a90) @@ -32,7 +32,7 @@ namespace :dependency do unless PKGConfig.check_version?("librsvg-2.0") unless NativePackageInstaller.install(:altlinux => "librsvg-devel", :debian => "librsvg2-dev", - :redhat => "librsvg2-devel", + :redhat => "pkgconfig(librsvg-2.0)", :arch => "librsvg", :homebrew => "librsvg", :macports => "librsvg", Modified: vte3/dependency-check/Rakefile (+1 -1) =================================================================== --- vte3/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (56ea6f7c4) +++ vte3/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (cdd67eb04) @@ -33,7 +33,7 @@ namespace :dependency do unless PKGConfig.check_version?("vte-2.91") unless NativePackageInstaller.install(:altlinux => "libvte3-devel", :debian => "libvte-2.91-dev", - :redhat => "vte3-devel", + :redhat => "pkgconfig(vte-2.91)", :homebrew => "vte3") exit(false) end Modified: webkit-gtk/dependency-check/Rakefile (+1 -0) =================================================================== --- webkit-gtk/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (3d53b5cc2) +++ webkit-gtk/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (a9187f867) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("webkitgtk-3.0") unless NativePackageInstaller.install(:debian => "libwebkitgtk-3.0-dev", + :redhat => "pkgconfig(webkitgtk-3.0)", :msys2 => "webkitgtk3") exit(false) end Modified: webkit2-gtk/dependency-check/Rakefile (+1 -0) =================================================================== --- webkit2-gtk/dependency-check/Rakefile 2017-12-04 10:35:44 +0900 (db28d0f2f) +++ webkit2-gtk/dependency-check/Rakefile 2017-12-05 23:54:14 +0900 (5169a9205) @@ -31,6 +31,7 @@ namespace :dependency do task :check do unless PKGConfig.check_version?("webkit2gtk-4.0") unless NativePackageInstaller.install(:debian => "libwebkit2gtk-4.0-dev", + :redhat => "pkgconfig(webkit2gtk-4.0)", :homebrew => "webkitgtk") exit(false) end |