diff --git a/.baobab.metadata b/.baobab.metadata new file mode 100644 index 0000000..1839054 --- /dev/null +++ b/.baobab.metadata @@ -0,0 +1 @@ +72f2ba2f03ae31992c769537bd939cfea4327000 SOURCES/baobab-3.28.0.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..501baf6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/baobab-3.28.0.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/build-Fix-gschema-translations.patch b/SOURCES/build-Fix-gschema-translations.patch new file mode 100644 index 0000000..1220053 --- /dev/null +++ b/SOURCES/build-Fix-gschema-translations.patch @@ -0,0 +1,63 @@ +From 80f7e1c144103d52a877f2d42db6a427867591f6 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 14 Jun 2018 15:22:15 +0200 +Subject: [PATCH 2/2] build: Fix gschema translations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After meson port, translations are merged in gschema file, which doesn't +work: + +$ LANG=en_US gsettings describe org.gnome.baobab.preferences excluded-uris +Una lista d'URI t'as particiones que cal excluir de l'anal�s. + +Translations should not be merged in gschema files and also I don't see any +other gschema file with merged translations in /usr/share/glib-2.0/schemas/. +Let's install gschema file as is. After this change, translations works as +expected. +--- + data/meson.build | 7 ++----- + ....baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} | 0 + po/POTFILES.in | 2 +- + 3 files changed, 3 insertions(+), 6 deletions(-) + rename data/{org.gnome.baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} (100%) + +diff --git a/data/meson.build b/data/meson.build +index 5b1ef00..98d1d69 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -22,11 +22,8 @@ appdata_file = i18n.merge_file( + install_dir: join_paths(get_option('datadir'), 'metainfo'), + ) + +-gschema_file = i18n.merge_file( +- input: 'org.gnome.baobab.gschema.xml.in', +- output: 'org.gnome.baobab.gschema.xml', +- po_dir: '../po', +- install: true, ++install_data ( ++ 'org.gnome.baobab.gschema.xml', + install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') + ) + +diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml +similarity index 100% +rename from data/org.gnome.baobab.gschema.xml.in +rename to data/org.gnome.baobab.gschema.xml +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 0c9452a..f3d6521 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -2,7 +2,7 @@ + # Please keep this file sorted alphabetically. + data/org.gnome.baobab.appdata.xml.in + data/org.gnome.baobab.desktop.in +-data/org.gnome.baobab.gschema.xml.in ++data/org.gnome.baobab.gschema.xml + src/baobab-application.vala + src/baobab-cellrenderers.vala + src/baobab-location-list.ui +-- +2.17.1 + diff --git a/SOURCES/build-Fix-setting-GNOMELOCALEDIR.patch b/SOURCES/build-Fix-setting-GNOMELOCALEDIR.patch new file mode 100644 index 0000000..d45da02 --- /dev/null +++ b/SOURCES/build-Fix-setting-GNOMELOCALEDIR.patch @@ -0,0 +1,26 @@ +From 884fb555173c46fcb4a80a5cc9cbd32bad8186ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20Dr=C4=85g?= +Date: Fri, 16 Mar 2018 19:57:53 +0100 +Subject: [PATCH] build: Fix setting GNOMELOCALEDIR + +https://bugzilla.gnome.org/show_bug.cgi?id=794381 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 30d996d..ad1b1d3 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,7 +23,7 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name()) + conf.set_quoted('PACKAGE_VERSION', meson.project_version()) + conf.set_quoted('VERSION', meson.project_version()) + conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +-conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('datadir'), '/locale')) ++conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) + configure_file(output: 'config.h', configuration: conf) + config_h_dir = include_directories('.') + +-- +2.17.0 + diff --git a/SOURCES/build-Install-also-24x24-icons.patch b/SOURCES/build-Install-also-24x24-icons.patch new file mode 100644 index 0000000..a7d675a --- /dev/null +++ b/SOURCES/build-Install-also-24x24-icons.patch @@ -0,0 +1,25 @@ +From 5848e8d544dd975454d4ef671c5b8b7ef91ccc83 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 14 Jun 2018 14:48:45 +0200 +Subject: [PATCH 1/2] build: Install also 24x24 icons + +After the meson port, 24x24 icons are not installed. Let's add missing +24x24 icon size in meson.build to install them. +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index a2d22ed..5b1ef00 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + icondir = join_paths(get_option('datadir'), 'icons/hicolor') +-foreach size: ['16x16', '22x22', '32x32', '48x48', '256x256', 'symbolic'] ++foreach size: ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', 'symbolic'] + install_subdir('icons/hicolor/' + size, install_dir: icondir) + endforeach + +-- +2.17.1 + diff --git a/SPECS/baobab.spec b/SPECS/baobab.spec new file mode 100644 index 0000000..1a4727b --- /dev/null +++ b/SPECS/baobab.spec @@ -0,0 +1,220 @@ +%global gtk3_version 3.19.1 + +Name: baobab +Version: 3.28.0 +Release: 2%{?dist} +Summary: A graphical directory tree analyzer + +License: GPLv2+ and GFDL +URL: https://wiki.gnome.org/Apps/Baobab +Source0: https://download.gnome.org/sources/baobab/3.28/%{name}-%{version}.tar.xz + +Patch0: build-Fix-setting-GNOMELOCALEDIR.patch +Patch1: build-Install-also-24x24-icons.patch +Patch2: build-Fix-gschema-translations.patch + +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: /usr/bin/appstream-util +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: itstool +BuildRequires: meson +BuildRequires: vala + +Requires: gtk3%{?_isa} >= %{gtk3_version} + +Obsoletes: gnome-utils < 1:3.3 +Obsoletes: gnome-utils-devel < 1:3.3 +Obsoletes: gnome-utils-libs < 1:3.3 + +%description +Baobab is able to scan either specific directories or the whole filesystem, in +order to give the user a graphical tree representation including each +directory size or percentage in the branch. It also auto-detects in real-time +any change made to your home folder as far as any mounted/unmounted device. + +%prep +%setup -q +%patch0 -p1 -b .build-Fix-setting-GNOMELOCALEDIR +%patch1 -p1 -b .build-Install-also-24x24-icons +%patch2 -p1 -b .build-Fix-gschema-translations + + +%build +%meson +%meson_build + + +%install +%meson_install + +%find_lang %{name} --with-gnome + + +%check +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.gnome.baobab.appdata.xml +desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.desktop + + +%post +touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : + + +%postun +if [ $1 -eq 0 ]; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : + touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : +fi + + +%posttrans +glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : +gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : + + +%files -f %{name}.lang +%doc AUTHORS NEWS README +%license COPYING COPYING.docs +%{_bindir}/baobab +%{_datadir}/applications/org.gnome.baobab.desktop +%{_datadir}/dbus-1/services/org.gnome.baobab.service +%{_datadir}/icons/hicolor/*/apps/baobab.png +%{_datadir}/icons/hicolor/symbolic/apps/baobab-symbolic.svg +%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml +%{_datadir}/metainfo/org.gnome.baobab.appdata.xml +%{_mandir}/man1/baobab.1* + + +%changelog +* Fri Jun 22 2018 Ondrej Holy - 3.28.0-2 +- Install also 24x24 icons +- Fix gschema translations +- Resolves: #1567161 + +* Mon Mar 12 2018 Kalev Lember - 3.28.0-1 +- Update to 3.28.0 +- Fix setting GNOMELOCALEDIR +- Resolves: #1567161 + +* Thu Feb 16 2017 Ondrej Holy - 3.22.1-1 +- Update to 3.22.1 +- Resolves: #1386818 + +* Fri Sep 11 2015 Ondrej Holy - 3.14.1-5 +- Exclude mountpoints when scanning recent locations +- Resolves: #840427 + +* Tue Jul 28 2015 David King - 3.14.1-4 +- Fix menu item sensitivity (#1233656) + +* Fri May 15 2015 Ondrej Holy - 3.14.1-3 +- Exclude mountpoints when handling commandline arguments +- Resolves: #840427 + +* Fri May 15 2015 Ondrej Holy - 3.14.1-2 +- Add translation updates from translation team +- Resolves: #1174557 + +* Tue May 5 2015 Ondrej Holy - 3.14.1-1 +- Update to 3.14.1 +- Remove obsolete upstream patch +- Add translations updates from upstream +- Resolves: #1174557 + +* Fri Jan 24 2014 Daniel Mach - 3.8.2-4 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.8.2-3 +- Mass rebuild 2013-12-27 + +* Fri Dec 6 2013 Ondrej Holy - 3.8.2-2 +- Translation updates (#1030317) + +* Mon May 13 2013 Richard Hughes - 3.8.2-1 +- Update to 3.8.2 + +* Mon Apr 15 2013 Kalev Lember - 3.8.1-1 +- Update to 3.8.1 + +* Tue Mar 26 2013 Kalev Lember - 3.8.0-1 +- Update to 3.8.0 + +* Wed Mar 20 2013 Kalev Lember - 3.7.92-1 +- Update to 3.7.92 + +* Wed Mar 6 2013 Matthias Clasen - 3.7.91-1 +- Update to 3.7.91 + +* Fri Feb 22 2013 Kalev Lember - 3.7.90-1 +- Update to 3.7.90 +- Install HighContrast icons and update the rpm scriptlets for the icon cache + +* Wed Feb 13 2013 Fedora Release Engineering - 3.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 16 2013 Richard Hughes - 3.7.4-1 +- Update to 3.7.4 + +* Thu Nov 15 2012 Kalev Lember - 3.6.3-1 +- Update to 3.6.3 +- Remove an unwanted lib64 rpath + +* Wed Nov 14 2012 Tomas Bzatek - 3.6.2-2 +- Fix homepage URL + +* Wed Oct 17 2012 Kalev Lember - 3.6.2-1 +- Update to 3.6.2 + +* Tue Oct 16 2012 Kalev Lember - 3.6.1-1 +- Update to 3.6.1 + +* Tue Sep 25 2012 Richard Hughes - 3.6.0-1 +- Update to 3.6.0 + +* Wed Sep 19 2012 Richard Hughes - 3.5.92-1 +- Update to 3.5.92 + +* Tue Sep 04 2012 Richard Hughes - 3.5.91-1 +- Update to 3.5.91 + +* Tue Aug 21 2012 Richard Hughes - 3.5.90-1 +- Update to 3.5.90 + +* Tue Aug 07 2012 Richard Hughes - 3.5.5-1 +- Update to 3.5.5 + +* Wed Jul 18 2012 Fedora Release Engineering - 3.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jun 25 2012 Richard Hughes - 3.5.3-1 +- Update to 3.5.3 + +* Tue Apr 24 2012 Kalev Lember - 3.4.1-2 +- Silence glib-compile-schemas output + +* Mon Apr 16 2012 Richard Hughes - 3.4.1-1 +- Update to 3.4.1 + +* Tue Mar 27 2012 Rui Matos - 3.4.0-1 +- Update to 3.4.0 + +* Wed Mar 21 2012 Kalev Lember - 3.3.4-1 +- Update to 3.3.4 + +* Sat Mar 17 2012 Matthias Clasen - 3.3.3-3 +- Don't obsolete gnome-system-log + +* Fri Mar 16 2012 Rui Matos - 3.3.3-2 +- Obsolete all gnome-utils subpackages + +* Mon Mar 12 2012 Rui Matos - 3.3.3-1 +- Update to 3.3.3 +- Just list %%{_datadir}/help/xx_YY/baobab in %%files since %%find_lang + doesn't find those for us + +* Mon Mar 5 2012 Rui Matos - 3.3.2-1 +- Update to 3.3.2 + +* Tue Dec 27 2011 Matthias Clasen - 3.3.1-1 +- Initial packaging