openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2019
- 1 participants
- 2210 discussions
Hello community,
here is the log from the commit of package svgcleaner for openSUSE:Factory checked in at 2019-02-28 21:38:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/svgcleaner (Old)
and /work/SRC/openSUSE:Factory/.svgcleaner.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "svgcleaner"
Thu Feb 28 21:38:54 2019 rev:7 rq:673113 version:0.9.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/svgcleaner/svgcleaner.changes 2018-10-17 08:41:02.201874668 +0200
+++ /work/SRC/openSUSE:Factory/.svgcleaner.new.28833/svgcleaner.changes 2019-02-28 21:38:55.529630332 +0100
@@ -1,0 +2,7 @@
+Wed Feb 6 15:19:34 UTC 2019 - sogal(a)opensuse.org
+
+- Removed svgcleaner-gui dependency to p7zip-full as nothing provides it in
+ openSUSE and the needed 7za component is already provided by p7zip
+ (revert https://build.opensuse.org/request/show/616716)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ svgcleaner.spec ++++++
--- /var/tmp/diff_new_pack.gqsNkt/_old 2019-02-28 21:38:57.361629757 +0100
+++ /var/tmp/diff_new_pack.gqsNkt/_new 2019-02-28 21:38:57.369629753 +0100
@@ -1,7 +1,7 @@
#
# spec file for package svgcleaner
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -51,7 +51,7 @@
Summary: Graphical user interface to svgcleaner
Group: Productivity/Graphics/Other
Requires: %{name} = %{version}
-Requires: p7zip-full
+Requires: p7zip
%description -n svgcleaner-gui
This package provides a Qt graphical user interface to svgcleaner.
1
0
Hello community,
here is the log from the commit of package joda-time for openSUSE:Factory checked in at 2019-02-28 21:38:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/joda-time (Old)
and /work/SRC/openSUSE:Factory/.joda-time.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "joda-time"
Thu Feb 28 21:38:52 2019 rev:14 rq:672971 version:2.10.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/joda-time/joda-time.changes 2017-09-20 17:11:43.037778919 +0200
+++ /work/SRC/openSUSE:Factory/.joda-time.new.28833/joda-time.changes 2019-02-28 21:38:53.633630929 +0100
@@ -1,0 +2,92 @@
+Wed Feb 6 12:28:46 UTC 2019 - Fridrich Strba <fstrba(a)suse.com>
+
+- Upgrade to version 2.10.1
+ * Fix time-zone compiler for Namibia. Fixes #485.
+ * Fix time-zone compiler for Tokyo.
+ * Handle negative SAVE values in tzdb.
+ * Add Instant.EPOCH. See #472.
+ * Clarify negative durations. See #465.
+ * Add Instant.ofEpochMilli(). Add Instant.ofEpochSecond().
+ Fixes #458.
+ * Add automatic module name for Java SE 9.
+ * Add Kazakh language translations. Fixes #446
+ * Avoid double addition when using lenient chronology. Fixes #432.
+ * Clarify Period.fieldDifference() Javadoc.
+ * Clarify Instant.withMillis() Javadoc. Fixes jodaorg.github.io#5
+ * Add ZoneInfoProvider() constructor.
+ * Optimise release process.
+ * DateTimeZone data updated to version 2017b.
+ * Handle plus/minus of Integer.MIN_VALUE/MAX_VALUE months
+ correctly. Fixes #418.
+ * Clarify time fields are based on the local time-line.
+ Fixes #415.
+ * Fix spelling mistakes. Fixes #412.
+ * Fix DateTimePrinterInternalPinter that outputs data twice.
+ Fixes #409.
+ * Support conversion of old TimeZone where name has digits other
+ than ASCII [#381]
+ * Add Norwegian period translations [#378]
+ * Add Duration.dividedBy(long,RoundingMode) [#69, #379]
+ * Fixed bug where clock read twice when comparing two nulls in
+ DateTimeComparator [#404]
+ * Fixed minor issues with historic time-zone data [#373]
+ * Fix bug in time-zone binary search [#332, #386] The fix in
+ v2.9.2 caused problems when the time-zone being parsed was not
+ the last element in the input string. New approach uses a
+ different approach to the problem.
+ * Update tests for JDK 9 [#394]
+ * Close buffered reader correctly in zone info compiler [#396]
+ * Handle locale correctly zone info compiler [#397]
+ * Loading time-zone provider now occurs in a privileged block
+ [#327, #375]
+ * Make DateTimeUtils.SYSTEM_MILLIS_PROVIDER public [#357]
+ * Fix bug when adding months at the maximum limits of integer
+ [#361]
+ * Add Turkish period translations [#364]
+ * Fix bug in time-zone binary search [#332]
+ * Minor fixes to code internals [#339, #326, #344, #350, #343]
+ * Better document behaviour [#325]
+ * Fix bug introduced by Long.MIN_VALUE and Long.MAX_VALUE changes
+ [#328]
+ * Faster parsing of time-zone identifiers [#282]
+ * Added Interval.parseWithOffset(String) [#299, #296] Provides a
+ way to parse the fixed offset in an interval string
+ * Add DateTimeFormatter methods for StringBuilder [#298]
+ * Add Russian period translations [#320]
+ * Add Italian period translations [#312]
+ * Add Czech period translations [#313]
+ * Clarify that PeriodFormatterBuilder is in an invalid state once
+ built [#309]
+ * Allow DateTime and Interval to refer to values at Long.MIN_VALUE
+ and Long.MAX_VALUE [#297, #190] A DateTime may be created with
+ any millisecond value, however at the very edges there may be
+ some undesirable effects, for example always using UTC instead
+ of the time-zone
+ * Better error message for malformed tzdb files [#319]
+ * Better error message for interval constructor [#321]
+ * Fixed to handle JDK 8u60 [#288, #291] Without this fix,
+ formatting a time-zone will print "+00:00" instead of "GMT" for
+ the GMT time-zone
+ * Fix parsing of basic form ISO style where year has unnecessary
+ plus sign [#86] For example, +20151030 will now be correctly
+ parsed as year 2015.
+ * Fix overflow bug in intervals [#315]
+- Removed patches:
+ * joda-time-1.6-sourcetarget.patch
+ + correct source and target levels specified in the ant
+ build.xml file
+ * joda-time-use-system-junit.patch
+ + not needed any more, since we are not running tests for the
+ while
+- Added patch:
+ + joda-time-fix-tests.patch
+ + fix java version parsing for versions > 9
+- DateTimeZone data updated to version 2018i
+- Add build.xml file to allow build with ant
+
+-------------------------------------------------------------------
+Mon Nov 19 17:20:45 UTC 2018 - Fridrich Strba <fstrba(a)suse.com>
+
+- Add maven pom file and register joda-time as a maven artifact
+
+-------------------------------------------------------------------
Old:
----
joda-time-1.6-sourcetarget.patch
joda-time-1.6-src.tar.gz
joda-time-use-system-junit.patch
tzdata2010h.tar.gz
New:
----
joda-time-build.xml
joda-time-fix-tests.patch
tzdata2018i.tar.gz
v2.10.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ joda-time.spec ++++++
--- /var/tmp/diff_new_pack.hnQxVN/_old 2019-02-28 21:38:54.409630685 +0100
+++ /var/tmp/diff_new_pack.hnQxVN/_new 2019-02-28 21:38:54.409630685 +0100
@@ -1,7 +1,7 @@
#
# spec file for package joda-time
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,30 +12,27 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define tzversion tzdata2010h
+%global tzversion tzdata2018i
Name: joda-time
-Version: 1.6
+Version: 2.10.1
Release: 0
Summary: Java date and time API
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
License: Apache-2.0
-Group: Development/Libraries
-Url: http://joda-time.sourceforge.net/index.html
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
-Source1: ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz
-Patch0: joda-time-use-system-junit.patch
-Patch1: joda-time-1.6-sourcetarget.patch
+Group: Development/Libraries/Java
+URL: http://www.joda.org/joda-time/
+Source0: https://github.com/JodaOrg/%{name}/archive/v%{version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/%{tzversion}.tar.gz
+Source100: %{name}-build.xml
+Patch0: joda-time-fix-tests.patch
BuildRequires: ant
+BuildRequires: dos2unix
BuildRequires: fdupes
-BuildRequires: java-devel > 1.5.0
-BuildRequires: javapackages-tools
-BuildRequires: junit
-Requires: java > 1.5.0
-Requires: javapackages-tools
+BuildRequires: javapackages-local
+BuildRequires: joda-convert
BuildArch: noarch
%description
@@ -50,51 +47,56 @@
%package javadoc
Summary: Javadocs for %{name}
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: javapackages-tools
+Group: Documentation/HTML
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}-src
+%setup -q
%patch0 -p1
-%patch1 -p1
+dos2unix LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+cp %{SOURCE100} build.xml
# all java binaries must be removed from the sources
find . -name '*.jar' -exec rm -f '{}' \;
-find . -name '*.class' -exec rm -f '{}' \;
-
-# prove that these binaries aren't used in building joda-time
-rm -rf src/testdata/
# replace internal tzdata
-rm -f src/java/org/joda/time/tz/src/*
-tar -xzf %{SOURCE1} -C src/java/org/joda/time/tz/src/
+rm -f src/main/java/org/joda/time/tz/src/*
+tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
+
+%pom_remove_plugin :maven-enforcer-plugin
+
+%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.source "1.6"
+%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.target "1.6"
+%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.compilerVersion "1.6"
%build
-ant -Dcompile.source=1.6 -Dcompile.target=1.6
-ant -Dcompile.source=1.6 -Dcompile.target=1.6 javadoc
+%{ant} \
+ -Djoda-convert.jar=%{_javadir}/joda-convert.jar \
+ clean jar javadoc
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
# Don't install a versioned jar and symlink to it, instead install
# the unversioned jar as per Java Packaging Guidelines
-install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# javadocs
-install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -a build/docs/* %{buildroot}%{_javadocdir}/%{name}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
-%{_javadir}/%{name}.jar
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
%files javadoc
-%doc %{_javadocdir}/%{name}
+%license LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}
%changelog
++++++ joda-time-build.xml ++++++
<?xml version="1.0" encoding="UTF-8"?>
<project name="joda-time" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="build.properties"/>
<property name="build.finalName" value="joda-time-2.10.1"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir.0" value="src/main/java"/>
<property name="build.resourceDir.0" value="."/>
<property name="build.resourceDir.1" value="src/main/java"/>
<property name="source.tz" value="${build.srcDir.0}/org/joda/time/tz/src"/>
<property name="build.tz" value="${build.outputDir}/org/joda/time/tz/data"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<property name="repo.local" value="${user.home}/.m2/repository"/>
<property name="compiler.source" value="1.6"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="joda-convert.jar" value="lib/joda-convert.jar"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<pathelement location="${joda-convert.jar}"/>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${build.outputDir}/META-INF"/>
<copy todir="${build.outputDir}/META-INF">
<fileset dir="${build.resourceDir.0}">
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
</fileset>
</copy>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir.1}">
<include name="**/*.properties"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Timezone data compilation target -->
<!-- ====================================================================== -->
<target name="compile-tzdb" depends="compile" description="Compile timezone data files">
<!-- Invoke the newly built ZoneInfoCompiler to compile the zoneinfo data files -->
<mkdir dir="${build.outputDir}/org/joda/time/tz/data"/>
<java classname="org.joda.time.tz.ZoneInfoCompiler"
fork="true"
failonerror="true">
<classpath path="${build.outputDir}"/>
<!-- Override default provider since data directory doesn't exist yet -->
<sysproperty key="org.joda.time.DateTimeZone.Provider"
value="org.joda.time.tz.UTCProvider"/>
<!-- Specify source and destination directories -->
<arg value="-src"/>
<arg value="${build.srcDir.0}/org/joda/time/tz/src"/>
<arg value="-dst"/>
<arg line="${build.outputDir}/org/joda/time/tz/data"/>
<!-- Specify all the data files to compile -->
<arg value="africa"/>
<arg value="antarctica"/>
<arg value="asia"/>
<arg value="australasia"/>
<arg value="europe"/>
<arg value="northamerica"/>
<arg value="southamerica"/>
<arg value="pacificnew"/>
<arg value="etcetera"/>
<arg value="backward"/>
<arg value="systemv"/>
</java>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir.0}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
source="${compiler.source}"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
linksource="false"
breakiterator="false">
<group title="User packages"/>
<group title="Implementation packages"/>
<classpath refid="build.classpath"/>
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile-tzdb" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
manifest="src/conf/MANIFEST.MF"
excludes="**/package.html">
<manifest>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>
++++++ joda-time-fix-tests.patch ++++++
--- joda-time-2.9.9/src/test/java/org/joda/time/TestDateTimeZone.java 2017-03-23 14:33:18.000000000 +0100
+++ joda-time-2.9.9/src/test/java/org/joda/time/TestDateTimeZone.java 2018-11-20 21:45:41.269188883 +0100
@@ -20,6 +20,7 @@
import java.io.FilePermission;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.lang.Integer;
import java.lang.reflect.Modifier;
import java.security.AllPermission;
import java.security.CodeSource;
@@ -759,7 +760,7 @@
boolean jdk9 = true;
try {
String str = System.getProperty("java.version");
- jdk9 = str.startsWith("9");
+ jdk9 = (9 <= Integer.parseInt((str.trim().split("\\s+|-\\s*|\\.\\s*"))[0]));
} catch (Exception ex) {
jdk9 = false;
}
1
0
Hello community,
here is the log from the commit of package spice-parent for openSUSE:Factory checked in at 2019-02-28 21:38:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spice-parent (Old)
and /work/SRC/openSUSE:Factory/.spice-parent.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-parent"
Thu Feb 28 21:38:50 2019 rev:1 rq:672970 version:26
Changes:
--------
New Changes file:
--- /dev/null 2018-10-29 14:05:42.522318975 +0100
+++ /work/SRC/openSUSE:Factory/.spice-parent.new.28833/spice-parent.changes 2019-02-28 21:38:50.757631834 +0100
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Sat Feb 9 06:37:04 UTC 2019 - Fridrich Strba <fstrba(a)suse.com>
+
+- Initial packaging of Sonatype Spice Components POM vesion 26
New:
----
LICENSE-2.0.txt
pom.patch
spice-parent-26.pom
spice-parent.changes
spice-parent.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spice-parent.spec ++++++
#
# spec file for package spice-parent
#
# Copyright (c) 2018 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
# 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 https://bugs.opensuse.org/
#
Name: spice-parent
Version: 26
Release: 0
Summary: Sonatype Spice Components
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://github.com/sonatype/oss-parents
Source0: http://repo1.maven.org/maven2/org/sonatype/spice/%{name}/%{version}/%{name}…
Source1: http://apache.org/licenses/LICENSE-2.0.txt
Patch0: pom.patch
BuildRequires: forge-parent
BuildRequires: javapackages-local
Requires: mvn(org.sonatype.forge:forge-parent:pom:)
BuildArch: noarch
%description
Spice components and libraries are common components
used throughout the Sonatype Forge.
%prep
%setup -qcT
cp -p %{SOURCE0} pom.xml
cp -p %{SOURCE1} .
#Remove plexus-javadoc
%patch0
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
%install
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom
%files -f .mfiles
%doc LICENSE-2.0.txt
%changelog
++++++ LICENSE-2.0.txt ++++++
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
++++++ pom.patch ++++++
--- pom.xml.orig 2010-01-19 10:00:55.000000000 +0800
+++ pom.xml 2010-09-09 16:51:11.000000000 +0800
@@ -180,11 +179,6 @@
<artifactId>maven-plugin-tools-javadoc</artifactId>
<version>2.5</version>
</tagletArtifact>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
- </tagletArtifact>
</tagletArtifacts>
</configuration>
</plugin>
++++++ spice-parent-26.pom ++++++
<!--
Copyright (c) 2008-2012 Sonatype, Inc. All rights reserved.
This program is licensed to you under the Apache License Version 2.0,
and you may not use this file except in compliance with the Apache License Version 2.0.
You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
Unless required by applicable law or agreed to in writing,
software distributed under the Apache License Version 2.0 is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.forge</groupId>
<artifactId>forge-parent</artifactId>
<version>22</version>
<relativePath />
</parent>
<groupId>org.sonatype.spice</groupId>
<artifactId>spice-parent</artifactId>
<version>26</version>
<packaging>pom</packaging>
<name>Sonatype Spice Components</name>
<scm>
<connection>scm:git:git://github.com/sonatype/oss-parents.git</connection>
<developerConnection>scm:git:git@github.com:sonatype/oss-parents.git</developerConnection>
<url>https://github.com/sonatype/oss-parents</url>
</scm>
<issueManagement>
<system>JIRA</system>
<url>https://issues.sonatype.org/browse/SPICE</url>
</issueManagement>
<properties>
<sisu-inject.version>2.1.1</sisu-inject.version>
<slf4j.version>1.6.1</slf4j.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Inject Bean container -->
<!-- Spice hosts SISU/Plexus-legacy libraries, and they expect they are embedded into apps having these provided -->
<!-- That makes: shouldn't SISU be actually "provided" instead? -->
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-bean</artifactId>
<version>${sisu-inject.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>2.9.4</version>
<classifier>no_aop</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
</dependency>
<!-- Plexus support (the version should be tied to SISU used ones!) -->
<!-- Plexus needs to be compiled against, is specific (unlike JSR330-enabled SISU is) -->
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>${sisu-inject.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>1.5.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
<scope>compile</scope>
</dependency>
<!-- SLF4J Logging -->
<!-- Only those needed during compile and runtime phases -->
<!-- Spice is a library collection, so only the "simple" backend for testing and nothing more -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<!-- Standard test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>1.5.5</version>
<executions>
<execution>
<id>process-classes</id>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
<execution>
<id>process-test-classes</id>
<goals>
<goal>generate-test-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<configuration>
<tagletArtifacts>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
<version>2.5</version>
</tagletArtifact>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-javadoc</artifactId>
<version>1.0</version>
</tagletArtifact>
</tagletArtifacts>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.1</version>
<reportSets>
<reportSet>
<reports>
<!-- Broken, don't know why. -->
<report>dependencies</report>
<report>project-team</report>
<report>mailing-list</report>
<report>cim</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
1
0
Hello community,
here is the log from the commit of package httpcomponents-project for openSUSE:Factory checked in at 2019-02-28 21:38:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/httpcomponents-project (Old)
and /work/SRC/openSUSE:Factory/.httpcomponents-project.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "httpcomponents-project"
Thu Feb 28 21:38:43 2019 rev:1 rq:672965 version:9
Changes:
--------
New Changes file:
--- /dev/null 2018-10-29 14:05:42.522318975 +0100
+++ /work/SRC/openSUSE:Factory/.httpcomponents-project.new.28833/httpcomponents-project.changes 2019-02-28 21:38:43.797634023 +0100
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Sat Feb 9 06:31:19 UTC 2019 - Fridrich Strba <fstrba(a)suse.com>
+
+- Initial packaging of Common POM file for HttpComponents version 9
New:
----
LICENSE-2.0.txt
httpcomponents-parent-9.pom
httpcomponents-project.changes
httpcomponents-project.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ httpcomponents-project.spec ++++++
#
# spec file for package httpcomponents-project
#
# Copyright (c) 2019 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
# 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 https://bugs.opensuse.org/
#
Name: httpcomponents-project
Version: 9
Release: 0
Summary: Common POM file for HttpComponents
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://hc.apache.org/
Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/9/httpc…
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: javapackages-local
BuildRequires: mvn(org.apache:apache:pom:)
Requires: mvn(org.apache:apache:pom:)
BuildArch: noarch
%description
Common Maven POM file for HttpComponents. This project should be
required only for building dependent packages with Maven. Please don't
use it as runtime requirement.
%prep
%setup -q -T -c %{name}
cp -p %{SOURCE0} pom.xml
cp -p %{SOURCE1} .
%pom_remove_plugin :buildnumber-maven-plugin
%pom_remove_plugin :clirr-maven-plugin
%pom_remove_plugin :docbkx-maven-plugin
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :apache-rat-plugin
%pom_remove_plugin :maven-jar-plugin
%build
%install
install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom -a org.apache.httpcomponents:project
%files -f .mfiles
%doc LICENSE-2.0.txt
%changelog
++++++ LICENSE-2.0.txt ++++++
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
++++++ httpcomponents-parent-9.pom ++++++
++++ 974 lines (skipped)
1
0
Hello community,
here is the log from the commit of package votca-csgapps for openSUSE:Factory checked in at 2019-02-28 21:38:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-csgapps (Old)
and /work/SRC/openSUSE:Factory/.votca-csgapps.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-csgapps"
Thu Feb 28 21:38:33 2019 rev:10 rq:670465 version:1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-csgapps/votca-csgapps.changes 2017-09-04 12:39:20.793984443 +0200
+++ /work/SRC/openSUSE:Factory/.votca-csgapps.new.28833/votca-csgapps.changes 2019-02-28 21:38:35.509636630 +0100
@@ -1,0 +2,6 @@
+Thu Jan 31 20:58:30 UTC 2019 - Christoph Junghans <junghans(a)votca.org>
+
+- Upgrade to 1.5
+ * details: https://github.com/votca/csg/blob/master/CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
votca-csgapps-1.4.1.tar.gz
New:
----
votca-csgapps-1.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-csgapps.spec ++++++
--- /var/tmp/diff_new_pack.0OXwar/_old 2019-02-28 21:38:35.965636486 +0100
+++ /var/tmp/diff_new_pack.0OXwar/_new 2019-02-28 21:38:35.969636484 +0100
@@ -2,7 +2,7 @@
# spec file for package votca-csgapps
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2013-2017 Christoph Junghans
+# Copyright (c) 2013-2019 Christoph Junghans
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
#
Name: votca-csgapps
-Version: 1.4.1
-%define uversion 1.4.1
+Version: 1.5
+%define uversion %{version}
Release: 0
Summary: VOTCA coarse-graining engine applications
Group: Productivity/Scientific/Chemistry
@@ -36,8 +36,8 @@
%else
BuildRequires: boost-devel >= 1.39.0
%endif
-BuildRequires: pkgconfig(libvotca_csg) = %{version}
-BuildRequires: pkgconfig(libvotca_tools) = %{version}
+BuildRequires: votca-csg-devel = %{version}
+BuildRequires: votca-tools-devel = %{version}
BuildRequires: cmake
%description
@@ -51,7 +51,7 @@
%setup -n csgapps-%{uversion} -q
%build
-%{cmake}
+%{cmake} -DENABLE_TESTING=ON
make %{?_smp_mflags}
%install
@@ -59,6 +59,9 @@
%fdupes %{buildroot}%{_prefix}
+%check
+make -C build test CTEST_OUTPUT_ON_FAILURE=1
+
%files
%defattr(-,root,root,-)
%doc README
++++++ votca-csgapps-1.4.1.tar.gz -> votca-csgapps-1.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/.gitlab-ci.yml new/csgapps-1.5/.gitlab-ci.yml
--- old/csgapps-1.4.1/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/csgapps-1.5/.gitlab-ci.yml 2019-01-31 15:48:15.000000000 +0100
@@ -0,0 +1,121 @@
+stages:
+ - canary
+ - build
+
+.build:
+ retry:
+ max: 2
+ variables:
+ CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
+ CXXFLAGS: "-Wall -Werror"
+ DISTRO: "latest"
+ image: votca/buildenv:${DISTRO}
+ stage: build
+ cache:
+ paths:
+ - ccache/
+ script:
+ - ccache -z
+ - j="$(grep -c processor /proc/cpuinfo 2>/dev/null)" || j=0; ((j++))
+ - git branch commit_of_build_${CI_BUILD_ID} ${CI_COMMIT_SHA}
+ - cd $HOME
+ - git clone --recursive https://github.com/votca/votca
+ - pushd votca
+ - if [[ ( ${CI_COMMIT_REF_NAME} =~ ^for/([^/]*)/.* || ${CI_COMMIT_REF_NAME} =~ ^(stable)$ ) && ${BASH_REMATCH[1]} != master ]]; then
+ git checkout -b ${BASH_REMATCH[1]} origin/${BASH_REMATCH[1]} && git submodule update --recursive --init;
+ fi
+ - git -C ${CI_PROJECT_NAME} fetch ${CI_PROJECT_DIR} commit_of_build_${CI_BUILD_ID}
+ - git -C ${CI_PROJECT_DIR} branch -d commit_of_build_${CI_BUILD_ID}
+ - git -C ${CI_PROJECT_NAME} checkout -f ${CI_COMMIT_SHA}
+ - mkdir -p build
+ - pushd build
+ - cmake .. -DENABLE_TESTING=ON -DBUILD_CSGAPPS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DMODULE_BUILD=${MODULE_BUILD} ${MODULE_BUILD:+-DCMAKE_INSTALL_PREFIX=/home/votca/votca.install}
+ - make -O -k -j${j} -l${j} VERBOSE=1
+ - make test CTEST_OUTPUT_ON_FAILURE=1
+ - test -z "${MODULE_BUILD}" && make install DESTDIR=${PWD}/install && rm -rf ${PWD}/install/usr && rmdir ${PWD}/install
+ - sudo make install
+ - ccache -s
+
+Debug GCC:
+ stage: canary
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: "Debug"
+ extends: .build
+
+None GCC:
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: ""
+ extends: .build
+
+None Clang:
+ variables:
+ CC: "clang"
+ CXX: "clang++"
+ CMAKE_BUILD_TYPE: ""
+ extends: .build
+
+Debug Clang:
+ variables:
+ CC: "clang"
+ CXX: "clang++"
+ CMAKE_BUILD_TYPE: "Debug"
+ extends: .build
+
+Release GCC:
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: "Release"
+ extends: .build
+
+Release Clang:
+ variables:
+ CC: "clang"
+ CXX: "clang++"
+ CMAKE_BUILD_TYPE: "Release"
+ extends: .build
+
+Debug GCC Ubuntu:
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: "Debug"
+ DISTRO: "ubuntu"
+ extends: .build
+
+Debug Clang Ubuntu:
+ variables:
+ CC: "clang"
+ CXX: "clang++"
+ CMAKE_BUILD_TYPE: "Debug"
+ DISTRO: "ubuntu"
+ extends: .build
+
+Release GCC Ubuntu:
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: "Release"
+ DISTRO: "ubuntu"
+ extends: .build
+
+Release Clang Ubuntu:
+ variables:
+ CC: "clang"
+ CXX: "clang++"
+ CMAKE_BUILD_TYPE: "Release"
+ DISTRO: "ubuntu"
+ extends: .build
+
+Release GCC Module:
+ variables:
+ CC: "gcc"
+ CXX: "g++"
+ CMAKE_BUILD_TYPE: "Release"
+ MODULE_BUILD: "yes"
+ extends: .build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/.travis.yml new/csgapps-1.5/.travis.yml
--- old/csgapps-1.4.1/.travis.yml 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/.travis.yml 2019-01-31 15:48:15.000000000 +0100
@@ -1,87 +1,126 @@
-#the original source of this file can be found in tools repository change it ther
-# changes in tools|csg tiggered a full rebuild
-# changes in csgapps|csg-manual|csg-tutorials only trigger tools+csg+ifself
-
+# the original source of this file can be found in votca/votca repository
+# add changes there!
+# To update:
+# wget -O .travis.yml https://raw.githubusercontent.com/votca/votca/master/.travis.yml
language: cpp
-sudo: false
+sudo: required
-addons:
- apt:
- sources:
- - boost-latest
- - george-edison55-precise-backports
- - ubuntu-toolchain-r-test
- packages:
- - ccache
- - gcc-4.8
- - g++-4.8
- - libfftw3-dev
- - cmake
- - cmake-data
- - libgsl0-dev
- - txt2tags
- - libboost1.55-all-dev
- - libexpat1-dev
- - libsqlite3-dev
- - libhdf5-serial-dev
- - pkg-config
- - pgf
- - texlive-fonts-recommended
- - texlive-latex-extra
- - texlive-latex-recommended
- - cm-super
- - doxygen
- - graphviz
- - ghostscript
- - gnuplot-nox
- - octave
+services:
+- docker
env:
- global:
- - HDF5_VERSION=1.8.18
- - GMX_MAX_THREADS=8
- - CCACHE_CPP2=yes #for clang
- - GVER=4.8
- matrix: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9
- - BDIR=build WERROR=yes J=4 TYPE=Debug
- - BDIR=build WALL=yes J=4 TYPE=Debug
- - BDIR=build WERROR=yes J=4 TYPE=Release
- - BDIR=build WALL=yes J=4 TYPE=Release MAN=yes
- - MINIMAL=yes J=4
+ matrix:
+ - ENV=1
+ - ENV=2
+ - ENV=3
+ - ENV=4
+ - ENV=5
+ - ENV=6
+ - ENV=7
+ - ENV=8
+ - ENV=9
+ - ENV=10
+ - ENV=11
+ - ENV=12
+ - ENV=13
+ - ENV=14
+ - ENV=15
+ - ENV=16
+ - ENV=17
+ - ENV=18
+ - ENV=19
+ - ENV=20
before_script:
- - rm -vrf * .git
- - wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh
- - mkdir -p "$HOME/votca/src"
- - if [[ ${MINIMAL} != yes ]]; then
- wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION%.*}/hdf5… | tar -xz &&
- cd hdf5-${HDF5_VERSION} && ./configure --prefix=$HOME/hdf5 && make -j4 &> /dev/null && make install && cd ..;
+ - git checkout -b current_commit
+ - cd ../../
+ - if [[ ${TRAVIS_REPO_SLUG} = */votca ]]; then
+ if [[ ${TRAVIS_BRANCH} = next ]]; then
+ git -C ${TRAVIS_REPO_SLUG} submodule foreach git checkout master;
+ git -C ${TRAVIS_REPO_SLUG} submodule foreach git pull;
+ fi;
+ cp -vr ${TRAVIS_REPO_SLUG}/docker ${HOME};
+ mv -v ${TRAVIS_REPO_SLUG} $HOME/docker;
+ else
+ git clone --recursive https://github.com/votca/votca.git $HOME/docker/votca;
+ if [[ ${TRAVIS_BRANCH} != master ]]; then
+ git -C ${HOME}/docker/votca checkout -b ${TRAVIS_BRANCH} ${TRAVIS_TAG:-origin/${TRAVIS_BRANCH}} && git -C ${HOME}/docker/votca submodule update --recursive --init;
+ fi;
+ git -C ${HOME}/docker/votca/${TRAVIS_REPO_SLUG#*/} fetch ${PWD}/${TRAVIS_REPO_SLUG} current_commit;
+ git -C ${HOME}/docker/votca/${TRAVIS_REPO_SLUG#*/} checkout -f FETCH_HEAD;
+ cp -vr ${HOME}/docker/votca/docker/* ${HOME}/docker;
+ if [[ -d ${TRAVIS_REPO_SLUG}/docker ]]; then cp -vr ${TRAVIS_REPO_SLUG}/docker/* ${HOME}/docker; fi;
+ fi
+ - source ${HOME}/docker/set_env.sh
+ - cp -r $HOME/.ccache ${HOME}/docker/ccache
+ - sed -i "1s/latest/${DISTRO:-latest}/" ${HOME}/docker/Dockerfile
+ - if [[ ! ${SKIP} ]]; then
+ travis_retry timeout 540 docker pull $(sed -n '1s/FROM //p' ${HOME}/docker/Dockerfile);
+ fi
+
+script:
+ - if [[ ! ${SKIP} ]]; then
+ travis_retry docker build "${docker_opts[@]}"
+ --build-arg CC=${CC} --build-arg CXX=${CXX} --build-arg CXXFLAGS="-Wall ${WERROR:+-Werror}"
+ --build-arg CI=${CI} --build-arg TRAVIS=${TRAVIS} --build-arg TRAVIS_OS_NAME=${DISTRO:-fedora}
+ --build-arg TRAVIS_BRANCH=${TRAVIS_BRANCH} --build-arg TRAVIS_JOB_NUMBER=${TRAVIS_JOB_NUMBER}
+ --build-arg TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} --build-arg TRAVIS_JOB_ID=${TRAVIS_JOB_ID}
+ --build-arg TRAVIS_TAG=${TRAVIS_TAG} --build-arg TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG}
+ --build-arg TRAVIS_COMMIT=${TRAVIS_COMMIT}
+ ${TRAVIS_TAG:+-t votca/votca:${TRAVIS_TAG}}
+ -t votca/votca:latest -t votca/votca:${TRAVIS_BRANCH} ${HOME}/docker/ &&
+ rm -rf $HOME/.ccache &&
+ CON=$(docker run -d votca/votca:${TRAVIS_BRANCH} /bin/bash) &&
+ docker cp ${CON}:/home/votca/.ccache ${HOME}/;
+ fi
+
+after_success:
+ - shopt -s extglob && [[ ${TRAVIS_BRANCH} = @(master|stable|v1.*) && ${CC} = *gcc* && ${DOCKERHUB} = yes && ! ${SKIP} ]] && DEPLOY=yes
+ - if [[ ${TRAVIS_BRANCH} = master ]]; then DOCKER_TAG=latest; else DOCKER_TAG="${TRAVIS_BRANCH}"; fi
+ - if [[ ${DOCKER_USERNAME} && ${DOCKER_PASSWORD} && ${TRAVIS_PULL_REQUEST} == false && ${DEPLOY} ]]; then
+ docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
+ docker push "${TRAVIS_REPO_SLUG}:${DOCKER_TAG}";
fi
- - if [[ ${GMX_VERSION} = 9999 ]]; then
- CMAKE_VERSION=3.4.3-Linux-x86_64 &&
- wget --no-check-certificate -qO- http://www.cmake.org/files/v${CMAKE_VERSION:0:3}/cmake-${CMAKE_VERSION}.tar… | tar -xz &&
- export CMAKE="$PWD/cmake-${CMAKE_VERSION}/bin/cmake" ;
+ - if [[ ${DOXYGEN} = yes && ! ${SKIP} ]]; then
+ git clone --depth=1 https://github.com/votca/doxygen.git "$HOME/devdoc";
+ cd $HOME/devdoc;
+ rm -f *;
+ git checkout -- CNAME;
+ docker cp ${CON}:/home/votca/votca/build/share/doc/html . ;
+ mv html/* .; rmdir html;
+ docker cp ${CON}:/home/votca/votca/build/csg-manual/manual.pdf . ;
+ docker cp ${CON}:/home/votca/votca/build/ctp/manual/ctp-manual.pdf . ;
+ docker cp ${CON}:/home/votca/votca/build/xtp/manual/xtp-manual.pdf . ;
+ git add --all .;
+ if [[ ${TRAVIS_BRANCH} = master && ${encrypted_7abbb71c3ba6_key} && ${encrypted_7abbb71c3ba6_iv} && ${TRAVIS_PULL_REQUEST} == false ]]; then
+ git config --global user.name "Automatic Deployment (Travis CI)";
+ git config --global user.email "votca-commits(a)googlegroups.com";
+ git commit -m "Documentation Update";
+ openssl aes-256-cbc -K $encrypted_7abbb71c3ba6_key -iv $encrypted_7abbb71c3ba6_iv -in keys/deploy3.enc -out ~/.ssh/id_rsa -d;
+ chmod 600 ~/.ssh/id_rsa;
+ git push git@github.com:votca/doxygen.git gh-pages;
+ else
+ git status;
+ git diff --cached --no-color | head -c 1k;
+ fi;
fi
- - if [[ ${MAN} ]]; then git clone --depth=1 https://github.com/votca/doxygen.git "$HOME/votca/src/devdoc"; fi
- - if [[ ${GVER} ]]; then export CC=gcc-${GVER}; export CXX=g++-${GVER}; fi
- - pip install --user numpy
-script:
- - PATH="$HOME/hdf5:$PATH" ./build.sh -Wu --prefix "$HOME/votca"
- ${TYPE:+-DCMAKE_BUILD_TYPE=${TYPE}}
- ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} -DWITH_H5MD=ON ${MINIMAL:+--minimal} ${MAN:+--devdoc}
- ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall} ${GMX_VERSION:+--gmx-release ${GMX_VERSION}}
- --directory "$HOME/votca/src" --no-clean --depth 1 -DGMX_USE_RDTSCP=OFF ${GMX_DOUBLE:+-DGMX_DOUBLE=yes}
- tools $([[ ${MINIMAL} ]] || echo gromacs) csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials}
- ${CTP:+kmc moo ctp} ${XTP:+xtp}
+branches:
+ only:
+ - master
+ - development
+ - stable
+ - next
+ - /^v\d+\.\d+(\.\d+|_rc\d+)?$/
cache:
- ccache
compiler:
- gcc
+ - clang
notifications:
email:
- - votca-commits(a)googlegroups.com
+ - votca-commits(a)googlegroups.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/CMakeLists.txt new/csgapps-1.5/CMakeLists.txt
--- old/csgapps-1.4.1/CMakeLists.txt 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/CMakeLists.txt 2019-01-31 15:48:15.000000000 +0100
@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1)
project(csgapps)
-set(PROJECT_VERSION "1.4.1")
+set(PROJECT_VERSION "1.5")
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
@@ -18,20 +18,29 @@
# these need ot be done early (before further tests).
#####################################################################
-#needed by csg
include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
-if(COMPILER_SUPPORTS_CXX11)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-else()
- message(FATAL_ERROR "Could not find a C++-11 compiler")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND CMAKE_VERSION VERSION_LESS "3.6.0")
+ message(FATAL_ERROR "Using the intel compiler requires cmake 3.6 or higher")
endif()
########################################################################
+# User input options #
+########################################################################
+include(GNUInstallDirs)
+
+option(ENABLE_TESTING "Build and enable testing stuff" OFF)
+if(ENABLE_TESTING)
+ enable_testing()
+endif(ENABLE_TESTING)
+
+########################################################################
#Find external packages
########################################################################
-find_package(Boost 1.39.0 REQUIRED COMPONENTS program_options )
+find_package(Boost 1.57.0 REQUIRED COMPONENTS program_options )
include_directories(${Boost_INCLUDE_DIRS})
set (BOOST_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY})
@@ -51,8 +60,13 @@
add_executable(${DIR} ${SRC})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DIR}) #needed for out-of-source build
target_link_libraries(${DIR} ${VOTCA_CSG_LIBRARIES} ${VOTCA_TOOLS_LIBRARIES} ${BOOST_LIBRARIES})
- install(TARGETS ${DIR} RUNTIME DESTINATION bin)
+ install(TARGETS ${DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
set_target_properties(${DIR} PROPERTIES OUTPUT_NAME ${DIR}/csg_${DIR})
+ if(ENABLE_TESTING)
+ add_test(${DIR}Help ${DIR}/csg_${DIR} --help)
+ # run tests for tools and csg as well for coverage
+ set_tests_properties(${DIR}Help PROPERTIES LABELS "csgapps;csg;tools;votca")
+ endif(ENABLE_TESTING)
endforeach(DIR)
configure_file(${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
@@ -62,5 +76,7 @@
endif()
add_dependencies(uninstall uninstall-csgapps)
-include(FeatureSummary)
-feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL)
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+ include(FeatureSummary)
+ feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL)
+endif (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/CMakeModules/FindEigen3.cmake new/csgapps-1.5/CMakeModules/FindEigen3.cmake
--- old/csgapps-1.4.1/CMakeModules/FindEigen3.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/csgapps-1.5/CMakeModules/FindEigen3.cmake 2019-01-31 15:48:15.000000000 +0100
@@ -0,0 +1,107 @@
+# - Try to find Eigen3 lib
+#
+# This module supports requiring a minimum version, e.g. you can do
+# find_package(Eigen3 3.1.2)
+# to require version 3.1.2 or newer of Eigen3.
+#
+# Once done this will define
+#
+# EIGEN3_FOUND - system has eigen lib with correct version
+# EIGEN3_INCLUDE_DIR - the eigen include directory
+# EIGEN3_VERSION - eigen version
+#
+# and the following imported target:
+#
+# Eigen3::Eigen - The header-only Eigen library
+#
+# This module reads hints about search locations from
+# the following environment variables:
+#
+# EIGEN3_ROOT
+# EIGEN3_ROOT_DIR
+
+# Copyright (c) 2006, 2007 Montel Laurent, <montel(a)kde.org>
+# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael(a)free.fr>
+# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1(a)gmail.com>
+# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
+
+if(NOT Eigen3_FIND_VERSION)
+ if(NOT Eigen3_FIND_VERSION_MAJOR)
+ set(Eigen3_FIND_VERSION_MAJOR 2)
+ endif(NOT Eigen3_FIND_VERSION_MAJOR)
+ if(NOT Eigen3_FIND_VERSION_MINOR)
+ set(Eigen3_FIND_VERSION_MINOR 91)
+ endif(NOT Eigen3_FIND_VERSION_MINOR)
+ if(NOT Eigen3_FIND_VERSION_PATCH)
+ set(Eigen3_FIND_VERSION_PATCH 0)
+ endif(NOT Eigen3_FIND_VERSION_PATCH)
+
+ set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
+endif(NOT Eigen3_FIND_VERSION)
+
+macro(_eigen3_check_version)
+ file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+
+ string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
+ set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
+ set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
+ set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
+
+ set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
+ if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+ set(EIGEN3_VERSION_OK FALSE)
+ else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+ set(EIGEN3_VERSION_OK TRUE)
+ endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+
+ if(NOT EIGEN3_VERSION_OK)
+
+ message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
+ "but at least version ${Eigen3_FIND_VERSION} is required")
+ endif(NOT EIGEN3_VERSION_OK)
+endmacro(_eigen3_check_version)
+
+if (EIGEN3_INCLUDE_DIR)
+
+ # in cache already
+ _eigen3_check_version()
+ set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
+ set(Eigen3_FOUND ${EIGEN3_VERSION_OK})
+
+else (EIGEN3_INCLUDE_DIR)
+
+ # search first if an Eigen3Config.cmake is available in the system,
+ # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
+ # the script will work as usual
+ find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
+
+ if(NOT EIGEN3_INCLUDE_DIR)
+ find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+ HINTS
+ ENV EIGEN3_ROOT
+ ENV EIGEN3_ROOT_DIR
+ PATHS
+ ${CMAKE_INSTALL_PREFIX}/include
+ ${KDE4_INCLUDE_DIR}
+ PATH_SUFFIXES eigen3 eigen
+ )
+ endif(NOT EIGEN3_INCLUDE_DIR)
+
+ if(EIGEN3_INCLUDE_DIR)
+ _eigen3_check_version()
+ endif(EIGEN3_INCLUDE_DIR)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
+
+ mark_as_advanced(EIGEN3_INCLUDE_DIR)
+
+endif(EIGEN3_INCLUDE_DIR)
+
+if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
+ add_library(Eigen3::Eigen INTERFACE IMPORTED)
+ set_target_properties(Eigen3::Eigen PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}")
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/CMakeModules/FindMKL.cmake new/csgapps-1.5/CMakeModules/FindMKL.cmake
--- old/csgapps-1.4.1/CMakeModules/FindMKL.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/csgapps-1.5/CMakeModules/FindMKL.cmake 2019-01-31 15:48:15.000000000 +0100
@@ -0,0 +1,339 @@
+# CMake script to detect Intel(R) Math Kernel Library (MKL)
+#
+# This will try to find Intel MKL libraries, and include path by automatic
+# search through typical install locations and if failed it will
+# examine MKLROOT environment variable.
+# Note, MKLROOT is not set by IPP installer, it should be set manually.
+#
+# Usage example:
+# set(MKL_USE_STATIC_LIBS ON)
+# find_package(MKL)
+# if (MKL_FOUND)
+# include_directories(${MKL_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${MKL_LIBRARIES})
+# endif()
+#
+# Variables used by this module, they can change the default behaviour and
+# need to be set before calling find_package:
+#
+# MKL_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the MKL include directory.
+#
+# MKL_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# MKL_FIND_DEBUG Set this to TRUE to enable debugging output
+# of FindMKL.cmake if you are having problems.
+#
+# On return this will define:
+# MKL_FOUND Indicates whether MKL was found (True/False)
+# MKL_INCLUDE_DIRS MKL include folder
+# MKL_LIBRARY_DIRS MKL libraries folder
+# MKL_LIBRARIES MKL libraries names
+#
+# NOTE: this script has only been tested with Intel(R) Parallel Studio XE 2011
+# and may need changes for compatibility with older versions.
+#
+# Adapted from OpenCV IPP detection script
+# https://code.ros.org/trac/opencv/browser/trunk/opencv/OpenCVFindIPP.cmake
+# Many portions taken from FindBoost.cmake
+
+# TODO:
+# - caller needs to link with libiomp5md.lib or /Qopenmp...
+# - runtime DLLs:
+# <Composer XE directory> -> C:\Program Files\Intel\ComposerXE-2011
+# redist\ia32\mkl
+# redist\intel64\mkl
+
+set(_MKL_IA32 FALSE)
+set(_MKL_INTEL64 FALSE)
+if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(_MKL_IA32 TRUE)
+elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(_MKL_INTEL64 TRUE)
+else()
+ message(FATAL_ERROR "Unsupported 'void *' size (${SIZEOF_VOID_P})")
+endif()
+
+# Versions should be listed is decreasing order of preference
+set(_MKL_TEST_VERSIONS ${MKL_ADDITIONAL_VERSIONS}
+ "2011"
+ # alternative form: "2011.xxx.y"
+ # (y is the release-update number and xxx is the package number)
+)
+
+if (MKL_FIND_VERSION AND NOT MKL_FIND_QUIETLY)
+ message(WARNING "Requesting a specific version of Intel(R) MKL is not supported")
+endif()
+
+# Use environment variables from Intel build scripts, if available
+if (NOT MKL_ROOT AND NOT $ENV{MKLROOT} STREQUAL "")
+ set(MKL_ROOT $ENV{MKLROOT})
+endif()
+
+if (MKL_ROOT)
+ file(TO_CMAKE_PATH ${MKL_ROOT} MKL_ROOT)
+endif()
+
+if (NOT INTEL_ROOT AND NOT $ENV{INTELROOT} STREQUAL "")
+ set(INTEL_ROOT $ENV{INTELROOT})
+endif()
+
+if (INTEL_ROOT)
+ file(TO_CMAKE_PATH ${INTEL_ROOT} INTEL_ROOT)
+endif()
+
+if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_MKL_TEST_VERSIONS = ${_MKL_TEST_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "MKL_ADDITIONAL_VERSIONS = ${MKL_ADDITIONAL_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "MKL_USE_STATIC_LIBS = ${MKL_USE_STATIC_LIBS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "MKL_ROOT = ${MKL_ROOT}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "INTEL_ROOT = ${INTEL_ROOT}")
+endif()
+
+# Find MKL include directory
+
+set(_MKL_ROOT_SEARCH_DIRS
+ ${MKL_ROOT}
+)
+
+foreach (_MKL_VER ${_MKL_TEST_VERSIONS})
+ if (WIN32)
+ list(APPEND _MKL_ROOT_SEARCH_DIRS "$ENV{ProgramFiles}/Intel/Composer XE/mkl")
+ else()
+ list(APPEND _MKL_ROOT_SEARCH_DIRS "/opt/intel/composerxe-${_MKL_VER}/mkl")
+ endif()
+endforeach()
+
+if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_MKL_ROOT_SEARCH_DIRS = ${_MKL_ROOT_SEARCH_DIRS}")
+endif()
+
+find_path(MKL_INCLUDE_DIR
+ NAMES mkl.h
+ PATHS ${_MKL_ROOT_SEARCH_DIRS}
+ PATH_SUFFIXES include
+ DOC "The path to Intel(R) MKL header files"
+)
+
+if (MKL_INCLUDE_DIR)
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "location of mkl.h: ${MKL_INCLUDE_DIR}/mkl.h")
+ endif()
+else()
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "unable to find Intel(R) MKL header files. Please set MKLROOT"
+ " to the root directory containing MKL.")
+ endif()
+endif()
+
+# Find MKL library directory
+
+set(_INTEL_LIBRARY_DIR_SUFFIXES "lib")
+if (_MKL_IA32)
+ list(APPEND _INTEL_LIBRARY_DIR_SUFFIXES "lib/ia32")
+elseif (_MKL_INTEL64)
+ list(APPEND _INTEL_LIBRARY_DIR_SUFFIXES "lib/intel64")
+else()
+ message(FATAL_ERROR "unreachable")
+endif()
+
+set(_MKL_LIBRARY_SEARCH_DIRS ${_MKL_ROOT_SEARCH_DIRS})
+if (MKL_INCLUDE_DIR)
+ list(APPEND _MKL_LIBRARY_SEARCH_DIRS "${MKL_INCLUDE_DIR}/..")
+endif()
+
+if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_INTEL_LIBRARY_DIR_SUFFIXES = ${_INTEL_LIBRARY_DIR_SUFFIXES}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_MKL_LIBRARY_SEARCH_DIRS = ${_MKL_LIBRARY_SEARCH_DIRS}")
+endif()
+
+set(MKL_LIB_PREFIX "mkl_")
+if (MKL_USE_STATIC_LIBS)
+ if (_MKL_IA32)
+ if (WIN32)
+ set(_MKL_LIBRARIES intel_c)
+ else()
+ set(_MKL_LIBRARIES intel)
+ endif()
+ elseif (_MKL_INTEL64)
+ set(_MKL_LIBRARIES intel_lp64)
+ else()
+ message(FATAL_ERROR "unreachable")
+ endif()
+
+ list(APPEND _MKL_LIBRARIES intel_thread)
+ list(APPEND _MKL_LIBRARIES core)
+else()
+ set(_MKL_LIBRARIES rt)
+endif()
+
+set(_MKL_MISSING_LIBRARIES "")
+set(MKL_LIBRARIES "")
+set(MKL_LIBRARY_DIRS "")
+# Find MKL libraries
+foreach (_MKL_LIB_RAW ${_MKL_LIBRARIES})
+ set(_MKL_LIB ${MKL_LIB_PREFIX}${_MKL_LIB_RAW})
+ string(TOUPPER ${_MKL_LIB} _MKL_LIB_UPPER)
+
+ find_library(${_MKL_LIB_UPPER}_LIBRARY
+ NAMES ${_MKL_LIB}
+ PATHS ${_MKL_LIBRARY_SEARCH_DIRS}
+ PATH_SUFFIXES ${_INTEL_LIBRARY_DIR_SUFFIXES}
+ DOC "The path to Intel(R) MKL ${_MKL_LIB_RAW} library"
+ )
+ mark_as_advanced(${_MKL_LIB_UPPER}_LIBRARY)
+
+ if (NOT ${_MKL_LIB_UPPER}_LIBRARY)
+ list(APPEND _MKL_MISSING_LIBRARIES ${_MKL_LIB})
+ else()
+ list(APPEND MKL_LIBRARIES ${${_MKL_LIB_UPPER}_LIBRARY})
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Found ${_MKL_LIB}: ${${_MKL_LIB_UPPER}_LIBRARY}")
+ endif()
+
+ get_filename_component(_MKL_LIB_PATH "${${_MKL_LIB_UPPER}_LIBRARY}" PATH)
+ list(APPEND MKL_LIBRARY_DIRS ${_MKL_LIB_PATH})
+ endif()
+endforeach()
+
+## Find OpenMP, pthread and math libraries
+
+set(_INTEL_LIBRARY_SEARCH_DIRS
+ ${INTEL_ROOT}
+ ${INTEL_ROOT}/compiler
+)
+
+foreach(_MKL_DIR ${_MKL_ROOT_SEARCH_DIRS})
+ list(APPEND _INTEL_LIBRARY_SEARCH_DIRS "${_MKL_DIR}/..")
+ list(APPEND _INTEL_LIBRARY_SEARCH_DIRS "${_MKL_DIR}/../compiler")
+endforeach()
+
+if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_INTEL_LIBRARY_SEARCH_DIRS = ${_INTEL_LIBRARY_SEARCH_DIRS}")
+endif()
+
+if (NOT WIN32)
+ find_library(PTHREAD_LIBRARY pthread DOC "Path to POSIX threads library")
+endif()
+
+set(_IOMP5_LIB iomp5)
+if (WIN32)
+ if (MKL_USE_STATIC_LIBS)
+ list(APPEND _IOMP5_LIB libiomp5mt.lib)
+ else()
+ list(APPEND _IOMP5_LIB libiomp5md.lib)
+ endif()
+endif()
+
+find_library(IOMP5_LIBRARY
+ NAMES ${_IOMP5_LIB}
+ PATHS ${_INTEL_LIBRARY_SEARCH_DIRS}
+ PATH_SUFFIXES ${_INTEL_LIBRARY_DIR_SUFFIXES}
+ DOC "Path to OpenMP runtime library"
+)
+
+if (NOT IOMP5_LIBRARY)
+ # we could instead fallback to default library (via FindOpenMP.cmake)
+ list(APPEND _MKL_MISSING_LIBRARIES IOMP5)
+else()
+ list(APPEND MKL_LIBRARIES ${IOMP5_LIBRARY})
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Found IOMP5_LIBRARY: ${IOMP5_LIBRARY}")
+ endif()
+
+ get_filename_component(_MKL_LIB_PATH "${IOMP5_LIBRARY}" PATH)
+ list(APPEND MKL_LIBRARY_DIRS ${_MKL_LIB_PATH})
+endif()
+
+# Optimized math library (optional)
+set(_MATH_LIB imf) # linked by default with Intel compiler
+if (WIN32)
+ if (MKL_USE_STATIC_LIBS)
+ list(APPEND _MATH_LIB libmmds.lib) # assumes (/MD) otherwise libmmt.lib (for /MT)
+ else()
+ list(APPEND _MATH_LIB libmmd.lib)
+ endif()
+endif()
+
+find_library(MATH_LIBRARY
+ NAMES ${_MATH_LIB}
+ PATHS ${_INTEL_LIBRARY_SEARCH_DIRS}
+ PATH_SUFFIXES ${_INTEL_LIBRARY_DIR_SUFFIXES}
+ DOC "Path to optimized math library"
+)
+
+if (NOT MATH_LIBRARY)
+ # we could instead fallback to default library (via FindOpenMP.cmake)
+ list(APPEND _MKL_MISSING_LIBRARIES MATH)
+else()
+ list(APPEND MKL_LIBRARIES ${MATH_LIBRARY})
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Found MATH_LIBRARY: ${MATH_LIBRARY}")
+ endif()
+
+ get_filename_component(_MKL_LIB_PATH "${MATH_LIBRARY}" PATH)
+ list(APPEND MKL_LIBRARY_DIRS ${_MKL_LIB_PATH})
+endif()
+
+# Check all required libraries are available
+list(REMOVE_DUPLICATES MKL_LIBRARY_DIRS)
+
+set(MKL_INCLUDE_DIRS
+ ${MKL_INCLUDE_DIR}
+)
+
+set(MKL_FOUND TRUE)
+if (NOT MKL_INCLUDE_DIR)
+ set(MKL_FOUND FALSE)
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "MKL not found - MKL_INCLUDE_DIR was empty")
+ endif()
+elseif (_MKL_MISSING_LIBRARIES)
+ set(MKL_FOUND FALSE)
+ if (MKL_FIND_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "MKL not found - the following libraries are missing: "
+ "${_MKL_MISSING_LIBRARIES}")
+ endif()
+endif()
+
+if (MKL_FOUND)
+ if (NOT MKL_FIND_QUIETLY OR MKL_FIND_DEBUG)
+ message(STATUS
+ "Intel(R) MKL was found:\n"
+ " MKL_INCLUDE_DIRS: ${MKL_INCLUDE_DIRS}\n"
+ " MKL_LIBRARY_DIRS: ${MKL_LIBRARY_DIRS}\n"
+ " MKL_LIBRARIES: ${MKL_LIBRARIES}"
+ )
+ endif()
+else()
+ if (MKL_FIND_REQUIRED)
+ message(SEND_ERROR "Intel(R) MKL could not be found.")
+ else()
+ message(STATUS "Intel(R) MKL could not be found.")
+ endif()
+endif()
+
+mark_as_advanced(
+ MKL_INCLUDE_DIR
+ MKL_INCLUDE_DIRS
+ MKL_LIBRARY_DIRS
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/CMakeModules/FindVOTCA_TOOLS.cmake new/csgapps-1.5/CMakeModules/FindVOTCA_TOOLS.cmake
--- old/csgapps-1.4.1/CMakeModules/FindVOTCA_TOOLS.cmake 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/CMakeModules/FindVOTCA_TOOLS.cmake 2019-01-31 15:48:15.000000000 +0100
@@ -6,7 +6,7 @@
# VOTCA_TOOLS_FOUND - True if expat found.
# VOTCA_TOOLS_HAS_SQLITE3 - True if votca tools was build with sqlite3 support
#
-# Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
+# Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -26,19 +26,27 @@
pkg_check_modules(PC_VOTCA_TOOLS libvotca_tools)
find_path(VOTCA_TOOLS_INCLUDE_DIR votca/tools/version.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS})
-find_path(VOTCA_TOOLS_HAS_SQLITE3 votca/tools/database.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS})
-if (VOTCA_TOOLS_HAS_SQLITE3)
+find_package(Eigen3 3.3.0 REQUIRED)
+find_package(MKL)
+if (NOT MKL_FOUND)
+ set(MKL_LIBRARIES)
+ set(MKL_INCLUDE_DIRS)
+endif()
+
+find_path(VOTCA_TOOLS_HAS_SQLITE3 votca/tools/database.h HINTS ${VOTCA_TOOLS_INCLUDE_DIR} ${PC_VOTCA_TOOLS_INCLUDE_DIRS})
+if(DEFINED WITH_SQLITE3 AND NOT WITH_SQLITE3)
+ set(SQLITE3_INCLUDE_DIR)
+elseif(VOTCA_TOOLS_HAS_SQLITE3)
#due to include <sqlite3.h> in database.h
find_package(SQLITE3 REQUIRED)
- set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR}" )
-else(VOTCA_TOOLS_HAS_SQLITE3)
- set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR}" )
-endif (VOTCA_TOOLS_HAS_SQLITE3)
-
+else()
+ set(SQLITE3_INCLUDE_DIR)
+endif()
find_library(VOTCA_TOOLS_LIBRARY NAMES votca_tools HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} )
-set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY}" )
+set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR};${MKL_INCLUDE_DIRS}" )
+set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY};${MKL_LIBRARIES}" )
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set VOTCA_TOOLS_FOUND to TRUE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/fluctuations/fluctuations.cc new/csgapps-1.5/fluctuations/fluctuations.cc
--- old/csgapps-1.4.1/fluctuations/fluctuations.cc 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/fluctuations/fluctuations.cc 2019-01-31 15:48:15.000000000 +0100
@@ -168,7 +168,7 @@
void CsgFluctuations::EvalConfiguration(Topology *conf, Topology*conf_atom = 0)
{
vec eR;
- double r;
+ double r = 0;
int rbin;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/orientcorr/orientcorr.cc new/csgapps-1.5/orientcorr/orientcorr.cc
--- old/csgapps-1.4.1/orientcorr/orientcorr.cc 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/orientcorr/orientcorr.cc 2019-01-31 15:48:15.000000000 +0100
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
#include <stdlib.h>
#include <votca/csg/csgapplication.h>
#include <votca/tools/histogramnew.h>
@@ -227,9 +244,9 @@
// write out the data
void OrientCorrApp::EndEvaluate() {
- _cor.data().y() = element_div(_cor.data().y(), _count.data().y());
+ _cor.data().y() = _cor.data().y().cwiseQuotient( _count.data().y());
_cor.data().Save("correlation.dat");
- _cor_excl.data().y() = element_div(_cor_excl.data().y(), _count_excl.data().y());
+ _cor_excl.data().y() = _cor_excl.data().y().cwiseQuotient(_count_excl.data().y());
_cor_excl.data().Save("correlation_excl.dat");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/part_dist/part_dist.cc new/csgapps-1.5/part_dist/part_dist.cc
--- old/csgapps-1.4.1/part_dist/part_dist.cc 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/part_dist/part_dist.cc 2019-01-31 15:48:15.000000000 +0100
@@ -104,7 +104,7 @@
po::store(po::parse_command_line(argc, argv, desc), vm);
po::notify(vm);
}
- catch(po::error err) {
+ catch(po::error& err) {
cout << "error parsing command line: " << err.what() << endl;
return -1;
}
@@ -170,18 +170,18 @@
}
else {
// Include all particle types
- for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
- for(int i=0; i<(*mol)->BeadCount(); ++i) {
- flag_found = 0;
- part_type = atoi((*mol)->getBead(i)->getType()->getName().c_str());
- for (size_t j=0; j < ptypes.size(); ++j) {
- if (part_type == ptypes[j])
- flag_found = 1;
- }
- if (!flag_found)
- ptypes.push_back(part_type);
- }
- }
+ for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
+ for(int i=0; i<(*mol)->BeadCount(); ++i) {
+ flag_found = 0;
+ part_type = atoi((*mol)->getBead(i)->getBeadTypeName().c_str());
+ for (size_t j=0; j < ptypes.size(); ++j) {
+ if (part_type == ptypes[j])
+ flag_found = 1;
+ }
+ if (!flag_found)
+ ptypes.push_back(part_type);
+ }
+ }
}
// Allocate array used to store particle occupancy p_occ
@@ -192,16 +192,16 @@
// If we need to shift the center of mass, calculate the number of
// particles (only the ones that belong to the particle type index
// ptypes)
- if (vm.count("shift_com")) {
- for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
- for(int i=0; i<(*mol)->BeadCount(); ++i) {
- part_type = atoi((*mol)->getBead(i)->getType()->getName().c_str());
- for (size_t j=0; j < ptypes.size(); ++j)
- if (part_type == ptypes[j])
- ++n_part;
- }
- }
- }
+ if (vm.count("shift_com")) {
+ for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
+ for(int i=0; i<(*mol)->BeadCount(); ++i) {
+ part_type = atoi((*mol)->getBead(i)->getBeadTypeName().c_str());
+ for (size_t j=0; j < ptypes.size(); ++j)
+ if (part_type == ptypes[j])
+ ++n_part;
+ }
+ }
+ }
// Now load trajectory
@@ -233,52 +233,52 @@
// Calculate new center of mass position in the direction of 'coordinate'
com = 0.;
if (vm.count("shift_com")) {
- for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
- for(int i=0; i<(*mol)->BeadCount(); ++i) {
- part_type = atoi((*mol)->getBead(i)->getType()->getName().c_str());
- for (size_t j=0; j < ptypes.size(); ++j) {
- if (part_type == ptypes[j]) {
- if (coordinate.compare("x") == 0) {
- com += (*mol)->getBead(i)->getPos().getX();
- }
- else if (coordinate.compare("y") == 0) {
- com += (*mol)->getBead(i)->getPos().getY();
- }
- else {
- com += (*mol)->getBead(i)->getPos().getZ();
- }
- }
- }
- }
- }
- com /= n_part;
+ for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
+ for(int i=0; i<(*mol)->BeadCount(); ++i) {
+ part_type = atoi((*mol)->getBead(i)->getBeadTypeName().c_str());
+ for (size_t j=0; j < ptypes.size(); ++j) {
+ if (part_type == ptypes[j]) {
+ if (coordinate.compare("x") == 0) {
+ com += (*mol)->getBead(i)->getPos().getX();
+ }
+ else if (coordinate.compare("y") == 0) {
+ com += (*mol)->getBead(i)->getPos().getY();
+ }
+ else {
+ com += (*mol)->getBead(i)->getPos().getZ();
+ }
+ }
+ }
+ }
+ }
+ com /= n_part;
}
// Analyze frame
if (moreframes && frame_id >= first_frame && not_the_last) {
++analyzed_frames;
// Loop over each atom property
- for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
- for(int i=0; i<(*mol)->BeadCount(); ++i) {
- part_type = atoi((*mol)->getBead(i)->getType()->getName().c_str());
- for (size_t j=0; j < ptypes.size(); ++j) {
- if (part_type == ptypes[j]) {
- if (coordinate.compare("x") == 0)
- coord = (*mol)->getBead(i)->getPos().getX();
- else if (coordinate.compare("y") == 0)
- coord = (*mol)->getBead(i)->getPos().getY();
- else
- coord = (*mol)->getBead(i)->getPos().getZ();
-
- if (coord-com > min && coord-com < max)
- ++p_occ[j][(int)floor((coord-com-min)/step)];
- }
- }
- }
- }
- }
- ++frame_id;
- }
+ for(mol=top.Molecules().begin(); mol!=top.Molecules().end();++mol) {
+ for(int i=0; i<(*mol)->BeadCount(); ++i) {
+ part_type = atoi((*mol)->getBead(i)->getBeadTypeName().c_str());
+ for (size_t j=0; j < ptypes.size(); ++j) {
+ if (part_type == ptypes[j]) {
+ if (coordinate.compare("x") == 0)
+ coord = (*mol)->getBead(i)->getPos().getX();
+ else if (coordinate.compare("y") == 0)
+ coord = (*mol)->getBead(i)->getPos().getY();
+ else
+ coord = (*mol)->getBead(i)->getPos().getZ();
+
+ if (coord-com > min && coord-com < max)
+ ++p_occ[j][(int)floor((coord-com-min)/step)];
+ }
+ }
+ }
+ }
+ }
+ ++frame_id;
+ }
trajreader->Close();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/partial_rdf/rdf_calculator.cc new/csgapps-1.5/partial_rdf/rdf_calculator.cc
--- old/csgapps-1.4.1/partial_rdf/rdf_calculator.cc 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/partial_rdf/rdf_calculator.cc 2019-01-31 15:48:15.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
+ * Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -199,7 +199,7 @@
ic_iter->second->_average.Clear();
for (group_iter = _groups.begin(); group_iter != _groups.end(); ++group_iter)
- group_iter->second->_corr.clear();
+ group_iter->second->_corr.setZero();
}
class IMCNBSearchHandler {
@@ -370,10 +370,8 @@
// dist.y() = _avg_vol.getAvg()*iter->second->_norm *
// factor 1/2 if beadlist1==beadlist2 already inclyded in _avg_beadlist_2_count!!
iter->second->_norm/=(iter->second->_avg_beadlist_1_count.getAvg()*iter->second->_avg_beadlist_2_count.getAvg());
- dist.y() = _avg_vol.getAvg()*iter->second->_norm *
- element_div(dist.y(),
- element_prod(dist.x(), dist.x())
- );
+ dist.y() = _avg_vol.getAvg()*iter->second->_norm *dist.y().cwiseQuotient(dist.x().cwiseAbs2());
+
dist.Save((iter->first) + suffix + ".dist.new");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.4.1/partial_rdf/rdf_calculator.h new/csgapps-1.5/partial_rdf/rdf_calculator.h
--- old/csgapps-1.4.1/partial_rdf/rdf_calculator.h 2017-09-03 01:42:18.000000000 +0200
+++ new/csgapps-1.5/partial_rdf/rdf_calculator.h 2019-01-31 15:48:15.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org)
+ * Copyright 2009-2018 The VOTCA Development Team (http://www.votca.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -72,8 +72,8 @@
Average<double> _avg_vol;
- typedef ub::matrix<double> group_matrix;
- typedef ub::matrix_range< group_matrix > pair_matrix;
+ typedef Eigen::MatrixXd group_matrix;
+ typedef Eigen::Block<group_matrix > pair_matrix;
/// struct to store collected information for interactions
struct interaction_t {
1
0
Hello community,
here is the log from the commit of package votca-csg for openSUSE:Factory checked in at 2019-02-28 21:38:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-csg (Old)
and /work/SRC/openSUSE:Factory/.votca-csg.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-csg"
Thu Feb 28 21:38:23 2019 rev:11 rq:670459 version:1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-csg/votca-csg.changes 2017-09-04 12:39:18.370325429 +0200
+++ /work/SRC/openSUSE:Factory/.votca-csg.new.28833/votca-csg.changes 2019-02-28 21:38:25.901639651 +0100
@@ -1,0 +2,24 @@
+Thu Jan 31 16:52:52 UTC 2019 - Christoph Junghans <junghans(a)votca.org>
+
+- Upgrade to 1.5
+ * cmake: only run csg_dump test if bash was found
+ * added REGRESSIONTEST_TOLERANCE cmake option
+ * added bug fix for memory leak in bead class
+ * added topology unit test
+ * added support for 3 body distribution
+ * allow usage of _ in gmx options
+ * support espresso-4.0
+ * added LAMMPS data topology reader
+ * added LAMMPS dump writer
+ * added support for gmx-2019
+ * move from gsl to Eigen3
+ * added support for running gmx in multidir mode
+ * extended pdb reader to read CONECT section
+ * reworked perl interface to fix #179
+ * make most install locations configureable
+ * allow to change pot extrapolation fct for LAMMPS
+ * dropped support for gmx-5.1
+ * added unit and regression tests
+ * details: https://github.com/votca/csg/blob/master/CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
votca-csg-1.4.1.tar.gz
votca-csg-manual-1.4.1.pdf
votca-csg-tutorials-1.4.1.tar.gz
New:
----
votca-csg-1.5.tar.gz
votca-csg-manual-1.5.pdf
votca-csg-tutorials-1.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-csg.spec ++++++
--- /var/tmp/diff_new_pack.2vd79x/_old 2019-02-28 21:38:27.093639277 +0100
+++ /var/tmp/diff_new_pack.2vd79x/_new 2019-02-28 21:38:27.117639269 +0100
@@ -2,7 +2,7 @@
# spec file for package votca-csg
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2013-2017 Christoph Junghans
+# Copyright (c) 2013-2019 Christoph Junghans
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,9 @@
#
Name: votca-csg
-Version: 1.4.1
-%define uversion 1.4.1
+Version: 1.5
+%define uversion %{version}
+%define sover 5
Release: 0
Summary: VOTCA coarse-graining engine
License: Apache-2.0
@@ -35,6 +36,7 @@
%if 0%{?suse_version} > 1325
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_program_options-devel
+BuildRequires: libboost_test-devel
%else
BuildRequires: boost-devel >= 1.39.0
%endif
@@ -45,11 +47,11 @@
#for hdf5
BuildRequires: zlib-devel
BuildRequires: txt2tags
-BuildRequires: pkgconfig(libvotca_tools) = %{version}
+BuildRequires: votca-tools-devel = %{version}
#exact same version is needed
Requires: %{name}-common = %{version}
-Requires: libvotca_csg4 = %{version}
+Requires: libvotca_csg%sover = %{version}
%description
Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
@@ -58,11 +60,11 @@
This package contains the Coarse Graining Engine of VOTCA.
-%package -n libvotca_csg4
+%package -n libvotca_csg%sover
Summary: Libraries for the VOTCA coarse graining engine
Group: System/Libraries
-%description -n libvotca_csg4
+%description -n libvotca_csg%sover
Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
a package to reduce the amount of routine work when doing systematic
coarse-graining of various systems. The core is written in C++.
@@ -72,7 +74,7 @@
%package devel
Summary: Development headers and libraries for the VOTCA Coarse Graining Engine
Group: Development/Libraries/C and C++
-Requires: libvotca_csg4 = %{version}
+Requires: libvotca_csg%sover = %{version}
Requires: votca-tools-devel = %{version}
Requires: %{name} = %{version}
@@ -110,7 +112,7 @@
%package doc
Summary: Manual for VOTCA Coarse Graining Engine
-Group: Documentation/PDF
+Group: Documentation/Other
BuildArch: noarch
%description doc
@@ -143,14 +145,15 @@
tar -xzf %{S:1}
%build
-%{cmake} -DWITH_RC_FILES=OFF -DCMAKE_SKIP_RPATH:BOOL=OFF -DLIB=%{_lib} -DWITH_H5MD=ON -DWITH_GMX=ON
+%{cmake} -DWITH_RC_FILES=OFF -DCMAKE_SKIP_RPATH:BOOL=OFF -DWITH_H5MD=ON -DWITH_GMX=ON -DENABLE_TESTING=ON -DREGRESSIONTEST_TOLERANCE="2e-5"
make %{?_smp_mflags}
%install
make -C build install DESTDIR=%{buildroot}
+sed -i '1s@env @@' %{buildroot}/%{_datadir}/votca/scripts/inverse/*.py
# Move bash completion file to correct location
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
-cp scripts/csg-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/votca
+mkdir -p %{buildroot}%{_datadir}/bash_completion.d
+cp scripts/csg-completion.bash %{buildroot}%{_datadir}/bash_completion.d/votca
%define pkgdocdir %{_docdir}/%{name}
mkdir -p %{buildroot}%{pkgdocdir}
@@ -160,8 +163,15 @@
cp -r csg-tutorials-%{uversion}/* %{buildroot}%{pkgdocdir}/examples
%fdupes %{buildroot}%{_prefix}
-%post -n libvotca_csg4 -p /sbin/ldconfig
-%postun -n libvotca_csg4 -p /sbin/ldconfig
+#check
+# https://github.com/votca/csg/issues/313
+%ifarch i586
+%global testargs ARGS='-E Compare_csg_fmatch_3body_output1'
+%endif
+make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs:%{testargs}}
+
+%post -n libvotca_csg%sover -p /sbin/ldconfig
+%postun -n libvotca_csg%sover -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
@@ -183,7 +193,7 @@
%defattr(-,root,root,-)
%{_datadir}/votca
-%files -n libvotca_csg4
+%files -n libvotca_csg%sover
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/libvotca_csg.so.*
@@ -197,6 +207,7 @@
%files bash
%defattr(-,root,root,-)
-%config %{_sysconfdir}/bash_completion.d/votca
+%dir %{_datadir}/bash_completion.d
+%{_datadir}/bash_completion.d/votca
%changelog
++++++ votca-csg-1.4.1.tar.gz -> votca-csg-1.5.tar.gz ++++++
++++ 21118 lines of diff (skipped)
++++++ votca-csg-manual-1.4.1.pdf -> votca-csg-manual-1.5.pdf ++++++
(binary differes)
++++++ votca-csg-tutorials-1.4.1.tar.gz -> votca-csg-tutorials-1.5.tar.gz ++++++
/work/SRC/openSUSE:Factory/votca-csg/votca-csg-tutorials-1.4.1.tar.gz /work/SRC/openSUSE:Factory/.votca-csg.new.28833/votca-csg-tutorials-1.5.tar.gz differ: char 12, line 1
1
0
Hello community,
here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2019-02-28 21:38:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-tools (Old)
and /work/SRC/openSUSE:Factory/.votca-tools.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-tools"
Thu Feb 28 21:38:18 2019 rev:10 rq:670458 version:1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2017-09-04 12:39:13.634991647 +0200
+++ /work/SRC/openSUSE:Factory/.votca-tools.new.28833/votca-tools.changes 2019-02-28 21:38:23.565640386 +0100
@@ -1,0 +2,10 @@
+Thu Jan 31 16:34:20 UTC 2019 - Christoph Junghans <junghans(a)votca.org>
+
+- Upgrade to 1.5
+ * histogramnew: refactor to fix memory lead
+ * added unit testing
+ * Eigen added as a dependency
+ * removed GSL dependency
+ * details: https://github.com/votca/tools/blob/master/CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
votca-tools-1.4.1.tar.gz
New:
----
votca-tools-1.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-tools.spec ++++++
--- /var/tmp/diff_new_pack.SmsXmI/_old 2019-02-28 21:38:24.089640221 +0100
+++ /var/tmp/diff_new_pack.SmsXmI/_new 2019-02-28 21:38:24.097640218 +0100
@@ -2,7 +2,7 @@
# spec file for package votca-tools
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2013-2017 Christoph Junghans
+# Copyright (c) 2013-2019 Christoph Junghans
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,8 +21,9 @@
#
Name: votca-tools
-Version: 1.4.1
-%define uversion 1.4.1
+Version: 1.5
+%define uversion %{version}
+%define sover 5
Release: 0
Summary: VOTCA tools library
Group: Productivity/Scientific/Chemistry
@@ -37,10 +38,11 @@
BuildRequires: libexpat-devel
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(fftw3)
-BuildRequires: pkgconfig(gsl)
+BuildRequires: eigen3-devel
%if 0%{?suse_version} > 1325
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_program_options-devel
+BuildRequires: libboost_test-devel
%else
BuildRequires: boost-devel >= 1.39.0
%endif
@@ -52,11 +54,11 @@
a package to reduce the amount of routine work when doing systematic
coarse-graining of various systems. The core is written in C++.
-%package -n libvotca_tools4
+%package -n libvotca_tools%sover
Summary: VOTCA tools library
Group: System/Libraries
-%description -n libvotca_tools4
+%description -n libvotca_tools%sover
Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
a package to reduce the amount of routine work when doing systematic
coarse-graining of various systems. The core is written in C++.
@@ -66,7 +68,7 @@
%package devel
Summary: Development headers and libraries for votca-tools
Group: Development/Libraries/C and C++
-Requires: libvotca_tools4 = %{version}
+Requires: libvotca_tools%sover = %{version}
Requires: %{name} = %{version}
%description devel
@@ -85,21 +87,25 @@
sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/libtools/version{,_nb}.cc
%build
-%{cmake} -DWITH_RC_FILES=OFF -DLIB=%{_lib} -DCMAKE_SKIP_RPATH=OFF
+%{cmake} -DWITH_RC_FILES=OFF -DCMAKE_SKIP_RPATH=OFF -DENABLE_TESTING=ON
make %{?_smp_mflags}
%install
make -C build install DESTDIR=%{buildroot}
+sed -i '1s@env @@' %{buildroot}/%{_bindir}/votca_compare
+
+%check
+make -C build test CTEST_OUTPUT_ON_FAILURE=1
%files
%defattr(-,root,root,-)
%{_bindir}/votca_*
%{_mandir}/man1/*
-%post -n libvotca_tools4 -p /sbin/ldconfig
-%postun -n libvotca_tools4 -p /sbin/ldconfig
+%post -n libvotca_tools%sover -p /sbin/ldconfig
+%postun -n libvotca_tools%sover -p /sbin/ldconfig
-%files -n libvotca_tools4
+%files -n libvotca_tools%sover
%defattr(-,root,root,-)
%doc LICENSE NOTICE
%{_libdir}/libvotca_tools.so.*
++++++ votca-tools-1.4.1.tar.gz -> votca-tools-1.5.tar.gz ++++++
++++ 15578 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package airspyhf for openSUSE:Factory checked in at 2019-02-28 21:38:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/airspyhf (Old)
and /work/SRC/openSUSE:Factory/.airspyhf.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "airspyhf"
Thu Feb 28 21:38:16 2019 rev:3 rq:669030 version:1.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/airspyhf/airspyhf.changes 2018-02-26 23:25:13.950160317 +0100
+++ /work/SRC/openSUSE:Factory/.airspyhf.new.28833/airspyhf.changes 2019-02-28 21:38:18.849641870 +0100
@@ -1,0 +2,14 @@
+Sun Jan 27 22:57:09 UTC 2019 - Wojciech Kazubski <wk(a)ire.pw.edu.pl>
+
+- fix build for Leap 42.3
+
+-------------------------------------------------------------------
+Sat Jan 19 13:23:28 UTC 2019 - mardnh(a)gmx.de
+
+- Update to version 1.1.5
+ * Fixed the Linux build
+ * Updated the IQ correction algorithm;
+ * Updated the version number and copyright dates
+ * Better handling of weak signals in the IQ correction algorithm.
+
+-------------------------------------------------------------------
Old:
----
_service
_servicedata
airspyhf-1.1.0+git.20180217.tar.xz
New:
----
airspyhf-1.1.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ airspyhf.spec ++++++
--- /var/tmp/diff_new_pack.LRHdVk/_old 2019-02-28 21:38:19.333641718 +0100
+++ /var/tmp/diff_new_pack.LRHdVk/_new 2019-02-28 21:38:19.337641716 +0100
@@ -1,7 +1,7 @@
#
# spec file for package airspyhf
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -21,14 +21,14 @@
%define airspyhf_group airspyhf
%define libname lib%{name}%{sover}
Name: airspyhf
-Version: 1.1.0+git.20180217
+Version: 1.1.5
Release: 0
Summary: Support programs for Airspy HF+ SDR
License: BSD-3-Clause
Group: Productivity/Hamradio/Other
Url: http://www.airspy.com/airspy-hf-plus
#Git-Clone: https://github.com/airspy/airspyhf.git
-Source: %{name}-%{version}.tar.xz
+Source: https://github.com/airspy/%{name}/archive/%{version}.tar.gz#/%{name}-%{vers…
Patch0: airspyhf-fix-libm-linking.patch
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -73,6 +73,9 @@
%build
%cmake \
+%if 0%{?suse_version} < 1330
+ -DCMAKE_C_FLAGS=-std=c99 \
+%endif
-DINSTALL_UDEV_RULES=ON
make %{?_smp_mflags}
1
0
Hello community,
here is the log from the commit of package dumpvdl2 for openSUSE:Factory checked in at 2019-02-28 21:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dumpvdl2 (Old)
and /work/SRC/openSUSE:Factory/.dumpvdl2.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dumpvdl2"
Thu Feb 28 21:38:12 2019 rev:8 rq:667641 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/dumpvdl2/dumpvdl2.changes 2018-11-19 23:33:07.623112096 +0100
+++ /work/SRC/openSUSE:Factory/.dumpvdl2.new.28833/dumpvdl2.changes 2019-02-28 21:38:12.861643753 +0100
@@ -1,0 +2,15 @@
+Fri Jan 18 23:54:00 UTC 2019 - mardnh(a)gmx.de
+
+- Update to version 1.6.0
+ * New build system based on cmake.
+ * FANS/1-A CPDLC, ADS-C and ACARS decoders have been removed.
+ These features have been moved to libacars library, which is
+ now a mandatory dependency
+ * Added support for SoapySDR library. However there are still
+ some limitations with respect to SDR types which dumpvdl2
+ can work with. As of now, the device must support a sampling
+ rate of 2100000 samples per second. This will be addressed in
+ a future release.
+ * Minor bugfixes
+
+-------------------------------------------------------------------
Old:
----
dumpvdl2-1.5.0.tar.xz
New:
----
dumpvdl2-1.6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dumpvdl2.spec ++++++
--- /var/tmp/diff_new_pack.8IGYNh/_old 2019-02-28 21:38:13.425643576 +0100
+++ /var/tmp/diff_new_pack.8IGYNh/_new 2019-02-28 21:38:13.425643576 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dumpvdl2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: dumpvdl2
-Version: 1.5.0
+Version: 1.6.0
Release: 0
Summary: A VDL Mode 2 message decoder and protocol analyzer
License: GPL-3.0-only
@@ -26,8 +26,11 @@
URL: https://github.com/szpajder/dumpvdl2
#Git-Clone: https://github.com/szpajder/dumpvdl2.git
Source: https://github.com/szpajder/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v…
+BuildRequires: cmake
BuildRequires: pkgconfig
+BuildRequires: pkgconfig(SoapySDR)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libacars)
BuildRequires: pkgconfig(librtlsdr)
%description
@@ -49,15 +52,20 @@
%setup -q
%build
-export CFLAGS='%{optflags}'
-make %{?_smp_mflags}
+%cmake \
+ -DRTLSDR=ON \
+ -DSOAPYSDR=ON \
+ -DMIRISDR=OFF \
+ -DSDRPLAY=OFF \
+ -DETSY_STATSD=OFF
+%make_jobs
%install
-install -Dpm 0755 dumpvdl2 %{buildroot}/%{_bindir}/dumpvdl2
+%cmake_install
%files
%license LICENSE
-%doc FILTERING_EXAMPLES.md README.md
+%doc README.md
%{_bindir}/dumpvdl2
%changelog
++++++ dumpvdl2-1.5.0.tar.xz -> dumpvdl2-1.6.0.tar.xz ++++++
1
0
Hello community,
here is the log from the commit of package createrepo_c for openSUSE:Factory checked in at 2019-02-28 21:37:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/createrepo_c (Old)
and /work/SRC/openSUSE:Factory/.createrepo_c.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "createrepo_c"
Thu Feb 28 21:37:57 2019 rev:7 rq:679785 version:0.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/createrepo_c/createrepo_c.changes 2018-04-06 17:46:44.877557992 +0200
+++ /work/SRC/openSUSE:Factory/.createrepo_c.new.28833/createrepo_c.changes 2019-02-28 21:37:58.957648126 +0100
@@ -2 +2,35 @@
-Thu Apr 5 15:50:28 UTC 2018 - adrian(a)suse.de
+Mon Feb 4 12:09:27 UTC 2019 - Neal Gompa <ngompa13(a)gmail.com>
+
+- Backport fixes from upstream
+ * 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
+ * 0002-Add-missing-sentinal.patch
+ * 0003-Fix-misc-test.patch
+
+-------------------------------------------------------------------
+Mon Feb 4 00:01:56 UTC 2019 - Neal Gompa <ngompa13(a)gmail.com>
+
+- Update to 0.12.0
+ + Add basic support for zchunk metadata
+ + Add support for building wheels to upload to PyPI
+- Drop Python 2 subpackage
+- Enable drpm support
+- Enable zchunk for openSUSE Leap 15.1+ and Tumbleweed
+- Adjust changes entries to use full author identities
+
+-------------------------------------------------------------------
+Wed Aug 1 12:06:35 UTC 2018 - Neal Gompa <ngompa13(a)gmail.com>
+
+- Update to 0.11.1
+ + Add support for RPMs with large files
+ + Identify Requires(missingok) as Recommends correctly
+ + Enable legacy tags by default
+ + Fix missing packages in mergerepo_c with multiple VR of same name
+ + Add mergerepo_c --repo-prefix-search and --repo-prefix-replace
+ + Build against Python 3 by default for bindings
+- Drop snapshot source service and snapshot tarball
+- Use license macro for license file
+- Drop trailing whitespace
+- Fix comment about drpm support
+
+-------------------------------------------------------------------
+Thu Apr 5 15:50:28 UTC 2018 - Adrian Schröter <adrian(a)suse.de>
@@ -7 +41 @@
-Wed Feb 21 15:58:06 UTC 2018 - FSchreiner(a)suse.com
+Wed Feb 21 15:58:06 UTC 2018 - Frank Schreiner <FSchreiner(a)suse.com>
@@ -15 +49 @@
-Tue Feb 13 11:53:58 UTC 2018 - tchvatal(a)suse.com
+Tue Feb 13 11:53:58 UTC 2018 - Tomáš Chvátal <tchvatal(a)suse.com>
@@ -20 +54 @@
-Mon Jan 22 11:58:46 UTC 2018 - tchvatal(a)suse.com
+Mon Jan 22 11:58:46 UTC 2018 - Tomáš Chvátal <tchvatal(a)suse.com>
@@ -29 +63 @@
-Sun Feb 19 12:57:21 UTC 2017 - ngompa13(a)gmail.com
+Sun Feb 19 12:57:21 UTC 2017 - Neal Gompa <ngompa13(a)gmail.com>
@@ -34 +68 @@
-Sun Feb 19 02:27:30 UTC 2017 - ngompa13(a)gmail.com
+Sun Feb 19 02:27:30 UTC 2017 - Neal Gompa <ngompa13(a)gmail.com>
@@ -39 +73 @@
-Wed Feb 8 17:42:57 UTC 2017 - ngompa13(a)gmail.com
+Wed Feb 8 17:42:57 UTC 2017 - Neal Gompa <ngompa13(a)gmail.com>
@@ -48 +82 @@
-Mon Oct 31 13:19:23 UTC 2016 - fschreiner(a)suse.com
+Mon Oct 31 13:19:23 UTC 2016 - Frank Schreiner <FSchreiner(a)suse.com>
@@ -54 +88 @@
-Tue Jul 5 11:03:23 UTC 2016 - jengelh(a)inai.de
+Tue Jul 5 11:03:23 UTC 2016 - Jan Engelhardt <jengelh(a)inai.de>
@@ -59 +93 @@
-Mon Feb 1 04:49:43 UTC 2016 - ngompa13(a)gmail.com
+Mon Feb 1 04:49:43 UTC 2016 - Neal Gompa <ngompa13(a)gmail.com>
@@ -64 +98 @@
-Mon Feb 1 04:40:40 UTC 2016 - ngompa13(a)gmail.com
+Mon Feb 1 04:40:40 UTC 2016 - Neal Gompa <ngompa13(a)gmail.com>
@@ -69 +103 @@
-Thu Oct 29 14:48:00 UTC 2015 - ngompa13(a)gmail.com
+Thu Oct 29 14:48:00 UTC 2015 - Neal Gompa <ngompa13(a)gmail.com>
Old:
----
_service
createrepo_c-0.10.0.git20170131.04828e6.tar.gz
New:
----
0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
0002-Add-missing-sentinal.patch
0003-Fix-misc-test.patch
createrepo_c-0.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ createrepo_c.spec ++++++
--- /var/tmp/diff_new_pack.7MFn5k/_old 2019-02-28 21:37:59.669647902 +0100
+++ /var/tmp/diff_new_pack.7MFn5k/_new 2019-02-28 21:37:59.673647901 +0100
@@ -1,8 +1,8 @@
#
# spec file for package createrepo_c
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2015-2017 Neal Gompa <ngompa13(a)gmail.com>.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 Neal Gompa <ngompa13(a)gmail.com>.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,46 +13,56 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# Enable Python and tests selectively
%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330
%bcond_without python3
%bcond_without tests
%else
-%define skip_python3 1
%bcond_with tests
%bcond_with python3
%endif
+
+%if ( 0%{?sle_version} || 0%{?suse_version} )
+# Disabled DeltaRPM support for SUSE
+%bcond_with drpm
+%else
+# Enable enhanced DeltaRPM support
+%bcond_without drpm
+%endif
+
+%if (0%{?is_opensuse} && 0%{?sle_version} >= 150100) || 0%{?suse_version} >= 1550
+%bcond_without zchunk
+%endif
+
+%{!?make_build: %global make_build %{__make} %{?_smp_mflags}}
+
%define major 0
%define libname lib%{name}%{major}
%define devname lib%{name}-devel
-%define version_unconverted 0.10.0.git20170131.04828e6
-# prevent provides from nonstandard paths:
-%global __provides_exclude ^(%{python_sitearch}/.*\\.so\\|%{python3_sitearch}/.*\\.so)$
-# Enable Python bindings selectively
-%bcond_without python2
-# Enable enhanced DeltaRPM support
-%bcond_with drpm
+
Name: createrepo_c
-Version: 0.10.0.git20170131.04828e6
+Version: 0.12.0
Release: 0
Summary: Creates a common metadata repository
License: GPL-2.0-or-later
Group: System/Packages
-Url: https://github.com/rpm-software-management/createrepo_c
-Source0: %{name}-%{version}.tar.gz
-%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330
-BuildRequires: %{python_module devel}
-%else
-%if %{with python2}
-BuildRequires: python-devel
-%endif
+URL: https://github.com/rpm-software-management/createrepo_c
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+# Backports from upstream
+Patch0001: 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
+Patch0002: 0002-Add-missing-sentinal.patch
+Patch0003: 0003-Fix-misc-test.patch
+
%if %{with python3}
BuildRequires: python3-devel
%endif
+%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330
+BuildRequires: python-rpm-macros
%endif
BuildRequires: bash-completion
BuildRequires: cmake
@@ -66,15 +76,16 @@
BuildRequires: libxml2-devel
BuildRequires: lzma-devel
BuildRequires: openssl-devel
-%if 0%{?is_opensuse} || 0%{?suse_version} >= 1330
-BuildRequires: python-rpm-macros
-%endif
BuildRequires: rpm-devel >= 4.9.0
BuildRequires: sqlite3-devel
BuildRequires: zlib-devel
-Requires: %{libname} = %{version}-%{release}
+%if %{with zchunk}
+BuildRequires: zchunk
+BuildRequires: zchunk-devel >= 0.9.11
+%endif
+Requires: %{libname}%{?_isa} = %{version}-%{release}
%if %{with tests}
-BuildRequires: %{python_module nose}
+BuildRequires: python3-nose
%endif
%if 0%{?suse_version} >= 1330
BuildRequires: bash-completion-devel
@@ -91,7 +102,7 @@
Provides: createrepo-implementation
# prevent provides from nonstandard paths:
-%global __provides_exclude ^(%{python_sitearch}/.*\\.so\\|%{python3_sitearch}/.*\\.so)$
+%global __provides_exclude ^(%{python3_sitearch}/.*\\.so)$
%description
C implementation of Createrepo.
@@ -113,7 +124,7 @@
%package -n %{devname}
Summary: Library for repodata manipulation
Group: Development/Libraries/C and C++
-Requires: %{libname} = %{version}-%{release}
+Requires: %{libname}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Provides: %{name}-devel = %{version}-%{release}
@@ -121,65 +132,42 @@
This package contains the createrepo_c C library and header files.
These development files are for easy manipulation with a repodata.
-%package -n python2-%{name}
-Summary: Python 2 bindings for the createrepo_c library
-Group: Development/Libraries/Python
-Requires: %{libname} = %{version}-%{release}
-Provides: python-%{name} = %{version}-%{release}
-
-%description -n python2-createrepo_c
-The python 2 bindings for the createrepo_c library.
-
%package -n python3-%{name}
Summary: Python 3 bindings for the createrepo_c library
Group: Development/Libraries/Python
-Requires: %{libname} = %{version}-%{release}
+Requires: %{libname}%{?_isa} = %{version}-%{release}
+# Python 2 subpackage is fully dropped
+Obsoletes: python2-%{name} < 0.12.0
-%description -n python3-createrepo_c
-The python 3 bindings for the createrepo_c library.
+%description -n python3-%{name}
+The Python 3 bindings for the createrepo_c library.
%prep
-%setup -q
+%autosetup -p1
+
# do not hardcode date in the docs
sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in
%build
%define __builddir build
%cmake \
- -DENABLE_LEGACY_WEAKDEPS=1 \
- %{!?with_drpm:-DENABLE_DRPM=OFF} \
- %{!?with_python2:-DENABLE_PYTHON=OFF}
-make %{?_smp_mflags}
-make %{?_smp_mflags} doc-c
-
-%if %{with python3}
-cd ..
-%define __builddir build-py3
-%cmake \
- -DENABLE_LEGACY_WEAKDEPS=1 \
+ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} \
%{!?with_drpm:-DENABLE_DRPM=OFF} \
%{!?with_python3:-DENABLE_PYTHON=OFF} \
-DPYTHON_DESIRED:str=3
-make %{?_smp_mflags}
-%endif
-%check
+%make_build
+%make_build doc-c
+
%if %{with tests}
+%check
%define __builddir build
%ctest
-%if %{with python3}
-%define __builddir build-py3
-%ctest
-%endif
%endif
%install
%define __builddir build
%cmake_install
-%if %{with python3}
-%define __builddir build-py3
-%cmake_install
-%endif
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
for i in createrepo mergerepo modifyrepo sqliterepo;do
@@ -204,7 +192,7 @@
--slave %{_mandir}/man8/sqliterepo.8.gz sqliterepo.8.gz %{_mandir}/man8/sqliterepo_c.8.gz
%postun
-if [ ! -f %{_bindir}/createrepo_c ];then
+if [ ! -f %{_bindir}/createrepo_c ]; then
update-alternatives --remove createrepo %{_bindir}/createrepo_c
fi
@@ -212,8 +200,8 @@
%postun -n %{libname} -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc README.md COPYING
+%doc README.md
+%license COPYING
%{_mandir}/man8/createrepo_c.8*
%{_mandir}/man8/mergerepo_c.8*
%{_mandir}/man8/modifyrepo_c.8*
@@ -241,29 +229,20 @@
%ghost %_sysconfdir/alternatives/sqliterepo.8.gz
%files -n %{libname}
-%defattr(-,root,root)
-%doc COPYING
+%license COPYING
%{_libdir}/libcreaterepo_c.so.%{major}
%{_libdir}/libcreaterepo_c.so.%{major}.*
%files -n %{devname}
-%defattr(-,root,root)
-%doc build/doc/html COPYING
+%doc build/doc/html
+%license COPYING
%{_libdir}/libcreaterepo_c.so
%{_libdir}/pkgconfig/createrepo_c.pc
%{_includedir}/createrepo_c/
-%if %{with python2}
-%files -n python2-%{name}
-%defattr(-,root,root)
-%doc COPYING
-%{python_sitearch}/createrepo_c/
-%endif
-
%if %{with python3}
%files -n python3-%{name}
-%defattr(-,root,root)
-%doc COPYING
+%license COPYING
%{python3_sitearch}/createrepo_c/
%endif
++++++ 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch ++++++
>From 19af36bcd4984359509deb95e2df83449ce471f6 Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Sun, 6 Jan 2019 19:21:04 +0000
Subject: [PATCH 1/3] zck_end_chunk returns number of bytes written or -1 for
error
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
src/compression_wrapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
index 43f213c..e5b58d2 100644
--- a/src/compression_wrapper.c
+++ b/src/compression_wrapper.c
@@ -880,7 +880,7 @@ cr_close(CR_FILE *cr_file, GError **err)
zckCtx *zck = (zckCtx *) cr_file->FILE;
ret = CRE_OK;
if (cr_file->mode == CR_CW_MODE_WRITE) {
- if(!zck_end_chunk(zck)) {
+ if(zck_end_chunk(zck) < 0) {
ret = CRE_ZCK;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unable to end final chunk: %s", zck_get_error(zck));
--
2.20.1
++++++ 0002-Add-missing-sentinal.patch ++++++
>From 2eb66187dd8ab5840b4c82c18e817d04caa258ca Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Tue, 15 Jan 2019 23:23:47 +0000
Subject: [PATCH 2/3] Add missing sentinal
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
src/misc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc.c b/src/misc.c
index ec8667b..288b0eb 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1519,7 +1519,7 @@ cr_get_dict_file(const gchar *dir, const gchar *file)
assert(dict_file);
snprintf(dict_file, strlen(file) + 7, "%s.zdict", file);
- gchar *full_path = g_build_path("/", dir, dict_file);
+ gchar *full_path = g_build_path("/", dir, dict_file, NULL);
assert(full_path);
free(dict_file);
--
2.20.1
++++++ 0003-Fix-misc-test.patch ++++++
>From ccd8f0ec32b9ca82a727b35fcc8724ea6f6d3556 Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter(a)gmail.com>
Date: Tue, 15 Jan 2019 23:23:58 +0000
Subject: [PATCH 3/3] Fix misc test
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
---
tests/test_misc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/test_misc.c b/tests/test_misc.c
index 9d528c7..06144a6 100644
--- a/tests/test_misc.c
+++ b/tests/test_misc.c
@@ -531,8 +531,8 @@ compressfile_test_text_file(Copyfiletest *copyfiletest,
GError *tmp_err = NULL;
g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
- ret = cr_compress_file(TEST_TEXT_FILE, copyfiletest->dst_file,
- CR_CW_GZ_COMPRESSION, &tmp_err);
+ ret = cr_compress_file(TEST_TEXT_FILE, &(copyfiletest->dst_file),
+ CR_CW_GZ_COMPRESSION, NULL, FALSE, &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
@@ -556,8 +556,9 @@ compressfile_with_stat_test_text_file(Copyfiletest *copyfiletest,
g_assert(!tmp_err);
g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
- ret = cr_compress_file_with_stat(TEST_TEXT_FILE, copyfiletest->dst_file,
- CR_CW_GZ_COMPRESSION, stat, &tmp_err);
+ ret = cr_compress_file_with_stat(TEST_TEXT_FILE, ©filetest->dst_file,
+ CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
--
2.20.1
++++++ createrepo_c-0.10.0.git20170131.04828e6.tar.gz -> createrepo_c-0.12.0.tar.gz ++++++
++++ 4319 lines of diff (skipped)
1
0