February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Task-Kensho-XML for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package perl-Task-Kensho-XML for openSUSE:Factory checked in at 2015-02-25 02:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Task-Kensho-XML (Old) and /work/SRC/openSUSE:Factory/.perl-Task-Kensho-XML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Task-Kensho-XML" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Task-Kensho-XML/perl-Task-Kensho-XML.changes 2012-01-27 21:28:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Task-Kensho-XML.new/perl-Task-Kensho-XML.changes 2015-02-25 02:16:47.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 7 07:21:43 UTC 2015 - coolo(a)suse.com + +- updated to 0.38, version bump + +------------------------------------------------------------------- Old: ---- Task-Kensho-XML-0.28.tar.gz New: ---- Task-Kensho-XML-0.38.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Task-Kensho-XML.spec ++++++ --- /var/tmp/diff_new_pack.PCJutk/_old 2015-02-25 02:16:48.000000000 +0100 +++ /var/tmp/diff_new_pack.PCJutk/_new 2015-02-25 02:16:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Task-Kensho-XML # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,51 +17,82 @@ Name: perl-Task-Kensho-XML -Version: 0.28 +Version: 0.38 Release: 0 %define cpan_name Task-Kensho-XML -Summary: A Glimpse at an Enlightened Perl (XML) -License: GPL-1.0+ or Artistic-1.0 +Summary: A Glimpse at an Enlightened Perl: XML Development +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Task-Kensho-XML/ -Source: http://www.cpan.org/authors/id/A/AP/APEIRON/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(Module::Build::Tiny) >= 0.038 +BuildRequires: perl(RDF::Trine) BuildRequires: perl(XML::Generator::PerlData) BuildRequires: perl(XML::LibXML) +BuildRequires: perl(XML::LibXSLT) BuildRequires: perl(XML::SAX) BuildRequires: perl(XML::SAX::Writer) -Requires: perl(XML::Generator::PerlData) -Requires: perl(XML::LibXML) -Requires: perl(XML::SAX) -Requires: perl(XML::SAX::Writer) +Recommends: perl(RDF::Trine) +Recommends: perl(XML::Generator::PerlData) +Recommends: perl(XML::LibXML) +Recommends: perl(XML::LibXSLT) +Recommends: perl(XML::SAX) +Recommends: perl(XML::SAX::Writer) %{perl_requires} %description -A Glimpse at an Enlightened Perl (XML) +From the http://en.wikipedia.org/wiki/Kensho manpage: + + Kenshō (見性) (C. Wu) is a Japanese term for enlightenment experiences - + most commonly used within the confines of Zen Buddhism - literally + meaning "seeing one's nature"[1] or "true self."[2] It generally + "refers to the realization of nonduality of subject and object."[3] + +the Task::Kensho manpage is a list of recommended modules for Enlightened +Perl development. CPAN is wonderful, but there are too many wheels and you +have to pick and choose amongst the various competing technologies. + +The plan is for the Task::Kensho manpage to be a rough testing ground for +ideas that go into among other things the Enlightened Perl Organisation +Extended Core (EPO-EC). + +The modules that are bundled by the Task::Kensho manpage are broken down +into several categories and are still being considered. They are all taken +from various top 100 most used perl modules lists and from discussions with +various subject matter experts in the Perl Community. That said, this +bundle does _not_ follow the guidelines established for the EPO-EC for peer +review via industry advisers. + +Starting in 2011, the Task::Kensho manpage split its sub-groups of modules +into individually-installable tasks. Each the Task::Kensho manpage sub-task +is listed at the beginning of its section in this documentation. + +When installing the Task::Kensho manpage itself, you will be asked to +install each sub-task in turn, or you can install individual tasks +separately. These individual tasks will always install all their modules by +default. This facilitates the ease and simplicity the distribution aims to +achieve. %prep %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} +%{__perl} Build.PL --installdirs=vendor +./Build build --flags=%{?_smp_mflags} %check -%{__make} test +./Build test %install -%perl_make_install -%perl_process_packlist +./Build install --destdir=%{buildroot} --create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes MYMETA.yml README +%doc Changes LICENSE README weaver.ini %changelog ++++++ Task-Kensho-XML-0.28.tar.gz -> Task-Kensho-XML-0.38.tar.gz ++++++ ++++ 6289 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBIx-Class-Fixtures for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package perl-DBIx-Class-Fixtures for openSUSE:Factory checked in at 2015-02-25 02:16:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DBIx-Class-Fixtures (Old) and /work/SRC/openSUSE:Factory/.perl-DBIx-Class-Fixtures.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DBIx-Class-Fixtures" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.perl-DBIx-Class-Fixtures.new/perl-DBIx-Class-Fixtures.changes 2015-02-25 02:16:40.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Dec 2 10:02:28 UTC 2014 - coolo(a)suse.com + +- initial package 1.001026 + * created by cpanspec 1.78.08 + New: ---- DBIx-Class-Fixtures-1.001026.tar.gz perl-DBIx-Class-Fixtures.changes perl-DBIx-Class-Fixtures.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBIx-Class-Fixtures.spec ++++++ # # spec file for package perl-DBIx-Class-Fixtures # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-DBIx-Class-Fixtures Version: 1.001026 Release: 0 %define cpan_name DBIx-Class-Fixtures Summary: Dump data and repopulate a database using rules License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/DBIx-Class-Fixtures/ Source: http://www.cpan.org/authors/id/S/SK/SKAUFMAN/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Class::Accessor::Grouped) >= 0.1001 BuildRequires: perl(Config::Any) >= 0.23 BuildRequires: perl(DBIx::Class) >= 0.08102 BuildRequires: perl(DBIx::Class::InflateColumn::FS) >= 0.01007 BuildRequires: perl(DBIx::Class::Schema::Loader) >= 0.07035 BuildRequires: perl(Data::Dump::Streamer) >= 2.05 BuildRequires: perl(Data::Visitor) >= 0.3 BuildRequires: perl(DateTime) >= 1.03 BuildRequires: perl(DateTime::Format::MySQL) BuildRequires: perl(DateTime::Format::Pg) BuildRequires: perl(DateTime::Format::SQLite) >= 0.1 BuildRequires: perl(File::Copy::Recursive) >= 0.38 BuildRequires: perl(File::Path) >= 2.09 BuildRequires: perl(File::Spec::Functions) >= 3.4 BuildRequires: perl(Hash::Merge) >= 0.1 BuildRequires: perl(JSON::Syck) >= 1.27 BuildRequires: perl(Path::Class) >= 0.32 BuildRequires: perl(Scalar::Util) >= 1.27 BuildRequires: perl(Test::Compile::Internal) BuildRequires: perl(Test::More) >= 0.98 Requires: perl(Class::Accessor::Grouped) >= 0.1001 Requires: perl(Config::Any) >= 0.23 Requires: perl(DBIx::Class) >= 0.08102 Requires: perl(DBIx::Class::Schema::Loader) >= 0.07035 Requires: perl(Data::Dump::Streamer) >= 2.05 Requires: perl(Data::Visitor) >= 0.3 Requires: perl(DateTime) >= 1.03 Requires: perl(DateTime::Format::MySQL) Requires: perl(DateTime::Format::Pg) Requires: perl(DateTime::Format::SQLite) >= 0.1 Requires: perl(File::Copy::Recursive) >= 0.38 Requires: perl(File::Path) >= 2.09 Requires: perl(File::Spec::Functions) >= 3.4 Requires: perl(Hash::Merge) >= 0.1 Requires: perl(JSON::Syck) >= 1.27 Requires: perl(Path::Class) >= 0.32 Requires: perl(Scalar::Util) >= 1.27 Requires: perl(Test::Compile::Internal) %{perl_requires} %description Dump fixtures from source database to filesystem then import to another database (with same schema) at any time. Use as a constant dataset for running tests against or for populating development databases when impractical to use production clones. Describe fixture set using relations and conditions based on your DBIx::Class schema. %prep %setup -q -n %{cpan_name}-%{version} find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %files -f %{name}.files %defattr(-,root,root,755) %doc Changes LICENSE README %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2015-02-25 02:16:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod" Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2014-11-29 08:39:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-02-25 02:16:29.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 22 10:41:40 UTC 2015 - meissner(a)suse.com + +- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly + +------------------------------------------------------------------- New: ---- kmod-blacklist-fixtest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.SbAcZH/_old 2015-02-25 02:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.SbAcZH/_new 2015-02-25 02:16:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch +Patch6: kmod-blacklist-fixtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -99,7 +100,7 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build autoreconf -fi @@ -154,7 +155,7 @@ %endif %check -make check +make check V=1 %post -n %lname -p /sbin/ldconfig ++++++ kmod-blacklist-fixtest.patch ++++++ In upstream git: 0af8f786c0bae8c10d9b463d72e72cc6e80c26a2 From: Marcus Meissner and d2db083ab6f8491e806c72888d897d15584f9f17 From: Lucas De Marchi Index: kmod-19/testsuite/test-blacklist.c =================================================================== --- kmod-19.orig/testsuite/test-blacklist.c +++ kmod-19/testsuite/test-blacklist.c @@ -92,14 +92,13 @@ fail_lookup: kmod_unref(ctx); return EXIT_FAILURE; } -static const struct test sblacklist_1 = { - .name = "blacklist_1", + +DEFINE_TEST(blacklist_1, .description = "check if modules are correctly blacklisted", - .func = blacklist_1, .config = { [TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/", }, .need_spawn = true, -}; +); TESTSUITE_MAIN(); Index: kmod-19/testsuite/test-dependencies.c =================================================================== --- kmod-19.orig/testsuite/test-dependencies.c +++ kmod-19/testsuite/test-dependencies.c @@ -76,15 +76,13 @@ static int test_dependencies(const struc return EXIT_SUCCESS; } -static const struct test stest_dependencies = { - .name = "test_dependencies", +DEFINE_TEST(test_dependencies, .description = "test if kmod_module_get_dependencies works", - .func = test_dependencies, .config = { [TC_ROOTFS] = TESTSUITE_ROOTFS "test-dependencies/", [TC_UNAME_R] = TEST_UNAME, }, .need_spawn = true, -}; +) TESTSUITE_MAIN(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sash for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package sash for openSUSE:Factory checked in at 2015-02-25 02:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sash (Old) and /work/SRC/openSUSE:Factory/.sash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sash" Changes: -------- --- /work/SRC/openSUSE:Factory/sash/sash.changes 2014-11-24 11:14:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sash.new/sash.changes 2015-02-25 02:16:22.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 22 08:49:55 UTC 2015 - meissner(a)suse.com + +- sash-Makefile.diff: use -static to make the PIE detector work. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sash.spec ++++++ --- /var/tmp/diff_new_pack.dOI1xG/_old 2015-02-25 02:16:23.000000000 +0100 +++ /var/tmp/diff_new_pack.dOI1xG/_new 2015-02-25 02:16:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sash # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ sash-Makefile.diff ++++++ --- /var/tmp/diff_new_pack.dOI1xG/_old 2015-02-25 02:16:23.000000000 +0100 +++ /var/tmp/diff_new_pack.dOI1xG/_new 2015-02-25 02:16:23.000000000 +0100 @@ -23,7 +23,7 @@ sash: $(OBJS) - $(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS) - strip sash -+ $(CC) -o sash $(OBJS) -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic -lc ++ $(CC) -o sash $(OBJS) -static $(LIBS) -Wl,-Bdynamic -lc clean: rm -f $(OBJS) sash -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit biosdevname for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package biosdevname for openSUSE:Factory checked in at 2015-02-25 02:16:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/biosdevname (Old) and /work/SRC/openSUSE:Factory/.biosdevname.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "biosdevname" Changes: -------- --- /work/SRC/openSUSE:Factory/biosdevname/biosdevname.changes 2014-08-15 09:58:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.biosdevname.new/biosdevname.changes 2015-02-25 02:16:18.000000000 +0100 @@ -1,0 +2,20 @@ +Sat Feb 21 22:49:47 UTC 2015 - meissner(a)suse.com + +- biosdevname-pic.patch: make cpuid() not expose %ebx out of + assembler, so we can build it with -fPIE. + +------------------------------------------------------------------- +Thu Jan 22 13:02:08 UTC 2015 - trenn(a)suse.de + +- Update to version 0.6.1 +- Do not disable rule via perl script in .spec file, better use a patch + (biosdevname_udevrule_rename_all_network_devices.patch) +- Modify configure.ac via sed to make use of %{_udevruledir} from .spec file +- Remove already integrated patches in latest source code: + Delete biosdevname_v0.5.0_to_git_c140ce659a204d67e4cc.patch + Delete biosdevname_udevrule_rename_all_network_devices.patch + Delete fix_several_PCI_root_ports_in_one_bus.patch + Modify udev-rule-path.patch + Modify whitelist-dell + +------------------------------------------------------------------- Old: ---- biosdevname-0.5.0.tar.bz2 biosdevname_udevrule_rename_all_network_devices.patch biosdevname_v0.5.0_to_git_c140ce659a204d67e4cc.patch fix_several_PCI_root_ports_in_one_bus.patch New: ---- biosdevname-0.6.1.tar.bz2 biosdevname-pic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ biosdevname.spec ++++++ --- /var/tmp/diff_new_pack.8FooSe/_old 2015-02-25 02:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.8FooSe/_new 2015-02-25 02:16:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package biosdevname # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,8 @@ # - Name: biosdevname -Version: 0.5.0 +Version: 0.6.1 Release: 0 Summary: Udev helper for naming devices per BIOS names License: GPL-2.0 @@ -30,16 +29,15 @@ # on LKML. ExclusiveArch: %{ix86} x86_64 Source0: %{name}-%{version}.tar.bz2 -Patch1: biosdevname_v0.5.0_to_git_c140ce659a204d67e4cc.patch -Patch2: ignore-broken-BIOSes -Patch3: whitelist-dell -Patch4: udev-rule-path.patch -Patch5: biosdevname_udevrule_rename_all_network_devices.patch -Patch6: fix_several_PCI_root_ports_in_one_bus.patch +Patch1: ignore-broken-BIOSes +Patch2: whitelist-dell +Patch3: udev-rule-path.patch +Patch4: biosdevname-pic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: pciutils-devel BuildRequires: pkgconfig +BuildRequires: sed BuildRequires: zlib-devel # to figure out how to name/location of the rules file BuildRequires: libudev-devel @@ -66,27 +64,23 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build -# this is a udev rule, so it needs to live in / rather than /usr -./autogen.sh --no-configure +sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac +autoreconf %configure --disable-rpath --prefix=/ --bindir=/bin --sbindir=/sbin make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT rm %{buildroot}/sbin/%{name}S || : -# remain disabled by default -perl -pi -e 's,^# GOTO,GOTO,g;' \ - $RPM_BUILD_ROOT/%{_udevrulesdir}/*-biosdevname.rules %files %defattr(-,root,root,-) %doc COPYING README /sbin/%{name} %{_udevrulesdir}/*%{name}.rules + %{_mandir}/man1/* %post ++++++ biosdevname-0.5.0.tar.bz2 -> biosdevname-0.6.1.tar.bz2 ++++++ ++++ 15990 lines of diff (skipped) ++++++ biosdevname-pic.patch ++++++ Index: biosdevname-0.6.1/src/bios_dev_name.c =================================================================== --- biosdevname-0.6.1.orig/src/bios_dev_name.c +++ biosdevname-0.6.1/src/bios_dev_name.c @@ -114,10 +114,21 @@ static u_int32_t cpuid (u_int32_t eax, u_int32_t ecx) { asm volatile ( - "xor %%ebx, %%ebx; cpuid" +#ifdef __x86_64__ + "push %%rbx\n" +#else + "push %%ebx\n" +#endif + "xor %%ebx, %%ebx\n" /* not useful? ebx is overwritten by call? */ + "cpuid\n" +#ifdef __x86_64__ + "pop %%rbx\n" +#else + "pop %%ebx\n" +#endif : "=a" (eax), "=c" (ecx) : "a" (eax) - : "%ebx", "%edx"); + : "%edx"); return ecx; } ++++++ ignore-broken-BIOSes ++++++ --- /var/tmp/diff_new_pack.8FooSe/_old 2015-02-25 02:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.8FooSe/_new 2015-02-25 02:16:19.000000000 +0100 @@ -1,10 +1,13 @@ ---- biosdevname-0.3.8/biosdevname.rules.in.orig 2011-03-09 00:58:08.000000000 +0100 -+++ biosdevname-0.3.8/biosdevname.rules.in 2011-08-01 15:13:10.000000000 +0200 -@@ -18,6 +18,6 @@ LABEL="netdevicename_start" +Index: biosdevname-0.6.1/biosdevname.rules.in +=================================================================== +--- biosdevname-0.6.1.orig/biosdevname.rules.in 2015-01-21 16:00:20.790396992 +0100 ++++ biosdevname-0.6.1/biosdevname.rules.in 2015-01-21 16:01:54.926398489 +0100 +@@ -19,6 +19,7 @@ # using NAME= instead of setting INTERFACE_NAME, so that persistent # names aren't generated for these devices, they are "named" on each boot. --PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace" -+PROGRAM="/sbin/biosdevname --policy physical --smbios 2.6 --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace" +-SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace" ++SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical --smbios 2.6 ++ --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace" LABEL="netdevicename_end" ++++++ udev-rule-path.patch ++++++ --- /var/tmp/diff_new_pack.8FooSe/_old 2015-02-25 02:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.8FooSe/_new 2015-02-25 02:16:19.000000000 +0100 @@ -1,16 +1,52 @@ -Index: biosdevname-0.5.0/configure.ac +Index: biosdevname-0.6.1/configure.ac =================================================================== ---- biosdevname-0.5.0.orig/configure.ac -+++ biosdevname-0.5.0/configure.ac -@@ -70,7 +70,10 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset - # handles default udev rules as of udev 114 or thereabouts - RULEDEST=/lib/udev/rules.d/71-biosdevname.rules +--- biosdevname-0.6.1.orig/configure.ac 2014-12-01 16:05:47.000000000 +0100 ++++ biosdevname-0.6.1/configure.ac 2015-01-22 13:24:22.231621837 +0100 +@@ -66,20 +66,9 @@ + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtol strtoul]) +-# this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu +-# handles default udev rules as of udev 114 or thereabouts +-RULEDEST=/lib/udev/rules.d/71-biosdevname.rules +- -if [[ -e /etc/udev/rules.d/60-net.rules ]]; then -+if [[ -e /usr/lib/udev/rules.d/95-udev-late.rules ]]; then -+ # openSUSE 12.3+ -+ RULEDEST=/usr/lib/udev/rules.d/71-biosdevname.rules -+elif [[ -e /etc/udev/rules.d/60-net.rules ]]; then - # RHEL 5 / Fedora - RULEDEST=/etc/udev/rules.d/60-biosdevname.rules - elif [[ -e /etc/udev/rules.d/31-network.rules ]]; then +- # RHEL 5 / Fedora +- RULEDEST=/etc/udev/rules.d/60-biosdevname.rules +-elif [[ -e /etc/udev/rules.d/31-network.rules ]]; then +- # SLES 10 +- RULEDEST=/etc/udev/rules.d/31-biosdevname.rules +-elif [[ -e /etc/udev/rules.d/25-iftab.rules ]]; then +- # older Ubuntu +- RULEDEST=/etc/udev/rules.d/25-biosdevname.rules +-fi ++# Only way to make this robust: Replace for each distro with the correct path ++# /lib/udev/rules.d/71-biosdevname.rules ++RULEDEST=@@BIOSDEVNAME_RULEDEST@@ + RULEDIR=$(dirname $RULEDEST) + AC_SUBST(RULEDEST, $RULEDEST) + AC_SUBST(RULEDIR, $RULEDIR) +Index: biosdevname-0.6.1/configure +=================================================================== +--- biosdevname-0.6.1.orig/configure 2014-12-01 16:06:21.000000000 +0100 ++++ biosdevname-0.6.1/configure 2015-01-22 13:48:51.915645203 +0100 +@@ -7305,18 +7305,7 @@ + + # this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu + # handles default udev rules as of udev 114 or thereabouts +-RULEDEST=/lib/udev/rules.d/71-biosdevname.rules +- +-if [ -e /etc/udev/rules.d/60-net.rules ]; then +- # RHEL 5 / Fedora +- RULEDEST=/etc/udev/rules.d/60-biosdevname.rules +-elif [ -e /etc/udev/rules.d/31-network.rules ]; then +- # SLES 10 +- RULEDEST=/etc/udev/rules.d/31-biosdevname.rules +-elif [ -e /etc/udev/rules.d/25-iftab.rules ]; then +- # older Ubuntu +- RULEDEST=/etc/udev/rules.d/25-biosdevname.rules +-fi ++RULEDEST=@@BIOSDEVNAME_RULEDEST@@ + RULEDIR=$(dirname $RULEDEST) + RULEDEST=$RULEDEST + ++++++ whitelist-dell ++++++ --- /var/tmp/diff_new_pack.8FooSe/_old 2015-02-25 02:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.8FooSe/_new 2015-02-25 02:16:19.000000000 +0100 @@ -1,8 +1,10 @@ ---- biosdevname-0.3.8/biosdevname.rules.in.orig 2011-08-03 18:06:57.000000000 +0200 -+++ biosdevname-0.3.8/biosdevname.rules.in 2011-08-03 18:07:59.000000000 +0200 -@@ -3,6 +3,9 @@ - ACTION!="add", GOTO="netdevicename_end" - NAME=="?*", GOTO="netdevicename_end" +Index: biosdevname-0.6.1/biosdevname.rules.in +=================================================================== +--- biosdevname-0.6.1.orig/biosdevname.rules.in 2015-01-22 13:18:19.275616067 +0100 ++++ biosdevname-0.6.1/biosdevname.rules.in 2015-01-22 13:59:10.967655045 +0100 +@@ -4,6 +4,9 @@ + ATTR{type}!="1", GOTO="netdevicename_end" + ENV{DEVTYPE}=="?*", GOTO="netdevicename_end" +# whitelist all Dell systems +ATTR{[dmi/id]sys_vendor}=="Dell*", ENV{UDEV_BIOSDEVNAME}="1" @@ -10,3 +12,14 @@ # kernel command line "biosdevname={0|1}" can turn off/on biosdevname IMPORT{cmdline}="biosdevname" ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}" +@@ -12,8 +15,8 @@ + ENV{UDEV_BIOSDEVNAME}=="0", GOTO="netdevicename_end" + ENV{UDEV_BIOSDEVNAME}=="1", GOTO="netdevicename_start" + +-# uncomment the next line for biosdevname to be off by default +-# GOTO="netdevicename_end" ++# comment the next line for biosdevname to be on by default ++GOTO="netdevicename_end" + + LABEL="netdevicename_start" + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vino for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package vino for openSUSE:Factory checked in at 2015-02-25 02:16:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vino (Old) and /work/SRC/openSUSE:Factory/.vino.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vino" Changes: -------- --- /work/SRC/openSUSE:Factory/vino/vino.changes 2014-11-18 22:44:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vino.new/vino.changes 2015-02-25 02:16:16.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Feb 20 19:31:42 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.14.2: + + Skip intermediate file with Automake 1.15. + + Fix Turkish desktop keywords translation. + + Handle closed signal properly on notification prompt. + + Updated translations. + +------------------------------------------------------------------- Old: ---- vino-3.14.1.tar.xz New: ---- vino-3.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.bhR8UI/_old 2015-02-25 02:16:17.000000000 +0100 +++ /var/tmp/diff_new_pack.bhR8UI/_new 2015-02-25 02:16:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vino # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: vino -Version: 3.14.1 +Version: 3.14.2 Release: 0 Summary: GNOME VNC Server License: GPL-2.0+ ++++++ vino-3.14.1.tar.xz -> vino-3.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/ChangeLog new/vino-3.14.2/ChangeLog --- old/vino-3.14.1/ChangeLog 2014-11-10 22:47:04.000000000 +0100 +++ new/vino-3.14.2/ChangeLog 2015-02-18 12:11:38.000000000 +0100 @@ -1,3 +1,35 @@ +2015-02-18 David King <amigadave(a)amigadave.com> + + Update NEWS for 3.14.2 + +2015-02-18 David King <amigadave(a)amigadave.com> + + Fix Turkish desktop keywords translation + +2015-02-18 David King <amigadave(a)amigadave.com> + + Skip intermediate file with Automake 1.15 + +2015-02-18 Ondrej Holy <oholy(a)redhat.com> + + Handle closed signal properly on notification prompt + + When the notification is closed (e.g. by close button), closed signal + is emitted. This signal isn't handled currently and therefore + vino-server is still waiting for response and block new notification + from client (also doesn't close the connection). Handle close signal + properly to fix this bug. + + https://bugzilla.gnome.org/show_bug.cgi?id=744692 + +2015-01-20 Necdet Yücel <necdetyucel(a)gmail.com> + + Updated Turkish translation + +2015-01-09 David King <amigadave(a)amigadave.com> + + Fix Turkish desktop keywords translation + 2014-11-10 David King <amigadave(a)amigadave.com> Update NEWS for 3.14.1 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/Makefile.in new/vino-3.14.2/Makefile.in --- old/vino-3.14.1/Makefile.in 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/Makefile.in 2015-02-18 12:10:57.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,21 +93,6 @@ host_triplet = @host@ libexec_PROGRAMS = vino-server$(EXEEXT) subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(dist_noinst_SCRIPTS) \ - $(top_srcdir)/build-aux/depcomp \ - $(am__dist_clientfile_DATA_DIST) $(dist_convert_DATA) \ - $(dist_noinst_DATA) COPYING build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -105,6 +100,10 @@ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_noinst_SCRIPTS) \ + $(am__dist_clientfile_DATA_DIST) $(dist_convert_DATA) \ + $(dist_noinst_DATA) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -339,6 +338,17 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing AUTHORS COPYING ChangeLog \ + INSTALL NEWS README build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -804,7 +814,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -2097,15 +2106,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -2141,17 +2150,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -2361,6 +2370,8 @@ uninstall-libexecPROGRAMS uninstall-nodist_applicationsDATA \ uninstall-nodist_serviceDATA +.PRECIOUS: Makefile + server/vino-marshal.h: server/vino-marshal.list $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=vino_marshal $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/NEWS new/vino-3.14.2/NEWS --- old/vino-3.14.1/NEWS 2014-11-10 22:46:12.000000000 +0100 +++ new/vino-3.14.2/NEWS 2015-02-18 12:10:14.000000000 +0100 @@ -1,3 +1,17 @@ +Vino 3.14.2 +=========== + +David King (3): + Fix Turkish desktop keywords translation + Skip intermediate file with Automake 1.15 + Fix Turkish desktop keywords translation + +Necdet Yücel (1): + Updated Turkish translation + +Ondrej Holy (1): + Handle closed signal properly on notification prompt + Vino 3.14.1 =========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/aclocal.m4 new/vino-3.14.2/aclocal.m4 --- old/vino-3.14.1/aclocal.m4 2014-11-10 22:46:38.000000000 +0100 +++ new/vino-3.14.2/aclocal.m4 2015-02-18 12:10:54.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -540,7 +540,7 @@ # gnome-compiler-flags.m4 # -# serial 2 +# serial 4 # dnl GNOME_COMPILE_WARNINGS @@ -552,7 +552,7 @@ dnl Additional warning/error flags can be passed as an optional second argument. dnl dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +AU_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** @@ -589,6 +589,7 @@ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ + -Werror=return-type \ " dnl Additional warning or error flags provided by the module author to @@ -659,11 +660,14 @@ WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-c. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_comp…) dnl For C++, do basically the same thing. -AC_DEFUN([GNOME_CXX_WARNINGS],[ +AU_DEFUN([GNOME_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, @@ -714,7 +718,10 @@ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" AC_SUBST(WARN_CXXFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-cxx. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_comp…) dnl GLIB_GSETTINGS dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether @@ -800,7 +807,7 @@ ] ) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -812,10 +819,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -831,14 +838,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -883,15 +890,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -922,7 +928,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1113,7 +1119,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1189,7 +1195,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1279,8 +1285,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1353,7 +1359,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1382,7 +1392,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1393,7 +1403,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1403,7 +1413,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1425,7 +1435,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1460,7 +1470,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1510,7 +1520,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1549,7 +1559,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1578,7 +1588,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1625,7 +1635,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1644,7 +1654,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1725,7 +1735,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1785,7 +1795,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1813,7 +1823,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1832,7 +1842,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/compile new/vino-3.14.2/build-aux/compile --- old/vino-3.14.1/build-aux/compile 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/compile 2015-02-18 12:10:56.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/config.guess new/vino-3.14.2/build-aux/config.guess --- old/vino-3.14.1/build-aux/config.guess 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/config.guess 2015-02-18 12:10:56.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues… # -# Please send patches with a ChangeLog entry to config-patches(a)gnu.org. +# Please send patches to <config-patches(a)gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -579,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/config.sub new/vino-3.14.2/build-aux/config.sub --- old/vino-3.14.1/build-aux/config.sub 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/config.sub 2015-02-18 12:10:56.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches(a)gnu.org. +# Please send patches to <config-patches(a)gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -260,7 +260,7 @@ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ - | fido | fr30 | frv \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -302,6 +302,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -312,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -326,6 +328,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -436,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -773,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/depcomp new/vino-3.14.2/build-aux/depcomp --- old/vino-3.14.1/build-aux/depcomp 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/depcomp 2015-02-18 12:10:56.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/install-sh new/vino-3.14.2/build-aux/install-sh --- old/vino-3.14.1/build-aux/install-sh 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/install-sh 2015-02-18 12:10:56.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$dst" : 'X$//$[^/]' \| \ - X"$dst" : 'X$//$$' \| \ - X"$dst" : 'X$/$' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X$\/\/$[^/].*/{ - s//\1/ - q - } - /^X$\/\/$$/{ - s//\1/ - q - } - /^X$\/$.*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/build-aux/missing new/vino-3.14.2/build-aux/missing --- old/vino-3.14.1/build-aux/missing 2014-11-10 22:46:40.000000000 +0100 +++ new/vino-3.14.2/build-aux/missing 2015-02-18 12:10:56.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/configure new/vino-3.14.2/configure --- old/vino-3.14.1/configure 2014-11-10 22:46:39.000000000 +0100 +++ new/vino-3.14.2/configure 2015-02-18 12:10:55.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Vino 3.14.1. +# Generated by GNU Autoconf 2.69 for Vino 3.14.2. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=vino>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='Vino' PACKAGE_TARNAME='vino' -PACKAGE_VERSION='3.14.1' -PACKAGE_STRING='Vino 3.14.1' +PACKAGE_VERSION='3.14.2' +PACKAGE_STRING='Vino 3.14.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=vino' PACKAGE_URL='https://wiki.gnome.org/Projects/Vino' @@ -1408,7 +1408,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Vino 3.14.1 to adapt to many kinds of systems. +\`configure' configures Vino 3.14.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Vino 3.14.1:";; + short | recursive ) echo "Configuration of Vino 3.14.2:";; esac cat <<\_ACEOF @@ -1625,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Vino configure 3.14.1 +Vino configure 3.14.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +1994,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Vino $as_me 3.14.1, which was +It was created by Vino $as_me 3.14.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2376,7 +2376,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2548,8 +2548,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2568,7 +2568,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2862,7 +2862,7 @@ # Define the identity of the package. PACKAGE='vino' - VERSION='3.14.1' + VERSION='3.14.2' # Some tools Automake needs. @@ -2887,8 +2887,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2945,6 +2945,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4095,6 +4096,7 @@ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ + -Werror=return-type \ " additional_flags="" @@ -15591,7 +15593,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Vino $as_me 3.14.1, which was +This file was extended by Vino $as_me 3.14.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15658,7 +15660,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Vino config.status 3.14.1 +Vino config.status 3.14.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/configure.ac new/vino-3.14.2/configure.ac --- old/vino-3.14.1/configure.ac 2014-11-10 22:45:53.000000000 +0100 +++ new/vino-3.14.2/configure.ac 2015-02-18 12:10:23.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([Vino], [3.14.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://wiki.gnome.org/Projects/Vino]) +AC_INIT([Vino], [3.14.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://wiki.gnome.org/Projects/Vino]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([server/vino-fb.c]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/po/POTFILES.skip new/vino-3.14.2/po/POTFILES.skip --- old/vino-3.14.1/po/POTFILES.skip 2014-01-09 16:33:58.000000000 +0100 +++ new/vino-3.14.2/po/POTFILES.skip 2015-02-18 12:06:47.000000000 +0100 @@ -1 +1,2 @@ server/vino-server.desktop.in +sub/server/vino-server.desktop.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/po/tr.po new/vino-3.14.2/po/tr.po --- old/vino-3.14.1/po/tr.po 2014-11-10 22:41:48.000000000 +0100 +++ new/vino-3.14.2/po/tr.po 2015-02-18 12:09:23.000000000 +0100 @@ -5,22 +5,24 @@ # # Baris Cicek <baris(a)teamforce.name.tr>, 2004, 2007, 2008, 2009. # Muhammet Kara <muhammetk(a)acikkaynak.name.tr>, 2011, 2012. +# Necdet Yücel <necdetyucel(a)gmail.com>, 2014. # msgid "" msgstr "" "Project-Id-Version: vino\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=vino&keywords=I18N+L10N&component=Preferences Dialog\n" -"POT-Creation-Date: 2014-11-10 11:51+0000\n" -"PO-Revision-Date: 2014-11-10 20:45+0200\n" -"Last-Translator: etc <etcetin(a)gmail.com>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vino&ke" +"ywords=I18N+L10N&component=Preferences Dialog\n" +"POT-Creation-Date: 2014-12-21 00:00+0000\n" +"PO-Revision-Date: 2014-12-22 20:25+0000\n" +"Last-Translator: Necdet Yücel <necdetyucel(a)gmail.com>\n" "Language-Team: Türkçe <gnome-turk(a)gnome.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Pootle 2.5.1.1\n" +"X-POOTLE-MTIME: 1419279947.000000\n" #: ../common/org.gnome.Vino.gschema.xml.h:1 msgid "Prompt the user before completing a connection" @@ -53,7 +55,6 @@ msgstr "Dinlemek için ağ arayüzü" #: ../common/org.gnome.Vino.gschema.xml.h:6 -#, fuzzy #| msgid "" #| "If not set, the server will listen on all network interfaces.\n" #| "\n" @@ -68,14 +69,13 @@ "Eğer atanmamışsa, sunucu tüm ağ arayüzleri üzerinden dinler.\n" "\n" "Bunu eğer sadece bazı belirli ağ arayüzleri üzerinden bağlantı kabul etmek " -"istiyorsanız atayın. örn: eth0, wiki0, lo, ..." +"istiyorsanız ayarlayın. Örneğin eth0, wiki0, lo ve benzeri gibi." #: ../common/org.gnome.Vino.gschema.xml.h:9 msgid "Listen on an alternative port" msgstr "Alternatif bir port üzerinden dinle" #: ../common/org.gnome.Vino.gschema.xml.h:10 -#, fuzzy #| msgid "" #| "If true, the server will listen to another port, instead of the default " #| "(5900). The port must be specified in the 'alternative-port' key." @@ -83,15 +83,14 @@ "If true, the server will listen on another port, instead of the default " "(5900). The port must be specified in the 'alternative-port' key." msgstr "" -"Eğer seçiliyse, sunucu öntanımlı port yerine (5900) başka bir port üzerinde " -"dinleyecek. Bu port, 'alternative-port' anahtarında belirtilmelidir." +"Eğer seçiliyse, sunucu varsayılan port yerine (5900) başka bir port üzerinde " +"dinleyecektir. Bu port, 'alternative-port' anahtarında belirtilmelidir." #: ../common/org.gnome.Vino.gschema.xml.h:11 msgid "Alternative port number" msgstr "Alternatif port numarası" #: ../common/org.gnome.Vino.gschema.xml.h:12 -#, fuzzy #| msgid "" #| "The port which the server will listen to if the 'use-alternative-port' " #| "key is set to true. Valid values are in the range from 5000 to 50000." @@ -99,8 +98,8 @@ "The port which the server will listen to if the 'use-alternative-port' key " "is set to true. Valid values are in the range of 5000 to 50000." msgstr "" -"Eğer 'use-alternative-port' anahtarı seçiliyse sunucunun dinleyeceği port. " -"Geçerli değerler 5000 ile 50000 arasındadır." +"Eğer 'use-alternative-port' anahtarı seçiliyse sunucunun dinleyeceği " +"porttur. Geçerli değerler 5000 ile 50000 arasındadır." #: ../common/org.gnome.Vino.gschema.xml.h:13 msgid "Require encryption" @@ -186,7 +185,6 @@ msgstr "Durum simgesinin ne zaman gösterileceği" #: ../common/org.gnome.Vino.gschema.xml.h:28 -#, fuzzy #| msgid "" #| "This key controls the behavior of the status icon. There are three " #| "options: \"always\" - The icon will be always there; \"client\" - You " @@ -198,16 +196,16 @@ "only be present when someone is connected (this is the default behavior); " "\"never\" - the icon will not be present." msgstr "" -"Bu anahtar durum simgesinin işleyişini kontrol eder. Üç seçenek vardır " -"\"always\" - Simge her zaman orada; \"client\" - Simgeyi sadece birisi " -"bağlandığında görebilirsiniz, bu öntanımlı işleyiştir; \"never\" - Asla " +"Bu anahtar durum simgesinin işleyişini kontrol eder. Üç seçenek vardır \"" +"always\" - simge her zaman orada; \"client\" - simgeyi sadece birisi " +"bağlandığında görebilirsiniz, bu varsayılan işleyiştir; \"never\" - asla " "simge gösterilmez." #: ../common/org.gnome.Vino.gschema.xml.h:29 -#, fuzzy msgid "Whether to disable the desktop background when a user is connected" msgstr "" -"Seçili olduğunda, bir kullanıcı bağlandığında arka planı devre dışı bırak." +"Bir kullanıcı bağlandığında masaüstü arka planının devre dışı bırakılıp " +"bırakılmayacağı" #: ../common/org.gnome.Vino.gschema.xml.h:30 msgid "" @@ -218,10 +216,11 @@ "planını devre dışı bırakır ve tek bir renk bloğu ile değiştirir." #: ../common/org.gnome.Vino.gschema.xml.h:31 -#, fuzzy #| msgid "Whether we should use UPNP to forward the port in routers" msgid "Whether a UPnP router should be used to forward and open ports" -msgstr "Routerlarda portları yönlendirmek için UPnP kullanılması" +msgstr "" +"Portları yönlendirmek ve açmak için bir UPnP yönlendiricinin kullanılıp " +"kullanılmayacağı" #: ../common/org.gnome.Vino.gschema.xml.h:32 msgid "" @@ -427,7 +426,7 @@ #: ../server/vino-server.desktop.in.in.h:3 msgid "vnc;share;remote;" -msgstr "vnc;share;remote;paylaşım;uzakbağlantı" +msgstr "vnc;share;remote;paylaşım;uzakbağlantı;" #: ../server/vino-status-icon.c:97 ../server/vino-status-tube-icon.c:90 msgid "Desktop sharing is enabled" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.14.1/server/vino-prompt.c new/vino-3.14.2/server/vino-prompt.c --- old/vino-3.14.1/server/vino-prompt.c 2013-07-08 23:02:20.000000000 +0200 +++ new/vino-3.14.2/server/vino-prompt.c 2015-02-18 12:04:32.000000000 +0100 @@ -255,6 +255,13 @@ vino_prompt_process_pending_clients (prompt); } +static void +vino_prompt_handle_close (NotifyNotification *notification, + gpointer user_data) +{ + vino_prompt_handle_response (notification, "close", user_data); +} + static gboolean vino_prompt_setup_dialog (VinoPrompt *prompt) { @@ -298,6 +305,9 @@ vino_prompt_handle_response, prompt, NULL); + g_signal_connect (prompt->priv->notification, "closed", + G_CALLBACK (vino_prompt_handle_close), prompt); + g_free (host_label); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qttools for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package libqt5-qttools for openSUSE:Factory checked in at 2015-02-25 02:15:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old) and /work/SRC/openSUSE:Factory/.libqt5-qttools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qttools" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2015-01-21 21:52:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new/libqt5-qttools.changes 2015-02-25 02:16:15.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 20 19:07:14 UTC 2015 - buschmann23(a)opensuse.org + +- added libQt5Sql5-sqlite to the Requires for libqt5-qttools, because + qhelpgenerator needs it to work, what is not automatically recognized by rpm + +------------------------------------------------------------------- +Thu Feb 19 03:32:04 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Add qdbusviewer-restore-the-window-size-and-state-on-startup.patch + and change-creation-date-to-a-fixed-date.patch + +------------------------------------------------------------------- @@ -5,0 +18 @@ + New: ---- change-creation-date-to-a-fixed-date.patch qdbusviewer-restore-the-window-size-and-state-on-startup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qttools.spec ++++++ --- /var/tmp/diff_new_pack.PVmoQx/_old 2015-02-25 02:16:16.000000000 +0100 +++ /var/tmp/diff_new_pack.PVmoQx/_new 2015-02-25 02:16:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qttools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,10 +35,12 @@ Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop - # PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994(a)gmail.com -Patch1: fix-for-opensuse-qmake-qt5.patch - +Patch0: fix-for-opensuse-qmake-qt5.patch +# PATCH-FIX-UPSTREAM qdbusviewer-restore-the-window-size-and-state-on-startup.patch -- qdbusviewer: Restore the window size and state on startup +Patch1: qdbusviewer-restore-the-window-size-and-state-on-startup.patch +# PATCH-FIX-UPSTREAM change-creation-date-to-a-fixed-date.patch +Patch2: change-creation-date-to-a-fixed-date.patch BuildRequires: fdupes BuildRequires: libQt5WebKitWidgets-devel >= %{version} BuildRequires: libqt5-qtbase-devel >= %{version} @@ -46,6 +48,7 @@ BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: libxslt-devel BuildRequires: update-desktop-files +Requires: libQt5Sql5-sqlite Recommends: libqt5-linguist %if %qt5_snapshot #to create the forwarding headers @@ -62,8 +65,9 @@ %prep %setup -q -n qttools-opensource-src-%{real_version} - -%patch1 -p0 +%patch0 -p0 +%patch1 -p1 +%patch2 -p1 %package devel Summary: Qt Development Kit ++++++ change-creation-date-to-a-fixed-date.patch ++++++ From: Sune Vuorela <sune(a)vuorela.dk> Date: Sun, 15 Feb 2015 21:51:44 +0000 Subject: Change creation date to a fixed date X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqttools.git&a=commitdiff&h=d1e639a800a105f4… --- Change creation date to a fixed date Encoding the dates makes reproducing the output impossible, and doesn't really have much gain. It most of the time not relevant when something was built, but more 'what was built' and 'with what tools was it built' In this case, the creation date isn't read by any thing, so it is likely just filler data. Keep the key anyways to not break any third party readers of the file and set a fixed date, in this case the same date as used for a fixed date in QtCore's QLibraryInfo::buildDate function at noon. Change-Id: I560e43dfce538e2f25c3cf51482b946a7cfa179e Reviewed-by: Christian Kandeler <christian.kandeler(a)theqtcompany.com> --- --- a/src/assistant/help/qhelpgenerator.cpp +++ b/src/assistant/help/qhelpgenerator.cpp @@ -369,9 +369,7 @@ d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('qchVersion', '1.0')")); - d->query->prepare(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', ?)")); - d->query->bindValue(0, QDateTime::currentDateTime().toString(Qt::ISODate)); - d->query->exec(); + d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', '2012-12-20T12:00:00')")); return true; } ++++++ qdbusviewer-restore-the-window-size-and-state-on-startup.patch ++++++ From: Alexander Volkov <a.volkov(a)rusbitech.ru> Date: Mon, 22 Sep 2014 12:12:45 +0000 Subject: qdbusviewer: Restore the window size and state on startup --- qdbusviewer: Restore the window size and state on startup Save the window size, maximization state and state of splitters on exit and restore these settings on startup. Change-Id: Ibe26b09cc97ffc2fef17e6e8e2b804324dae7002 Reviewed-by: Thiago Macieira <thiago.macieira(a)intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint(a)theqtcompany.com> --- --- a/src/qdbus/qdbusviewer/main.cpp +++ b/src/qdbus/qdbusviewer/main.cpp @@ -40,6 +40,10 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + + QCoreApplication::setOrganizationName(QStringLiteral("QtProject")); + QCoreApplication::setApplicationName(QStringLiteral("QDBusViewer")); + MainWindow mw; #ifndef Q_OS_MAC app.setWindowIcon(QIcon(QLatin1String(":/qt-project.org/qdbusviewer/images/qdbusviewer.png"))); --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -51,6 +51,7 @@ #include <QtWidgets/QMessageBox> #include <QtDBus/QDBusConnection> +#include <QtCore/QSettings> MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -72,10 +73,17 @@ MainWindow::MainWindow(QWidget *parent) tabWidget = new QTabWidget; setCentralWidget(tabWidget); - QDBusViewer *sessionBusViewer = new QDBusViewer(QDBusConnection::sessionBus()); - QDBusViewer *systemBusViewer = new QDBusViewer(QDBusConnection::systemBus()); + sessionBusViewer = new QDBusViewer(QDBusConnection::sessionBus()); + systemBusViewer = new QDBusViewer(QDBusConnection::systemBus()); tabWidget->addTab(sessionBusViewer, tr("Session Bus")); tabWidget->addTab(systemBusViewer, tr("System Bus")); + + restoreSettings(); +} + +MainWindow::~MainWindow() +{ + saveSettings(); } void MainWindow::addCustomBusTab(const QString &busAddress) @@ -99,3 +107,37 @@ void MainWindow::about() box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } + +static inline QString windowGeometryKey() { return QStringLiteral("WindowGeometry"); } +static inline QString sessionTabGroup() { return QStringLiteral("SessionTab"); } +static inline QString systemTabGroup() { return QStringLiteral("SystemTab"); } + +void MainWindow::saveSettings() +{ + QSettings settings; + + settings.setValue(windowGeometryKey(), saveGeometry()); + + settings.beginGroup(sessionTabGroup()); + sessionBusViewer->saveState(&settings); + settings.endGroup(); + + settings.beginGroup(systemTabGroup()); + systemBusViewer->saveState(&settings); + settings.endGroup(); +} + +void MainWindow::restoreSettings() +{ + QSettings settings; + + restoreGeometry(settings.value(windowGeometryKey()).toByteArray()); + + settings.beginGroup(sessionTabGroup()); + sessionBusViewer->restoreState(&settings); + settings.endGroup(); + + settings.beginGroup(systemTabGroup()); + systemBusViewer->restoreState(&settings); + settings.endGroup(); +} --- a/src/qdbus/qdbusviewer/mainwindow.h +++ b/src/qdbus/qdbusviewer/mainwindow.h @@ -46,11 +46,14 @@ QT_FORWARD_DECLARE_CLASS(QTabWidget) +class QDBusViewer; + class MainWindow : public QMainWindow { Q_OBJECT public: explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); void addCustomBusTab(const QString &bus); @@ -58,7 +61,12 @@ void about(); private: + void saveSettings(); + void restoreSettings(); + QTabWidget *tabWidget; + QDBusViewer *sessionBusViewer; + QDBusViewer *systemBusViewer; }; #endif // MAINWINDOW_H --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -40,6 +40,7 @@ #include <QtCore/QStringListModel> #include <QtCore/QSortFilterProxyModel> #include <QtCore/QMetaProperty> +#include <QtCore/QSettings> #include <QtWidgets/QLineEdit> #include <QtWidgets/QListView> #include <QtWidgets/QAction> @@ -103,13 +104,13 @@ connect(refreshShortcut, SIGNAL(activated()), this, SLOT(refreshChildren())); QVBoxLayout *layout = new QVBoxLayout(this); - QSplitter *topSplitter = new QSplitter(Qt::Vertical, this); + topSplitter = new QSplitter(Qt::Vertical, this); layout->addWidget(topSplitter); log = new LogViewer; connect(log, SIGNAL(anchorClicked(QUrl)), this, SLOT(anchorClicked(QUrl))); - QSplitter *splitter = new QSplitter(topSplitter); + splitter = new QSplitter(topSplitter); splitter->addWidget(servicesView); QWidget *servicesWidget = new QWidget; @@ -144,6 +145,21 @@ objectPathRegExp.setMinimal(true); +} + +static inline QString topSplitterStateKey() { return QStringLiteral("topSplitterState"); } +static inline QString splitterStateKey() { return QStringLiteral("splitterState"); } + +void QDBusViewer::saveState(QSettings *settings) const +{ + settings->setValue(topSplitterStateKey(), topSplitter->saveState()); + settings->setValue(splitterStateKey(), splitter->saveState()); +} + +void QDBusViewer::restoreState(const QSettings *settings) +{ + topSplitter->restoreState(settings->value(topSplitterStateKey()).toByteArray()); + splitter->restoreState(settings->value(splitterStateKey()).toByteArray()); } void QDBusViewer::logMessage(const QString &msg) --- a/src/qdbus/qdbusviewer/qdbusviewer.h +++ b/src/qdbus/qdbusviewer/qdbusviewer.h @@ -46,6 +46,8 @@ QT_FORWARD_DECLARE_CLASS(QTextBrowser) QT_FORWARD_DECLARE_CLASS(QDomDocument) QT_FORWARD_DECLARE_CLASS(QDomElement) +QT_FORWARD_DECLARE_CLASS(QSplitter) +QT_FORWARD_DECLARE_CLASS(QSettings) struct BusSignature { @@ -58,6 +60,9 @@ Q_OBJECT public: QDBusViewer(const QDBusConnection &connection, QWidget *parent = 0); + + void saveState(QSettings *settings) const; + void restoreState(const QSettings *settings); public slots: void refresh(); @@ -94,6 +99,8 @@ QLineEdit *serviceFilterLine; QListView *servicesView; QTextBrowser *log; + QSplitter *topSplitter; + QSplitter *splitter; QRegExp objectPathRegExp; }; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apparmor for openSUSE:Factory
by root＠hilbert.suse.de 25 Feb '15

