diff --git a/Makefile b/Makefile index 0c0239a..e0e063e 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,37 @@ -SPECFILE := garcon.spec -include Makefile.common +DIST ?= fc32 +VERSION := $(shell cat version) +MINOR_VERSION := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION))) +REL := $(shell cat rel) + +FEDORA_SOURCES := https://src.fedoraproject.org/rpms/garcon/raw/f$(subst fc,,$(DIST))/f/sources +SRC_FILE := garcon-$(VERSION).tar.bz2 + +BUILDER_DIR ?= ../.. +SRC_DIR ?= qubes-src + +DISTFILES_MIRROR ?= http://archive.xfce.org/src/xfce/garcon/$(MINOR_VERSION)/ +UNTRUSTED_SUFF := .UNTRUSTED +FETCH_CMD := wget --no-use-server-timestamps -q -O + +SHELL := /bin/bash + +%: %.sha512 + @$(FETCH_CMD) $@$(UNTRUSTED_SUFF) $(DISTFILES_MIRROR)$@ + @sha512sum --status -c <(printf "$$(cat $<) -\n") <$@$(UNTRUSTED_SUFF) || \ + { echo "Wrong SHA512 checksum on $@$(UNTRUSTED_SUFF)!"; exit 1; } + @mv $@$(UNTRUSTED_SUFF) $@ + +.PHONY: get-sources +get-sources: $(SRC_FILE) + +.PHONY: verify-sources +verify-sources: + @true + +# This target is generating content locally from upstream project +# 'sources' file. Sanitization is done but it is encouraged to perform +# update of component in non-sensitive environnements to prevent +# any possible local destructions due to shell rendering +.PHONY: update-sources +update-sources: + @$(BUILDER_DIR)/$(SRC_DIR)/builder-rpm/scripts/generate-hashes-from-sources $(FEDORA_SOURCES) \ No newline at end of file diff --git a/Makefile.builder b/Makefile.builder index 216a561..ed01ac4 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1 +1,19 @@ RPM_SPEC_FILES := garcon.spec +DEBIAN_BUILD_DIRS := debian-pkg/debian + +NO_ARCHIVE := 1 + +ifneq ($(filter $(DISTRIBUTION), debian qubuntu),) +SOURCE_COPY_IN := source-debian-copy-in +endif + +source-debian-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version) +source-debian-copy-in: ORIG_FILE = $(CHROOT_DIR)/$(DIST_SRC)/garcon_$(VERSION).orig.tar.bz2 +source-debian-copy-in: SRC_FILE = $(ORIG_SRC)/garcon-$(VERSION).tar.bz2 +source-debian-copy-in: + mkdir -p "$(CHROOT_DIR)/$(DIST_SRC)/debian/patches" + $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches + cp -p $(SRC_FILE) $(ORIG_FILE) + tar jxvf $(SRC_FILE) -C $(CHROOT_DIR)/$(DIST_SRC)/debian-pkg --strip-components=1 + +# vim: ft=make \ No newline at end of file diff --git a/Makefile.common b/Makefile.common deleted file mode 100644 index 7295c4b..0000000 --- a/Makefile.common +++ /dev/null @@ -1,84 +0,0 @@ -# -# Common Makefile for building RPMs -# - -WORKDIR := $(CURDIR) -SPECDIR ?= $(WORKDIR) -SRCRPMDIR ?= $(WORKDIR)/../srpm -BUILDDIR ?= $(WORKDIR) -RPMDIR ?= $(WORKDIR)/../rpm -SOURCEDIR := $(WORKDIR) - - -RPM_DEFINES := --define "_sourcedir $(SOURCEDIR)" \ - --define "_specdir $(SPECDIR)" \ - --define "_builddir $(BUILDDIR)" \ - --define "_srcrpmdir $(SRCRPMDIR)" \ - --define "_rpmdir $(RPMDIR)" - -help: - @echo "make rpms -- generate binary rpm packages" - @echo "make srpms -- generate source rpm packages" - -DIST_DOM0 ?= fc13 - -VER_REL := $(shell rpm $(RPM_DEFINES) -q --qf "%{VERSION}-%{RELEASE}\n" --specfile $(SPECFILE)| head -1|sed -e 's/fc../$(DIST_DOM0)/') -NAME := $(shell rpm $(RPM_DEFINES) -q --qf "%{NAME}\n" --specfile $(SPECFILE)| head -1) - -URL := $(shell spectool $(RPM_DEFINES) --list-files --source 0 $(SPECFILE) 2> /dev/null| cut -d ' ' -f 2- ) -ifndef SRC_FILE -ifdef URL - SRC_FILE := $(notdir $(URL)) -endif -endif - -ifdef DISTFILES_MIRROR - URL := $(DISTFILES_MIRROR)/$(SRC_FILE) -endif - -get-sources: $(SRC_FILE) - -$(SRC_FILE): -ifneq ($(SRC_FILE), None) - @wget -q $(URL) -endif - -.PHONY: verify-sources - -verify-sources: -ifneq ($(SRC_FILE), None) - @sha256sum --quiet -c sources -endif - -.PHONY: clean-sources -clean-sources: -ifneq ($(SRC_FILE), None) - -rm $(SRC_FILE) -endif - -rpms: rpms-dom0 - -rpms-vm: - -rpms-dom0: - rpmbuild $(RPM_DEFINES) -bb $(SPECFILE) - rpm --addsign $(RPMDIR)/x86_64/$(NAME)*$(VER_REL)*.rpm - -srpms: - rpmbuild $(RPM_DEFINES) -bs $(SPECFILE) - rpm --addsign $(SRCRPMDIR)/$(NAME)*$(VER_REL)*.rpm - -update-repo-current: - ln -f $(RPMDIR)/x86_64/$(NAME)*$(VER_REL)*.rpm ../../yum/current-release/current/dom0/rpm/ - -update-repo-current-testing: - ln -f $(RPMDIR)/x86_64/$(NAME)*$(VER_REL)*.rpm ../../yum/current-release/current-testing/dom0/rpm/ - -update-repo-unstable: - ln -f $(RPMDIR)/x86_64/$(NAME)*$(VER_REL)*.rpm ../../yum/current-release/unstable/dom0/rpm/ - -update-repo-installer: - ln -f $(RPMDIR)/x86_64/$(NAME)*$(VER_REL)*.rpm ../../installer/yum/qubes-dom0/rpm/ - -clean: - diff --git a/debian b/debian new file mode 120000 index 0000000..ab79711 --- /dev/null +++ b/debian @@ -0,0 +1 @@ +debian-pkg/debian/ \ No newline at end of file diff --git a/debian-pkg/debian/changelog b/debian-pkg/debian/changelog new file mode 100644 index 0000000..707b96d --- /dev/null +++ b/debian-pkg/debian/changelog @@ -0,0 +1,243 @@ +garcon (0.6.4-1) unstable; urgency=medium + + [ Unit 193 ] + * New upstream version 0.6.4 + * d/rules: + - Pass '--enable-gtk-doc' during configure to fix consecutive builds. + + -- Yves-Alexis Perez Thu, 15 Aug 2019 11:10:10 +0200 + +garcon (0.6.3-1) unstable; urgency=medium + + [ Unit 193 ] + * New upstream version 0.6.3 + * d/compat, d/control: + - Drop d/compat in favor of debhelper-compat, bump to 11. + * d/control: Build-depend on gtk-doc-tools and xfce4-dev-tools. + * d/rules: + - Drop the now-default options '--parallel' and '--disable-silent-rules'. + - Drop dbgsym migration, it is complete. + - Use dh_missing instead of dh_install --fail-missing. + * Bump Standards-Version to 4.4.0. + + [ Helmut Grohne ] + * Fix cross build issues: closes: #890223 + + Switch transitional package libgarcon-1-0-dev to Architecture: any to + allow satisfying dependencies from non-native architectures. It cannot + be Multi-Arch: foreign due to its dependency on libgarcon-1-dev. + + Mark libgarcon-common Multi-Arch: foreign to allow satisfying + dependencies from non-native architectures. + + Mark all other packages Multi-Arch: same to allow coinstallation. + + -- Yves-Alexis Perez Sat, 13 Jul 2019 13:26:02 +0200 + +garcon (0.6.2-1) unstable; urgency=medium + + * Moved the package to git on salsa.debian.org + * Updated the maintainer address to debian-xfce@lists.debian.org + closes: #899857 + * d/gbp.conf added, following DEP-14 + * d/watch: use HTTPS protocol + * New upstream version 0.6.2 + * d/control: drop Lionel from uploaders, thanks! + * d/control: update standards version to 4.3.0 + * d/libgarcon-1-0.symbols updated for new release + * d/control: drop priority for libgarcon-1-0-dev + + -- Yves-Alexis Perez Thu, 27 Dec 2018 13:23:47 +0100 + +garcon (0.6.1-2) unstable; urgency=medium + + [ Unit 193 ] + * d/control: + - Add versioned breaks/replaces on libgarcon-1-0-dev. closes: #868626 + + -- Yves-Alexis Perez Sun, 03 Sep 2017 19:14:03 +0200 + +garcon (0.6.1-1) unstable; urgency=medium + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/control: + - add build-dep on libgtk-3-dev and libxfce4ui-2 for the GTK3 variant + - run wrap-and-sort + - update standards version to 3.9.8. + * debian/copyright: run wrap-and-sort. + * debian/libgarcon-common.install: run wrap-and-sort. + * debian/control: + - introduce libgarcon-gtk3 and -dev packages. + - rename libgarcon-1-0-dev to libgarcon-1-dev for consistency. + - update standards version to 4.0.0. + + [ Unit 193 ] + * d/control, d/rules: Migrate to dbgsym packages. + + -- Yves-Alexis Perez Wed, 21 Jun 2017 15:04:21 +0200 + +garcon (0.4.0-2) unstable; urgency=medium + + * Upload to unstable. + + -- Yves-Alexis Perez Wed, 06 May 2015 15:52:08 +0200 + +garcon (0.4.0-1) experimental; urgency=medium + + [ Mateusz Łukasik ] + * New upstream release. + * Bump standards version to 3.9.6 + + -- Yves-Alexis Perez Sun, 08 Mar 2015 20:22:03 +0100 + +garcon (0.3.0-1) experimental; urgency=low + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * Bump standards version to 3.9.5 + * debian/rules: Use disable-silent-rules + * New upstream release + * Update symbols + + [ Yves-Alexis Perez ] + * debian/control: + - add build-dep on libxfce4ui-1-dev. + + -- Yves-Alexis Perez Sun, 23 Feb 2014 21:05:05 +0100 + +garcon (0.2.1-2) unstable; urgency=medium + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * Bump standards version to 3.9.5 + * debian/rules: Use disable-silent-rules + + [ Yves-Alexis Perez ] + * debian/rules: + - call dh-autoreconf to regenerate config.{guess,sub} and fix FTBFS on + ppc64el. closes: #757334 + - call xdt-autogen before configure + * debian/control: + - add build-dep on xfce4-dev-tools, dh-autoreconf, gtk-doc-tools and + intltool for all the above. + + -- Yves-Alexis Perez Sun, 31 Aug 2014 23:15:46 +0200 + +garcon (0.2.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + * debian/rules: + - enable all hardening flags. + * debian/libgarcon-1-0-dev.install: + - static files are not built anymore, don't try to install them. + + -- Yves-Alexis Perez Tue, 21 May 2013 22:12:35 +0200 + +garcon (0.2.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: revert b-dep to unversioned libxfce4util -dev package, and + require >= 4.10. + + -- Lionel Le Folgoc Sat, 05 May 2012 09:43:43 +0200 + +garcon (0.1.12-1+exp1) experimental; urgency=low + + * New upstream release. + * debian/copyright: replace CRLFs with LFs… + + -- Lionel Le Folgoc Sun, 15 Apr 2012 15:36:53 +0200 + +garcon (0.1.12-1) unstable; urgency=low + + [ Lionel Le Folgoc ] + * New upstream release. + + [ Yves-Alexis Perez ] + * debian/rules: + - build with --parallel. + + -- Yves-Alexis Perez Sat, 05 May 2012 14:45:29 +0200 + +garcon (0.1.11-1+exp1) experimental; urgency=low + + [ Lionel Le Folgoc ] + * New upstream release. + * debian/README.source: dropped, unneeded. + * debian/rules: fix path to .la files to ignore. + * debian/control: build-dep on libxfce4util6-dev to start using the new API. + + [ Yves-Alexis Perez ] + * debian/control: + - update standards version to 3.9.3. + * debian/rules: + - build with --parallel. + + -- Lionel Le Folgoc Sun, 08 Apr 2012 16:24:43 +0200 + +garcon (0.1.11-1) unstable; urgency=low + + [ Lionel Le Folgoc ] + * New upstream release. + * debian/README.source: dropped, unneeded. + * debian/rules: fix path to .la files to ignore. + + [ Yves-Alexis Perez ] + * debian/control: + - update standards version to 3.9.3. + + -- Yves-Alexis Perez Sun, 01 Apr 2012 14:25:19 +0200 + +garcon (0.1.10-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + - use debhelper 9 hardening support. + * Fix paths for multiarch dirs. + * debian/compat bumped to 9. + * debian/control: + - drop hardening-includes build-dep. + - update debhelper build-dep to 9 for hardening support. + - add dpkg-dev 1.16.1 build-dep for hardening support. + - pre-depends on multiarch-support. + * debian/watch: updated, garcon moved to core. + + -- Lionel Le Folgoc Sun, 19 Feb 2012 18:59:34 +0100 + +garcon (0.1.9-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - add build-dep on libxfce4util. + + -- Yves-Alexis Perez Mon, 12 Sep 2011 22:59:30 +0200 + +garcon (0.1.8-1) unstable; urgency=low + + * New upstream release. + - remove science toplevel category. closes: #315085 + + -- Lionel Le Folgoc Mon, 20 Jun 2011 22:39:08 +0200 + +garcon (0.1.7-1) unstable; urgency=low + + [ Lionel Le Folgoc ] + * debian/libgarcon-1-0.symbols: added. + + [ Yves-Alexis Perez ] + * New upstream release. + * Upload to unstable. + * debian/control: + - remove Emanuele, Simon and Mike from uploaders. + - update standards version to 3.9.2. + + -- Yves-Alexis Perez Tue, 19 Apr 2011 16:07:51 +0200 + +garcon (0.1.5-1) experimental; urgency=low + + * Initial release. Closes: #612090 + + -- Yves-Alexis Perez Sun, 06 Feb 2011 17:05:17 +0100 diff --git a/debian-pkg/debian/control b/debian-pkg/debian/control new file mode 100644 index 0000000..5beb06f --- /dev/null +++ b/debian-pkg/debian/control @@ -0,0 +1,94 @@ +Source: garcon +Priority: optional +Section: xfce +Maintainer: Debian Xfce Maintainers +Uploaders: Yves-Alexis Perez +Build-Depends: debhelper-compat (= 11), + dpkg-dev (>= 1.16.1), + gtk-doc-tools, + intltool (>= 0.31), + libglib2.0-dev, + libgtk-3-dev (>= 3.14.0), + libgtk2.0-dev (>= 2.24), + libxfce4ui-1-dev (>= 4.10), + libxfce4ui-2-dev (>= 4.11), + libxfce4util-dev (>= 4.10), + pkg-config, + xfce4-dev-tools +Standards-Version: 4.4.0 +Homepage: http://www.xfce.org/ +Vcs-Git: https://salsa.debian.org/xfce-team/desktop/garcon.git +Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/garcon + +Package: libgarcon-1-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libgarcon-1-0 (= ${binary:Version}), ${misc:Depends} +Breaks: libgarcon-1-0-dev (<< 0.6.1-1~) +Provides: libgarcon-1-0-dev +Replaces: libgarcon-1-0-dev (<< 0.6.1-1~) +Suggests: devhelp +Description: Development files for garcon-1 + This package contains the headers and the static library + for garcon-1. + +Package: libgarcon-1-0-dev +Section: oldlibs +Depends: libgarcon-1-dev, + ${misc:Depends} +Architecture: any +Multi-Arch: same +Description: transitional package for libgarcon-1-dev + This package has been renamed to libgarcon-1-dev. + +Package: libgarcon-gtk3-1-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libgarcon-gtk3-1-0 (= ${binary:Version}), + libgarcon-1-dev, + libxfce4ui-2-dev, + ${misc:Depends} +Suggests: devhelp +Description: Development files for garcon-gtk3 + This package contains the headers and the static library for garcon-gtk3 + library, the GTK3 support library for the garcon menu library. + +Package: libgarcon-1-0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: libgarcon-common, ${misc:Depends}, ${shlibs:Depends} +Description: freedesktop.org compliant menu implementation for Xfce + garcon is a menu implementation that is compliant with the Desktop Menu + Specification of freedesktop.org + . + This package contains the core library and the GTK2 support library. + +Package: libgarcon-gtk3-1-0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: menu library for Xfce (GTK3 library) + garcon is a menu implementation that is compliant with the Desktop Menu + Specification of freedesktop.org + . + This package contains the GTK-3 support library. + +Package: libgarcon-common +Section: libs +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libgarcon-1-0 (<< 0.1.2-1), + xfdesktop4 (<< 4.7.0), + xfdesktop4-data (<< 4.7.0) +Description: common files for libgarcon menu implementation + garcon is a menu implementation that is compliant with the Desktop Menu + Specification of freedesktop.org + . + This package contains common files like desktop-directories and menu file. diff --git a/debian-pkg/debian/copyright b/debian-pkg/debian/copyright new file mode 100644 index 0000000..5c9cf7f --- /dev/null +++ b/debian-pkg/debian/copyright @@ -0,0 +1,74 @@ +This package was debianized by Yves-Alexis Perez on +Sat, 10 Oct 2009 10:33:06 +0200 + +It was downloaded from http://www.xfce.org + +Files: garcon/garcon-config.c + garcon/garcon-environment.c + garcon/garcon-environment.h + garcon/garcon-menu-directory.c + garcon/garcon-menu-directory.h + garcon/garcon-menu-element.c + garcon/garcon-menu-element.h + garcon/garcon-menu-item-cache.c + garcon/garcon-menu-item-cache.h + garcon/garcon-menu-item-pool.c + garcon/garcon-menu-item-pool.h + garcon/garcon-menu-merger.c + garcon/garcon-menu-merger.h + garcon/garcon-menu-node.c + garcon/garcon-menu-node.h + garcon/garcon-menu-parser.c + garcon/garcon-menu-parser.h + garcon/garcon-menu-separator.c + garcon/garcon-menu-separator.h + garcon/garcon-menu-tree-provider.c + garcon/garcon-menu-tree-provider.h + garcon/garcon-menu.c + garcon/garcon-menu.h + garcon/garcon.h + tests/test-display-menu.c + tests/test-menu-parser.c + tests/test-menu-spec.c +Copyright: 2006-2007, Jannis Pohlmann + 2006-2009, Jannis Pohlmann + 2006-2010, Jannis Pohlmann + 2007, Jannis Pohlmann + 2007-2009, Jannis Pohlmann + 2007-2010, Jannis Pohlmann + 2009, Jannis Pohlmann + 2009-2010, Jannis Pohlmann +License: LGPL-2+ + +Files: garcon/garcon-menu-item.c + garcon/garcon-menu-item.h + garcon/garcon-private.c + garcon/garcon-private.h +Copyright: 2006-2010, Jannis Pohlmann + 2009, Jannis Pohlmann + 2009, Nick Schermer + 2009-2010, Nick Schermer +License: LGPL-2+ + +The Debian packaging is + © 2009-2011 Yves-Alexis Perez +and is licensed under the GPL, version 2. + +The documentation (files in doc/*) is released under the GNU Free Documentation +License, version 1.1 or later, with no invariant sections, using the following +statement: + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front-Cover Texts, and with no Back-Cover + Texts. + +On Debian systems, the complete text of the GNU Lesser General Public +License can be found in `/usr/share/common-licenses/LGPL'. + +The complete text of the GNU Free Documentation License can be found on the +file “/usr/share/common-licenses/GFDL”. + +The complete text of the GNU General Public License (version 2) can be +found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian-pkg/debian/libgarcon-1-0.install b/debian-pkg/debian/libgarcon-1-0.install new file mode 100644 index 0000000..c3c935f --- /dev/null +++ b/debian-pkg/debian/libgarcon-1-0.install @@ -0,0 +1,2 @@ +usr/lib/*/libgarcon-1*.so.* +usr/lib/*/libgarcon-gtk2-1.so.* diff --git a/debian-pkg/debian/libgarcon-1-0.symbols b/debian-pkg/debian/libgarcon-1-0.symbols new file mode 100644 index 0000000..76b70ac --- /dev/null +++ b/debian-pkg/debian/libgarcon-1-0.symbols @@ -0,0 +1,176 @@ +libgarcon-1.so.0 libgarcon-1-0 #MINVER# + garcon_check_version@Base 0.1.2 + garcon_config_build_paths@Base 0.1.2 + garcon_config_lookup@Base 0.1.2 + garcon_get_environment@Base 0.1.2 + garcon_major_version@Base 0.1.2 + garcon_marshal_VOID__OBJECT_OBJECT@Base 0.1.2 + garcon_menu_add_menu@Base 0.1.2 + garcon_menu_directory_equal@Base 0.1.2 + garcon_menu_directory_get_comment@Base 0.1.2 + garcon_menu_directory_get_file@Base 0.1.2 + garcon_menu_directory_get_hidden@Base 0.1.2 + garcon_menu_directory_get_icon_name@Base 0.1.2 + garcon_menu_directory_get_name@Base 0.1.2 + garcon_menu_directory_get_no_display@Base 0.1.2 + garcon_menu_directory_get_show_in_environment@Base 0.1.2 + garcon_menu_directory_get_type@Base 0.1.2 + garcon_menu_directory_get_visible@Base 0.1.2 + garcon_menu_directory_new@Base 0.1.2 + garcon_menu_directory_set_comment@Base 0.1.2 + garcon_menu_directory_set_icon_name@Base 0.1.2 + garcon_menu_directory_set_name@Base 0.1.2 + garcon_menu_directory_set_no_display@Base 0.1.2 + garcon_menu_element_equal@Base 0.1.2 + garcon_menu_element_get_comment@Base 0.1.2 + garcon_menu_element_get_icon_name@Base 0.1.2 + garcon_menu_element_get_name@Base 0.1.2 + garcon_menu_element_get_no_display@Base 0.1.2 + garcon_menu_element_get_show_in_environment@Base 0.1.2 + garcon_menu_element_get_type@Base 0.1.2 + garcon_menu_element_get_visible@Base 0.1.2 + garcon_menu_get_directory@Base 0.1.2 + garcon_menu_get_elements@Base 0.1.2 + garcon_menu_get_file@Base 0.1.2 + garcon_menu_get_item_pool@Base 0.1.2 + garcon_menu_get_items@Base 0.1.2 + garcon_menu_get_menu_with_name@Base 0.1.2 + garcon_menu_get_menus@Base 0.1.2 + garcon_menu_get_parent@Base 0.1.2 + garcon_menu_get_type@Base 0.1.2 + garcon_menu_item_action_get_command@Base 0.6.0 + garcon_menu_item_action_get_icon_name@Base 0.6.0 + garcon_menu_item_action_get_name@Base 0.6.0 + garcon_menu_item_action_get_type@Base 0.6.0 + garcon_menu_item_action_ref@Base 0.6.0 + garcon_menu_item_action_set_command@Base 0.6.0 + garcon_menu_item_action_set_icon_name@Base 0.6.0 + garcon_menu_item_action_set_name@Base 0.6.0 + garcon_menu_item_action_unref@Base 0.6.0 + garcon_menu_item_cache_foreach@Base 0.1.2 + garcon_menu_item_cache_get_default@Base 0.1.2 + garcon_menu_item_cache_get_type@Base 0.1.2 + garcon_menu_item_cache_invalidate@Base 0.1.2 + garcon_menu_item_cache_invalidate_file@Base 0.1.2 + garcon_menu_item_cache_lookup@Base 0.1.2 + garcon_menu_item_decrement_allocated@Base 0.1.2 + garcon_menu_item_get_action@Base 0.6.0 + garcon_menu_item_get_actions@Base 0.6.0 + garcon_menu_item_get_allocated@Base 0.1.2 + garcon_menu_item_get_categories@Base 0.1.2 + garcon_menu_item_get_command@Base 0.1.2 + garcon_menu_item_get_comment@Base 0.1.2 + garcon_menu_item_get_desktop_id@Base 0.1.2 + garcon_menu_item_get_file@Base 0.1.2 + garcon_menu_item_get_generic_name@Base 0.1.2 + garcon_menu_item_get_hidden@Base 0.1.2 + garcon_menu_item_get_icon_name@Base 0.1.2 + garcon_menu_item_get_keywords@Base 0.6.2 + garcon_menu_item_get_name@Base 0.1.2 + garcon_menu_item_get_no_display@Base 0.1.2 + garcon_menu_item_get_path@Base 0.1.2 + garcon_menu_item_get_show_in_environment@Base 0.1.2 + garcon_menu_item_get_try_exec@Base 0.1.2 + garcon_menu_item_get_type@Base 0.1.2 + garcon_menu_item_get_uri@Base 0.1.2 + garcon_menu_item_has_action@Base 0.6.0 + garcon_menu_item_has_category@Base 0.1.2 + garcon_menu_item_has_keyword@Base 0.6.2 + garcon_menu_item_increment_allocated@Base 0.1.2 + garcon_menu_item_new@Base 0.1.2 + garcon_menu_item_new_for_path@Base 0.1.2 + garcon_menu_item_new_for_uri@Base 0.1.2 + garcon_menu_item_only_show_in_environment@Base 0.1.2 + garcon_menu_item_pool_apply_exclude_rule@Base 0.1.2 + garcon_menu_item_pool_clear@Base 0.1.2 + garcon_menu_item_pool_foreach@Base 0.1.2 + garcon_menu_item_pool_get_empty@Base 0.1.2 + garcon_menu_item_pool_get_type@Base 0.1.2 + garcon_menu_item_pool_insert@Base 0.1.2 + garcon_menu_item_pool_lookup@Base 0.1.2 + garcon_menu_item_pool_lookup_file@Base 0.1.2 + garcon_menu_item_pool_new@Base 0.1.2 + garcon_menu_item_ref@Base 0.1.2 + garcon_menu_item_reload@Base 0.1.2 + garcon_menu_item_reload_from_file@Base 0.1.2 + garcon_menu_item_requires_terminal@Base 0.1.2 + garcon_menu_item_set_action@Base 0.6.0 + garcon_menu_item_set_categories@Base 0.1.2 + garcon_menu_item_set_command@Base 0.1.2 + garcon_menu_item_set_comment@Base 0.1.2 + garcon_menu_item_set_desktop_id@Base 0.1.2 + garcon_menu_item_set_generic_name@Base 0.1.2 + garcon_menu_item_set_hidden@Base 0.1.2 + garcon_menu_item_set_icon_name@Base 0.1.2 + garcon_menu_item_set_keywords@Base 0.6.2 + garcon_menu_item_set_name@Base 0.1.2 + garcon_menu_item_set_no_display@Base 0.1.2 + garcon_menu_item_set_path@Base 0.1.2 + garcon_menu_item_set_requires_terminal@Base 0.1.2 + garcon_menu_item_set_supports_startup_notification@Base 0.1.2 + garcon_menu_item_set_try_exec@Base 0.1.2 + garcon_menu_item_supports_startup_notification@Base 0.1.2 + garcon_menu_item_unref@Base 0.1.2 + garcon_menu_load@Base 0.1.2 + garcon_menu_merger_get_type@Base 0.1.2 + garcon_menu_merger_new@Base 0.1.2 + garcon_menu_merger_run@Base 0.1.2 + garcon_menu_new@Base 0.1.2 + garcon_menu_new_applications@Base 0.1.2 + garcon_menu_new_for_path@Base 0.1.2 + garcon_menu_node_copy@Base 0.1.2 + garcon_menu_node_create@Base 0.1.2 + garcon_menu_node_get_merge_file_filename@Base 0.1.2 + garcon_menu_node_get_merge_file_type@Base 0.1.2 + garcon_menu_node_get_node_type@Base 0.1.2 + garcon_menu_node_get_string@Base 0.1.2 + garcon_menu_node_get_type@Base 0.1.2 + garcon_menu_node_new@Base 0.1.2 + garcon_menu_node_set_merge_file_filename@Base 0.1.2 + garcon_menu_node_set_merge_file_type@Base 0.1.2 + garcon_menu_node_set_string@Base 0.1.2 + garcon_menu_node_tree_compare@Base 0.1.2 + garcon_menu_node_tree_copy@Base 0.1.2 + garcon_menu_node_tree_free@Base 0.1.2 + garcon_menu_node_tree_free_data@Base 0.1.2 + garcon_menu_node_tree_get_boolean_child@Base 0.1.2 + garcon_menu_node_tree_get_child_node@Base 0.1.2 + garcon_menu_node_tree_get_child_nodes@Base 0.1.2 + garcon_menu_node_tree_get_layout_merge_type@Base 0.1.2 + garcon_menu_node_tree_get_merge_file_filename@Base 0.1.2 + garcon_menu_node_tree_get_merge_file_type@Base 0.1.2 + garcon_menu_node_tree_get_node_type@Base 0.1.2 + garcon_menu_node_tree_get_string@Base 0.1.2 + garcon_menu_node_tree_get_string_child@Base 0.1.2 + garcon_menu_node_tree_get_string_children@Base 0.1.2 + garcon_menu_node_tree_rule_matches@Base 0.1.2 + garcon_menu_node_tree_set_merge_file_filename@Base 0.1.2 + garcon_menu_node_tree_set_string@Base 0.1.2 + garcon_menu_node_type_get_type@Base 0.1.2 + garcon_menu_parser_get_type@Base 0.1.2 + garcon_menu_parser_new@Base 0.1.2 + garcon_menu_parser_run@Base 0.1.2 + garcon_menu_separator_get_default@Base 0.1.2 + garcon_menu_separator_get_type@Base 0.1.2 + garcon_menu_tree_provider_get_file@Base 0.1.2 + garcon_menu_tree_provider_get_tree@Base 0.1.2 + garcon_menu_tree_provider_get_type@Base 0.1.2 + garcon_micro_version@Base 0.1.2 + garcon_minor_version@Base 0.1.2 + garcon_set_environment@Base 0.1.2 + garcon_set_environment_xdg@Base 0.3.0 +libgarcon-gtk2-1.so.0 libgarcon-1-0 #MINVER# + garcon_gtk_menu_get_menu@Base 0.3.0 + garcon_gtk_menu_get_right_click_edits@Base 0.6.0 + garcon_gtk_menu_get_show_desktop_actions@Base 0.6.0 + garcon_gtk_menu_get_show_generic_names@Base 0.3.0 + garcon_gtk_menu_get_show_menu_icons@Base 0.3.0 + garcon_gtk_menu_get_show_tooltips@Base 0.3.0 + garcon_gtk_menu_get_type@Base 0.3.0 + garcon_gtk_menu_new@Base 0.3.0 + garcon_gtk_menu_set_menu@Base 0.3.0 + garcon_gtk_menu_set_right_click_edits@Base 0.6.0 + garcon_gtk_menu_set_show_desktop_actions@Base 0.6.0 + garcon_gtk_menu_set_show_generic_names@Base 0.3.0 + garcon_gtk_menu_set_show_menu_icons@Base 0.3.0 + garcon_gtk_menu_set_show_tooltips@Base 0.3.0 diff --git a/debian-pkg/debian/libgarcon-1-dev.install b/debian-pkg/debian/libgarcon-1-dev.install new file mode 100644 index 0000000..c846cfe --- /dev/null +++ b/debian-pkg/debian/libgarcon-1-dev.install @@ -0,0 +1,7 @@ +usr/include/garcon-1 +usr/lib/*/libgarcon-1*.so +usr/lib/*/pkgconfig/garcon-1* +usr/share/gtk-doc/html/garcon/* +usr/include/garcon-gtk2-1 +usr/lib/*/libgarcon-gtk2-1*.so +usr/lib/*/pkgconfig/garcon-gtk2-1* diff --git a/debian-pkg/debian/libgarcon-common.install b/debian-pkg/debian/libgarcon-common.install new file mode 100644 index 0000000..7819d5b --- /dev/null +++ b/debian-pkg/debian/libgarcon-common.install @@ -0,0 +1,3 @@ +etc/xdg +usr/share/desktop-directories +usr/share/locale/ diff --git a/debian-pkg/debian/libgarcon-gtk3-1-0.install b/debian-pkg/debian/libgarcon-gtk3-1-0.install new file mode 100644 index 0000000..43d5459 --- /dev/null +++ b/debian-pkg/debian/libgarcon-gtk3-1-0.install @@ -0,0 +1 @@ +usr/lib/*/libgarcon-gtk3-1.so.* diff --git a/debian-pkg/debian/libgarcon-gtk3-1-0.symbols b/debian-pkg/debian/libgarcon-gtk3-1-0.symbols new file mode 100644 index 0000000..a326dfc --- /dev/null +++ b/debian-pkg/debian/libgarcon-gtk3-1-0.symbols @@ -0,0 +1,15 @@ +libgarcon-gtk3-1.so.0 libgarcon-gtk3-1-0 #MINVER# + garcon_gtk_menu_get_menu@Base 0.6.0 + garcon_gtk_menu_get_right_click_edits@Base 0.6.0 + garcon_gtk_menu_get_show_desktop_actions@Base 0.6.0 + garcon_gtk_menu_get_show_generic_names@Base 0.6.0 + garcon_gtk_menu_get_show_menu_icons@Base 0.6.0 + garcon_gtk_menu_get_show_tooltips@Base 0.6.0 + garcon_gtk_menu_get_type@Base 0.6.0 + garcon_gtk_menu_new@Base 0.6.0 + garcon_gtk_menu_set_menu@Base 0.6.0 + garcon_gtk_menu_set_right_click_edits@Base 0.6.0 + garcon_gtk_menu_set_show_desktop_actions@Base 0.6.0 + garcon_gtk_menu_set_show_generic_names@Base 0.6.0 + garcon_gtk_menu_set_show_menu_icons@Base 0.6.0 + garcon_gtk_menu_set_show_tooltips@Base 0.6.0 diff --git a/debian-pkg/debian/libgarcon-gtk3-1-dev.install b/debian-pkg/debian/libgarcon-gtk3-1-dev.install new file mode 100644 index 0000000..c914ed7 --- /dev/null +++ b/debian-pkg/debian/libgarcon-gtk3-1-dev.install @@ -0,0 +1,3 @@ +usr/include/garcon-gtk3-1 +usr/lib/*/libgarcon-gtk3-1*.so +usr/lib/*/pkgconfig/garcon-gtk3-1* diff --git a/debian-pkg/debian/rules b/debian-pkg/debian/rules new file mode 100755 index 0000000..c0a9c6a --- /dev/null +++ b/debian-pkg/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- --enable-gtk-doc + +override_dh_missing: + dh_missing --fail-missing -X .la diff --git a/debian-pkg/debian/source/format b/debian-pkg/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian-pkg/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian-pkg/debian/watch b/debian-pkg/debian/watch new file mode 100644 index 0000000..7854270 --- /dev/null +++ b/debian-pkg/debian/watch @@ -0,0 +1,3 @@ +version=3 +https://archive.xfce.org/src/xfce/garcon/(\d[\d\.]+)/ \ + garcon-([\d\.]+)\.tar\.(?:gz|bz2) diff --git a/debian-quilt b/debian-quilt new file mode 100755 index 0000000..421368f --- /dev/null +++ b/debian-quilt @@ -0,0 +1,33 @@ +#!/bin/bash +# vim: set ts=4 sw=4 sts=4 et : +# +# Given a series.conf file and debian patches directory, patches +# are copied to debian patch directory + +USAGE="${0} " + +set -e +set -o pipefail + +DIR="${0%/*}" +SERIES_CONF="${1}" +PATCH_DIR="${2}" + +if test $# -lt 2 || [ ! -e "${SERIES_CONF}" ] || [ ! -d "${PATCH_DIR}" ] ; then + echo "${USAGE}" >&2 + exit 1 +fi + +# Clear patch series.conf file +rm -f "${PATCH_DIR}/series" +touch "${PATCH_DIR}/series" + +while read patch_file +do + if [ -f "${DIR}/${patch_file}" ]; then + echo -e "${patch_file##*/}" >> "${PATCH_DIR}/series" + cp --preserve=timestamps "${DIR}/${patch_file}" "${PATCH_DIR}" + fi +done < "${SERIES_CONF}" +touch --reference="${SERIES_CONF}" "${PATCH_DIR}/series" +touch --reference="${SERIES_CONF}" "${PATCH_DIR}" diff --git a/fix_large_icons.patch b/fix_large_icons.patch deleted file mode 100644 index 403a951..0000000 --- a/fix_large_icons.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001 -From: Stefan Berzl -Date: Mon, 21 Aug 2017 18:39:07 +0300 -Subject: fix: some menu icons are too big (Bug #13785) - -Some packages only provide icons in sizes much bigger than the standard -GTK menu size of 16px. - -The clipboard manager qlipper for example provides the following icon: -/usr/share/icons/hicolor/128x128/apps/qlipper.png - -In GTK 3.22.18 the function gtk_image_new_from_icon_name when given -GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128. - -The patch I have supplied uses existing code to scale such an image. - -Signed-off-by: Eric Koegel ---- - garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++-------------- - 1 file changed, 19 insertions(+), 14 deletions(-) - -diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c -index 41990f2..f31a1ed 100644 ---- a/garcon-gtk/garcon-gtk-menu.c -+++ b/garcon-gtk/garcon-gtk-menu.c -@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); - size = MIN (w, h); - -- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ { -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; -+ } -+ else - { - if (g_path_is_absolute (icon_name)) - { -@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - g_free (name); - } - } -+ } - -- /* Turn the pixbuf into a gtk_image */ -- if (G_LIKELY (pixbuf)) -- { -- /* scale the pixbuf down if it needs it */ -- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -- g_object_unref (pixbuf); -- pixbuf = tmp; -+ /* Turn the pixbuf into a gtk_image */ -+ if (G_LIKELY (pixbuf)) -+ { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -+ g_object_unref (G_OBJECT (pixbuf)); - -- image = gtk_image_new_from_pixbuf (pixbuf); -- g_object_unref (G_OBJECT (pixbuf)); -- } -+ image = gtk_image_new_from_pixbuf (pixbuf_scaled); -+ g_object_unref (G_OBJECT (pixbuf_scaled)); -+ } -+ else -+ { -+ /* display the placeholder at least */ -+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } -- -- if (image == NULL) -- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - - return image; - } --- -cgit v1.2.1 diff --git a/garcon-0.6.4.tar.bz2.sha512 b/garcon-0.6.4.tar.bz2.sha512 new file mode 100644 index 0000000..5914cd7 --- /dev/null +++ b/garcon-0.6.4.tar.bz2.sha512 @@ -0,0 +1 @@ +96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510 diff --git a/garcon.spec b/garcon.spec deleted file mode 100644 index 0b15a6f..0000000 --- a/garcon.spec +++ /dev/null @@ -1,263 +0,0 @@ -# Review at https://bugzilla.redhat.com/show_bug.cgi?id=554603 - -%global minorversion 0.6 -%global xfceversion 4.14 - -Name: garcon -Epoch: 1000 -Version: 0.6.4 -Release: 4%{?dist} -Summary: Implementation of the freedesktop.org menu specification - -# garcon's source code is licensed under the LGPLv2+, -# while its documentation is licensed under the GFDL 1.1 -License: LGPLv2+ and GFDL -URL: http://xfce.org/ -#VCS git:git://git.xfce.org/xfce/garcon -Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 -Source1: xfce-documentation.directory -Patch0: garcon-0.4.0-qubes-menus.patch - -BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 -BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion} -BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} -BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} -BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 -BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 -BuildRequires: pkgconfig(gthread-2.0) >= 2.30.0 -BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 -BuildRequires: gcc-c++ -BuildRequires: gtk-doc -BuildRequires: gettext -BuildRequires: intltool -BuildRequires: gobject-introspection-devel - -Obsoletes: libxfce4menu < 4.6.3 -# because of %%{_datadir}/desktop-directories/xfce-* -Conflicts: xfdesktop <= 4.6.2 - -Requires: qubes-menus - -%description -Garcon is an implementation of the freedesktop.org menu specification replacing -the former Xfce menu library libxfce4menu. It is based on GLib/GIO only and -aims at covering the entire specification except for legacy menus. - -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: gtk2-devel -Requires: pkgconfig -Obsoletes: libxfce4menu-devel < 4.6.2 - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%prep -%setup -q -%patch0 -p1 -b.redhat-menus - - -%build -%configure --disable-static --enable-gtk-doc - -%make_build - - -%install -%make_install - -# fix permissions for libraries -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so - -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - -%find_lang %{name} -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories - -%files -f %{name}.lang -%license COPYING -%doc AUTHORS ChangeLog NEWS README -%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu -%{_libdir}/*.so.* -%{_datadir}/desktop-directories/*.directory - -%files devel -%doc HACKING STATUS TODO -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%doc %{_datadir}/gtk-doc/ - -%changelog -* Tue Jan 28 2020 Fedora Release Engineering - 0.6.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Aug 12 2019 Mukundan Ragavan - 0.6.4-3 -- Rebuild for xfce 4.14 - -* Tue Jul 30 2019 Mukundan Ragavan - 0.6.4-2 -- rebuild for xfce 4.14pre3 - -* Mon Jul 29 2019 Mukundan Ragavan - 0.6.4-1 -- Update to 0.6.4 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.6.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 02 2019 Mukundan Ragavan - 0.6.3-2 -- Rebuild for libxfce4util and libxfce4ui -- Add gobject-introspection-devel as buildrequires - -* Mon Jul 01 2019 Mukundan Ragavan - 0.6.3-1 -- Update to 0.6.3 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Dec 07 2018 Mukundan Ragavan - 0.6.2-1 -- Update to 0.6.2 -- Drop unnecessary patches - -* Fri Sep 07 2018 Mukundan Ragavan - 0.6.1-21 -- Add patch to fix large icons (fixes bug#1624292) - -* Sat Aug 11 2018 Mukundan Ragavan - 0.6.1-20 -- Rebuild for xfce version 4.13 - -* Mon Jul 16 2018 Mukundan Ragavan - 0.6.1-6 -- Add gcc-c++ as BR - -* Fri Jul 13 2018 Fedora Release Engineering - 0.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 07 2017 Kevin Fenzi - 0.6.1-1 -- Update to 0.6.1. Fixes bug #1468765 - -* Mon Apr 17 2017 Kevin Fenzi - 0.6.0-1 -- Update to 0.6.0. - -* Fri Feb 10 2017 Fedora Release Engineering - 0.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 29 2016 Kevin Fenzi - 0.5.0-1 -- Update to 0.5.0. Fixes bug #1361565 - -* Wed Feb 03 2016 Fedora Release Engineering - 0.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 28 2015 Mukundan Ragavan - 0.4.0-2 -- Fix permissions for installed libraries - -* Sat Feb 28 2015 Mukundan Ragavan - 0.4.0-1 -- Update to version 0.4.0 - -* Sat Aug 16 2014 Fedora Release Engineering - 0.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Aug 28 2013 Kevin Fenzi 0.2.1-3 -- Fix obsoletes. Fixes bug #1002131 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun May 05 2013 Kevin Fenzi 0.2.1-1 -- Update to 0.2.1 - -* Wed Feb 13 2013 Fedora Release Engineering - 0.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 27 2012 Fedora Release Engineering - 0.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat May 05 2012 Christoph Wickert - 0.2.0-2 -- Don't use redhat-menus, otherwiese we need gnome-menus, too (#750380) - -* Sat Apr 28 2012 Christoph Wickert - 0.2.0-1 -- Update to 0.2.0 (Xfce 4.10 final) -- Add VCS key - -* Sat Apr 14 2012 Kevin Fenzi - 0.1.12-1 -- Update to 0.1.12 (Xfce 4.10pre1) - -* Mon Apr 02 2012 Kevin Fenzi - 0.1.11-1 -- Update to 0.1.11 - -* Fri Jan 13 2012 Fedora Release Engineering - 0.1.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Oct 26 2011 Fedora Release Engineering - 0.1.9-2 -- Rebuilt for glibc bug#747377 - -* Sat Oct 22 2011 Christoph Wickert - 0.1.9-1 -- Update to 0.1.9 -- BR libxfce4util-devel - -* Sun Jun 19 2011 Christoph Wickert - 0.1.8-1 -- Update to 0.1.8 - -* Thu May 05 2011 Christoph Wickert - 0.1.7-1 -- Update to 0.1.7 -- Fix redhat-menus.patch to include all icons - -* Wed Apr 06 2011 Christoph Wickert - 0.1.6-1 -- Update to 0.1.6 -- Remove Provides: for libxfce4menu since we not really provide it - -* Sat Apr 02 2011 Christoph Wickert - 0.1.5-5 -- Remove internet-mail icons again (moved to exo) -- Update redhat-menus.patch for F15 - -* Tue Mar 29 2011 Christoph Wickert - 0.1.5-4 -- Add internet-mail icon for exo-mail-reader (#678706) - -* Tue Feb 08 2011 Fedora Release Engineering - 0.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 17 2011 Christoph Wickert - 0.1.5-2 -- Include rebased redhat-menus.patch - -* Sun Jan 16 2011 Kevin Fenzi - 0.1.5-1 -- Update to 0.1.5 - -* Sun Dec 05 2010 Christoph Wickert - 0.1.4-1 -- Update to 0.1.4 - -* Sat Dec 04 2010 Christoph Wickert - 0.1.3-2 -- Add patch to use redhat-menus - -* Mon Nov 08 2010 Christoph Wickert - 0.1.3-1 -- Update to 0.1.2 - -* Wed Nov 03 2010 Christoph Wickert - 0.1.2-1 -- Update to 0.1.2 - -* Thu Oct 07 2010 Christoph Wickert - 0.1.1-2 -- Drop dependency on gtk-doc (#604352) - -* Fri Feb 26 2010 Christoph Wickert - 0.1.1-1 -- Update to 0.1.1 - -* Tue Jan 12 2010 Christoph Wickert - 0.1.0-2 -- Build gtk-doc - -* Tue Jan 05 2010 Christoph Wickert - 0.1.0-1 -- Initial spec file diff --git a/garcon.spec.in b/garcon.spec.in new file mode 100644 index 0000000..8864f2b --- /dev/null +++ b/garcon.spec.in @@ -0,0 +1,99 @@ +# Review at https://bugzilla.redhat.com/show_bug.cgi?id=554603 + +%global minorversion 0.6 +%global xfceversion 4.14 + +Name: garcon +Version: @VERSION@ +Release: @REL@%{?dist} +Epoch: 1000 +Summary: Implementation of the freedesktop.org menu specification + +# garcon's source code is licensed under the LGPLv2+, +# while its documentation is licensed under the GFDL 1.1 +License: LGPLv2+ and GFDL +URL: http://xfce.org/ +#VCS git:git://git.xfce.org/xfce/garcon +Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Source1: xfce-documentation.directory +Patch0: garcon-0.4.0-qubes-menus.patch + +BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 +BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} +BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gthread-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 +BuildRequires: gcc-c++ +BuildRequires: gtk-doc +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: gobject-introspection-devel + +Obsoletes: libxfce4menu < 4.6.3 +# because of %%{_datadir}/desktop-directories/xfce-* +Conflicts: xfdesktop <= 4.6.2 + +Requires: qubes-menus + +%description +Garcon is an implementation of the freedesktop.org menu specification replacing +the former Xfce menu library libxfce4menu. It is based on GLib/GIO only and +aims at covering the entire specification except for legacy menus. + +%package devel +Summary: Development files for %{name} +Requires: %{name} = %{version}-%{release} +Requires: gtk2-devel +Requires: pkgconfig +Obsoletes: libxfce4menu-devel < 4.6.2 + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q +%patch0 -p1 -b.redhat-menus + + +%build +%configure --disable-static --enable-gtk-doc + +%make_build + + +%install +%make_install + +# fix permissions for libraries +chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +%find_lang %{name} +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories + + +%files -f %{name}.lang +%license COPYING +%doc AUTHORS ChangeLog NEWS README +%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu +%{_libdir}/*.so.* +%{_datadir}/desktop-directories/*.directory + + +%files devel +%doc HACKING STATUS TODO +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%doc %{_datadir}/gtk-doc/ + + +%changelog +@CHANGELOG@ \ No newline at end of file diff --git a/rel b/rel new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/rel @@ -0,0 +1 @@ +4 diff --git a/series-debian.conf b/series-debian.conf new file mode 100644 index 0000000..697a1ae --- /dev/null +++ b/series-debian.conf @@ -0,0 +1 @@ +garcon-0.4.0-qubes-menus.patch diff --git a/sources b/sources deleted file mode 100644 index 3169510..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d75e4753037a74733c07b71b8db7a656d869869f0f107f6411a306bbc87a762d garcon-0.6.4.tar.bz2 diff --git a/version b/version new file mode 100644 index 0000000..d2b13eb --- /dev/null +++ b/version @@ -0,0 +1 @@ +0.6.4