25 Feb '15

Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2015-02-25 02:15:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2015-02-16 07:36:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new/apparmor.changes 2015-02-25 02:15:51.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 20 18:15:18 UTC 2015 - opensuse(a)cboltz.de + +- allow lessopen.sh to run /usr/bin/unzip-plain (boo#906858) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-lessopen-profile.patch ++++++ --- /var/tmp/diff_new_pack.YyzM6B/_old 2015-02-25 02:16:15.000000000 +0100 +++ /var/tmp/diff_new_pack.YyzM6B/_new 2015-02-25 02:16:15.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- /dev/null +++ apparmor-2.9.0/profiles/apparmor.d/usr.bin.lessopen.sh -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# Last Modified: Fri Nov 28 08:01:09 2014 +#include <tunables/global> + @@ -36,6 +36,7 @@ + /usr/bin/seq rix, + /usr/bin/tar rix, + /usr/bin/unzip rix, ++ /usr/bin/unzip-plain rix, + /usr/bin/w3m rix, + /usr/bin/which rix, + /usr/bin/xz rix, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openlmi-networking for openSUSE:Factory
by root＠hilbert.suse.de 24 Feb '15

24 Feb '15

Hello community, here is the log from the commit of package openlmi-networking for openSUSE:Factory checked in at 2015-02-24 16:15:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-networking (Old) and /work/SRC/openSUSE:Factory/.openlmi-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openlmi-networking" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-networking/openlmi-networking.changes 2014-12-19 09:37:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openlmi-networking.new/openlmi-networking.changes 2015-02-24 16:15:59.000000000 +0100 @@ -2,16 +1,0 @@ -Thu Dec 11 07:59:19 UTC 2014 - kkaempf(a)suse.com - -- Update to 0.3.1 - * Documentation reworked to have same look&feel for all OpenLMI - providers. - * More useful error messages. - * Bugfixes and minor improvements. - -------------------------------------------------------------------- -Tue Oct 7 11:50:23 UTC 2014 - kkaempf(a)suse.com - -- Update to 0.3.0 - * support for NetworkManager 0.8 - * bugfixes and stability improvements - -------------------------------------------------------------------- Old: ---- openlmi-networking-0.3.1.tar.gz New: ---- openlmi-networking-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-networking.spec ++++++ --- /var/tmp/diff_new_pack.DH8l89/_old 2015-02-24 16:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DH8l89/_new 2015-02-24 16:18:28.000000000 +0100 @@ -24,14 +24,14 @@ %global logfile %{_localstatedir}/log/openlmi-install.log Name: openlmi-networking -Version: 0.3.1 +Version: 0.2.2 Release: 1%{?dist} Summary: CIM providers for network management License: LGPL-2.1+ Group: System/Management Url: http://fedorahosted.org/openlmi/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE SUSE does not have libexec, kkaempf(a)suse.de Patch2: no-libexec-in-suse.patch @@ -51,7 +51,7 @@ BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: konkretcmpi-devel -BuildRequires: openlmi-providers-devel >= 0.5.0 +BuildRequires: openlmi-providers-devel >= 0.0.19 BuildRequires: sblim-cmpi-devel %if 0%{?suse_version} BuildRequires: NetworkManager-devel @@ -65,7 +65,6 @@ %if 0%{?suse_version} Requires: python %else -Requires: openlmi-pegasus-compat Requires: python2 %endif # sblim-sfcb or tog-pegasus @@ -109,7 +108,6 @@ %{_datadir}/%{name}/70_LMI_NetworkingIndicationFilters.mof %{_datadir}/%{name}/90_LMI_Networking_Profile.mof %{_datadir}/%{name}/60_LMI_Networking.reg -%dir %{_libexecdir}/pegasus %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Networking-cimprovagt %pre ++++++ AddIPProtocolEndpoint_RemoveIPProtocolEndpoint.patch ++++++ --- /var/tmp/diff_new_pack.DH8l89/_old 2015-02-24 16:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DH8l89/_new 2015-02-24 16:18:28.000000000 +0100 @@ -1,7 +1,7 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.3.0/src/LMI_IPConfigurationServiceProvider.c ./src/LMI_IPConfigurationServiceProvider.c ---- ../orig-openlmi-networking-0.3.0/src/LMI_IPConfigurationServiceProvider.c 2014-09-04 11:09:32.000000000 +0200 -+++ ./src/LMI_IPConfigurationServiceProvider.c 2014-10-07 13:48:13.000995512 +0200 -@@ -659,6 +659,39 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.2.2/src/LMI_IPConfigurationServiceProvider.c ./src/LMI_IPConfigurationServiceProvider.c +--- ../orig-openlmi-networking-0.2.2/src/LMI_IPConfigurationServiceProvider.c 2014-01-07 17:38:18.000000000 +0100 ++++ ./src/LMI_IPConfigurationServiceProvider.c 2014-04-29 09:40:58.906124193 +0200 +@@ -640,6 +640,39 @@ return result; } ++++++ networkmanager-defines.patch ++++++ --- /var/tmp/diff_new_pack.DH8l89/_old 2015-02-24 16:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DH8l89/_new 2015-02-24 16:18:28.000000000 +0100 @@ -1,19 +1,19 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.3.0/src/activeconnection_nm.c ./src/activeconnection_nm.c ---- ../orig-openlmi-networking-0.3.0/src/activeconnection_nm.c 2014-09-04 11:09:32.000000000 +0200 -+++ ./src/activeconnection_nm.c 2014-10-07 13:47:12.254429011 +0200 -@@ -38,6 +38,9 @@ - DBusGProxy *proxy; - } ActiveConnectionPriv; +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.1.1/src/activeconnection_nm.c ./src/activeconnection_nm.c +--- ../orig-openlmi-networking-0.1.1/src/activeconnection_nm.c 2013-08-07 08:28:28.000000000 +0200 ++++ ./src/activeconnection_nm.c 2013-10-01 10:04:46.470136795 +0200 +@@ -34,6 +34,9 @@ + #include "network_private.h" + #include "errors.h" +/* value taken from upstream: http://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/include/Netw… */ +#define NM_ACTIVE_CONNECTION_STATE_DEACTIVATED 4 + LMIResult active_connection_read_properties(ActiveConnection *activeConnection, GHashTable *properties); + void active_connection_changed_cb(void *proxy, GHashTable *properties, ActiveConnection *activeConnection); - ActiveConnectionStatus nm_state_to_status(unsigned int state) { -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.3.0/src/port_nm.c ./src/port_nm.c ---- ../orig-openlmi-networking-0.3.0/src/port_nm.c 2014-09-04 11:09:32.000000000 +0200 -+++ ./src/port_nm.c 2014-10-07 13:47:12.254429011 +0200 +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.1.1/src/port_nm.c ./src/port_nm.c +--- ../orig-openlmi-networking-0.1.1/src/port_nm.c 2013-08-07 08:28:28.000000000 +0200 ++++ ./src/port_nm.c 2013-10-01 10:03:03.730124597 +0200 @@ -31,6 +31,11 @@ #include "network_private.h" #include "errors.h" ++++++ no-libexec-in-suse.patch ++++++ --- /var/tmp/diff_new_pack.DH8l89/_old 2015-02-24 16:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DH8l89/_new 2015-02-24 16:18:28.000000000 +0100 @@ -1,8 +1,8 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.3.0/src/CMakeLists.txt ./src/CMakeLists.txt ---- ../orig-openlmi-networking-0.3.0/src/CMakeLists.txt 2014-09-04 11:09:32.000000000 +0200 -+++ ./src/CMakeLists.txt 2014-10-07 13:46:02.735491746 +0200 -@@ -104,7 +104,7 @@ - cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-networking "${TARGET_MOF}") +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.1.0/src/CMakeLists.txt ./src/CMakeLists.txt +--- ../orig-openlmi-networking-0.1.0/src/CMakeLists.txt 2013-07-30 14:29:23.000000000 +0200 ++++ ./src/CMakeLists.txt 2013-08-01 16:40:00.939403133 +0200 +@@ -105,7 +105,7 @@ + register("OpenLMI-Networking.mof.skel" "${CIM_CLASSES}" ${TARGET_MOF}) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) @@ -10,9 +10,9 @@ install(FILES ${TARGET_MOF} DESTINATION share/openlmi-networking/) add_subdirectory(unittest) -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.3.0/src/cmpiLMI_Networking-cimprovagt ./src/cmpiLMI_Networking-cimprovagt ---- ../orig-openlmi-networking-0.3.0/src/cmpiLMI_Networking-cimprovagt 2014-09-04 11:09:32.000000000 +0200 -+++ ./src/cmpiLMI_Networking-cimprovagt 2014-10-07 13:46:02.735491746 +0200 +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-networking-0.1.0/src/cmpiLMI_Networking-cimprovagt ./src/cmpiLMI_Networking-cimprovagt +--- ../orig-openlmi-networking-0.1.0/src/cmpiLMI_Networking-cimprovagt 2013-07-30 14:29:23.000000000 +0200 ++++ ./src/cmpiLMI_Networking-cimprovagt 2013-08-01 16:40:10.891817657 +0200 @@ -20,4 +20,4 @@ # ++++++ openlmi-networking-0.3.1.tar.gz -> openlmi-networking-0.2.2.tar.bz2 ++++++ ++++ 9100 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-rpm-macros for openSUSE:Factory
by root＠hilbert.suse.de 24 Feb '15

24 Feb '15

Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2015-02-24 13:03:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2014-12-16 14:48:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2015-02-24 13:07:19.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 23 16:38:21 UTC 2015 - peter.trommler(a)ohm-hochschule.de + +- update to 1.4.7 +- drop fix-runpath.patch + * fixed upstream +- refresh fix-gen-filelists.patch +- refresh suse-disable-debug-packages.patch +- refresh suse-docdir.patch +- add remove-flags.patch + * remove passing of CFLAGS and LDFLAGS to ghc + * no macro %__global_ldflags in openSUSE +- remove provides ghc() workaround + * fixed upstream + +------------------------------------------------------------------- Old: ---- fix-runpath.patch ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.tar.xz New: ---- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz remove-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-rpm-macros # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%global git_hash 2da26f9db56515862de9839f12a17be5f2ed2eb7 +%global git_hash 81726e4857a866d19cc59b496846d127b9e8c381 %global macros_dir %{_sysconfdir}/rpm %global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.3.6 +Version: 1.4.7 Release: 0 BuildArch: noarch Summary: RPM Macros for building packages for GHC @@ -43,8 +43,8 @@ Patch4: suse-docdir.patch # PATCH-FIX_UPSTREAM fix-gen-filelists.patch Patch5: fix-gen-filelists.patch -# PATCH-FIX-UPSTREAM fix-runpath.patch peter.trommler(a)ohm-hochschule.de -- In openSUSE we patch binutils to default to the "new" RUNPATH dynamic tag and not the obsolete RPATH. This patch adds support for the former and still works for the latter. -Patch7: fix-runpath.patch +# PATCH-FIX-OPENSUSE remove-flags.patch peter.trommler(a)ohm-hochschule.de -- Do not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro %%__global_ldflags. +Patch8: remove-flags.patch # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.trommler(a)ohm-hochschule.de -- SLE's RPM is too old in 11 SP1 and SP2 and SP3 Patch100: sle-sp1-rpmdeps.patch @@ -53,12 +53,6 @@ %if %{undefined without_hscolour} Requires: hscolour %endif -# This is a workaround for a bug in the automatic dependencies generator -# ghc-deps.sh generates this symbol for extra libraries installed with a -# dynamic ghc, currently only %%{ix86} and x86_64 -%ifarch %{ix86} x86_64 -Provides: ghc() -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,7 +88,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 +%patch8 -p1 %if 0%{?sles_version} %patch -P 100 -p1 %endif @@ -106,7 +100,8 @@ install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc install -p -D -m 0644 macros.ghc-extra %{buildroot}/%{macros_dir}/macros.ghc-extra install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh -install -p -D -m 0644 ghc.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr +install -p -D -m 0644 ghc_bin.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +install -p -D -m 0644 ghc_lib.attr %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag @@ -114,7 +109,8 @@ %defattr(-,root,root,-) %doc COPYING AUTHORS %config %{macros_dir}/macros.ghc -%{_prefix}/lib/rpm/fileattrs/ghc.attr +%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag ++++++ fix-gen-filelists.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,10 +1,10 @@ -Index: ghc-rpm-macros-master/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-master.orig/macros.ghc -+++ ghc-rpm-macros-master/macros.ghc -@@ -48,7 +48,7 @@ fi - %define docdir %{ghclibdocdir}/%{pkgname}\ +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +@@ -66,7 +66,7 @@ tests rm -f %{basepkg}.files %{basepkg}-devel.files\ + touch %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ -echo "%dir %{pkgdir}" >> %{basepkg}.files\ +echo "%%dir %{pkgdir}" >> %{basepkg}.files\ ++++++ ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.tar.xz -> ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/cabal-tweak-flag new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/cabal-tweak-flag --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/cabal-tweak-flag 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/cabal-tweak-flag 2015-02-01 08:56:35.000000000 +0100 @@ -29,7 +29,7 @@ fi if ! grep -q -i "^flag *$FLAG" $CABALFILE; then - echo "$CABALFILE does have flag $FLAG" + echo "$CABALFILE does not have flag $FLAG" exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-deps.sh new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-deps.sh 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh 2015-02-01 08:56:35.000000000 +0100 @@ -1,11 +1,6 @@ #!/bin/sh # find rpm provides and requires for Haskell GHC libraries -# To use add the following lines to spec file: -# %define _use_internal_dependency_generator 0 -# %define __find_requires /usr/lib/rpm/ghc-deps.sh --requires %{buildroot}%{ghclibdir} -# %define __find_provides /usr/lib/rpm/ghc-deps.sh --provides %{buildroot}%{ghclibdir} - [ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] %{buildroot}%{ghclibdir}" && exit 1 set +x @@ -15,11 +10,21 @@ PKGCONFDIR=$PKGBASEDIR/package.conf.d GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) -if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then - # ghc-7.8 - GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" -elif [ -x "$PKGBASEDIR/ghc-pkg" ]; then - GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR" +# for a ghc build use the new ghc-pkg +INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER + +if [ -x "$INPLACE_GHCPKG" ]; then + case $GHC_VER in + 7.8.*) + GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" + ;; + 7.6.*) + GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR" + ;; + *) + GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR" + ;; + esac else GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER}" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-rpm-macros.spec new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-rpm-macros.spec --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc-rpm-macros.spec 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-rpm-macros.spec 2015-02-01 08:56:35.000000000 +0100 @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.3.6 +Version: 1.4.8 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -24,10 +24,13 @@ Source4: cabal-tweak-dep-ver Source5: cabal-tweak-flag Source6: macros.ghc-extra -Source7: ghc.attr +Source7: ghc_bin.attr +Source8: ghc_lib.attr Requires: ghc-srpm-macros # macros.ghc-srpm moved out from redhat-rpm-config-21 Requires: redhat-rpm-config > 20-1.fc21 +# for ghc_version +Requires: ghc-compiler %if %{undefined without_hscolour} %ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x ppc64le aarch64 Requires: hscolour @@ -63,26 +66,18 @@ install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh -install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr +install -p -D -m 0644 %{SOURCE7} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +install -p -D -m 0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag -# turn off shared libs and dynamic linking on secondary archs -%ifnarch %{ix86} x86_64 -cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF - -# shared libraries are only supported on primary intel archs -%%ghc_without_dynamic 1 -%%ghc_without_shared 1 -EOF -%endif - %files %doc COPYING AUTHORS %{macros_dir}/macros.ghc -%{_prefix}/lib/rpm/fileattrs/ghc.attr +%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr +%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver %{_bindir}/cabal-tweak-flag @@ -93,6 +88,56 @@ %changelog +* Sun Feb 1 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.8-1 +- drop cabal_tests_not_working since not all tests failing on ARMv7 + +* Sat Jan 31 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.7-1 +- fix arch for cabal_tests_not_working +- add cabal_test macro which uses it + +* Sat Jan 31 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.6-1 +- disable Cabal tests on armv7 since they give an internal error + https://ghc.haskell.org/trac/ghc/ticket/10029 +- fix building of meta packages: +- only run cabal haddock for real libraries with modules +- make sure basepkg.files is also created for meta packages + +* Sat Jan 31 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.5-1 +- fix the R*PATH regexp + +* Sat Jan 31 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.4-1 +- ghc_fix_dynamic_rpath: on ARMv7 RPATH is RUNPATH + +* Thu Jan 22 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.3-1 +- version ghcpkgdocdir +- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir + +* Thu Jan 22 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.2-1 +- correct cabal-tweak-flag error message for missing flag (#1184508) + +* Sat Jan 17 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.1-1 +- revert to versioned doc htmldirs + +* Sat Jan 17 2015 Jens Petersen <petersen(a)redhat.com> - 1.4.0-1 +- enable shared libraries and dynamic linking on all arch's + since ghc-7.8 now supports that +- disable debuginfo until ghc-7.10 which will support dwarf debugging output + (#1138982) + +* Fri Nov 14 2014 Jens Petersen <petersen(a)redhat.com> - 1.3.10-1 +- split ghc.attr into ghc_lib.attr and ghc_bin.attr for finer grained handling +- require ghc-compiler for ghc_version + +* Mon Oct 27 2014 Jens Petersen <petersen(a)redhat.com> - 1.3.9-1 +- macros.ghc: cabal_configure now passes CFLAGS and LDFLAGS to ghc (#1138982) + (thanks to Sergei Trofimovich and Ville Skyttä) + +* Thu Oct 23 2014 Jens Petersen <petersen(a)redhat.com> - 1.3.8-1 +- ghc-deps.sh: support ghc-pkg for ghc builds <= 7.4.2 as well + +* Thu Oct 16 2014 Jens Petersen <petersen(a)redhat.com> - 1.3.7-1 +- ghc.attr needs to handle requires for /usr/bin files too + * Wed Sep 10 2014 Jens Petersen <petersen(a)redhat.com> - 1.3.6-1 - improve ghc_fix_dynamic_rpath not to assume cwd = pkg_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc.attr 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc.attr 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} -%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} -%__ghc_path ^%{ghclibdir}/.*/libHS.*\\.(so|a) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_bin.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_bin.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_bin.attr 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_bin.attr 2015-02-01 08:56:35.000000000 +0100 @@ -0,0 +1,3 @@ +%__ghc_bin_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} +%__ghc_bin_magic executable, .* dynamically linked +%__ghc_bin_flags exeonly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_lib.attr new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_lib.attr --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/ghc_lib.attr 1970-01-01 01:00:00.000000000 +0100 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc_lib.attr 2015-02-01 08:56:35.000000000 +0100 @@ -0,0 +1,3 @@ +%__ghc_lib_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} +%__ghc_lib_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} +%__ghc_lib_path ^%{ghclibdir}/.*/libHS.*\\.(so|a)$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc --- old/ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc 2014-09-10 09:07:29.000000000 +0200 +++ new/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc 2015-02-01 08:56:35.000000000 +0100 @@ -21,17 +21,34 @@ # configure %cabal_configure\ %ghc_check_bootstrap\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options +CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ +LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v -# root dir for ghc docs +tests +%cabal_test\ +%if %{with tests}\ +%cabal test\ +%endif + +# root dir for ghc docs (used by ghc.spec) +%ghc_html_dir %{_docdir}/ghc/html +# deprecates %ghcdocbasedir %{_docdir}/ghc/html -# libraries doc dir + +# libraries doc dir (internal) +%ghc_html_libraries_dir %{ghc_html_dir}/libraries +# deprecates %ghclibdocdir %{ghcdocbasedir}/libraries + # pkg doc dir -%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name} +%ghc_html_pkg_dir %{ghc_html_libraries_dir}/%{pkg_name}-%{version} +# deprecates +%ghcpkgdocdir %{ghclibdocdir}/%{pkg_name}-%{version} + # top library dir %ghclibdir %{_libdir}/ghc-%{ghc_version} @@ -42,8 +59,9 @@ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg ghc-%{pkgname}\ %define pkgdir %{ghclibdir}/%{pkgnamever}\ -%define docdir %{ghclibdocdir}/%{pkgname}\ +%define docdir %{ghclibdocdir}/%{pkgnamever}\ rm -f %{basepkg}.files %{basepkg}-devel.files\ +touch %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ echo "%dir %{pkgdir}" >> %{basepkg}.files\ %if %{undefined ghc_without_shared}\ @@ -80,12 +98,14 @@ # ghc_bin_build %ghc_bin_build\ +%global debug_package %{nil}\ %cabal_configure\ %cabal build # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ -%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%global debug_package %{nil}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil} @@ -93,7 +113,11 @@ %ghc_lib_build()\ %ghc_lib_build_without_haddock\ %if %{undefined without_haddock}\ +%define pkgname %{?1}%{!?1:%{pkg_name}}\ +%define pkgver %{?2}%{!?2:%{version}}\ +if [ -f dist/build/libHS%{pkgname}-%{pkgver}.a ]; then\ %cabal haddock --html %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\ +fi\ %endif\ %{nil} @@ -123,9 +147,12 @@ if ! type chrpath > /dev/null; then exit 1; fi\ PDIR=$(pwd)\ for i in %*; do\ - PROG=%{buildroot}%{_bindir}/$i\ + case $i in\ + /*) PROG=%{buildroot}$i ;;\ + *) PROG=%{buildroot}%{_bindir}/$i ;;\ + esac\ if [ -x "$PROG" ]; then\ - RPATH=$(chrpath $PROG | sed -e "s@^$PROG: RPATH=@@")\ + RPATH=$(chrpath $PROG | sed -e "s@^$PROG: R.*PATH=@@")\ case $RPATH in\ *$PDIR*)\ NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR/dist/build@%{ghclibdir}/%{pkg_name}-%{version}@g")\ ++++++ remove-flags.patch ++++++ Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== --- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc +++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc @@ -24,9 +24,7 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ -CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ -LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v ++++++ suse-disable-debug-packages.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,8 +1,8 @@ -Index: ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.orig/macros.ghc -+++ ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7/macros.ghc -@@ -150,3 +150,13 @@ done\ +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc +@@ -177,3 +177,13 @@ done\ %global without_prof 1\ %global without_haddock 1\ %global without_manual 1 ++++++ suse-docdir.patch ++++++ --- /var/tmp/diff_new_pack.Hcmcwm/_old 2015-02-24 13:07:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Hcmcwm/_new 2015-02-24 13:07:20.000000000 +0100 @@ -1,7 +1,7 @@ -Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/macros.ghc +Index: ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc =================================================================== ---- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/macros.ghc -+++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/macros.ghc +--- ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc ++++ ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc @@ -18,6 +18,9 @@ proceeding, to avoid dependency ABI brea %endif\ fi @@ -12,12 +12,15 @@ # configure %cabal_configure\ %ghc_check_bootstrap\ -@@ -27,7 +30,7 @@ fi - %cabal_install %cabal copy --destdir=%{buildroot} -v +@@ -35,9 +38,9 @@ tests + %endif - # root dir for ghc docs + # root dir for ghc docs (used by ghc.spec) +-%ghc_html_dir %{_docdir}/ghc/html ++%ghc_html_dir %{_datadir}/doc/ghc/html + # deprecates -%ghcdocbasedir %{_docdir}/ghc/html +%ghcdocbasedir %{_datadir}/doc/ghc/html - # libraries doc dir - %ghclibdocdir %{ghcdocbasedir}/libraries - # pkg doc dir + + # libraries doc dir (internal) + %ghc_html_libraries_dir %{ghc_html_dir}/libraries -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0