Architecture specific change in rpms/prelude-correlator.git
by githook-noreply@fedoraproject.org
The package rpms/prelude-correlator.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prelude-correlator.git/commit/?id....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit e6138ce1418050a7a5125aeb2f7687cb68aa28e4
Author: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: Wed Oct 4 13:08:25 2017 +0200
Bump version 4.0.0
diff --git a/.gitignore b/.gitignore
index e268ce6..8a4efdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/prelude-correlator-3.1.0.tar.gz
+/prelude-correlator-4.0.0.tar.gz
diff --git a/prelude-correlator-3.1.0-python3.patch b/prelude-correlator-3.1.0-python3.patch
deleted file mode 100644
index 82c60f4..0000000
--- a/prelude-correlator-3.1.0-python3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./preludecorrelator/main.py 2017-02-07 23:09:18.547675528 +0100
-+++ ./preludecorrelator/main.py 2017-02-07 23:09:36.469276080 +0100
-@@ -39,7 +39,7 @@
- filename = require.get_data_filename("context.dat", profile=profile)
-
- try:
-- os.makedirs(os.path.dirname(filename), mode=0700)
-+ os.makedirs(os.path.dirname(filename), mode=0o700)
- except OSError as e:
- if e.errno != errno.EEXIST:
- raise
---- ./preludecorrelator/pluginmanager.py 2016-09-15 08:49:24.000000000 +0200
-+++ ./preludecorrelator/pluginmanager.py 2017-02-07 23:13:00.590726517 +0100
-@@ -160,19 +160,19 @@
- logger.exception("[%s]: loading error: %s", entrypoint.name, e)
- return None
-
-- def _load_userpoint(self, (name, path)):
-+ def _load_userpoint(self, elm):
- try:
-- mod_info = imp.find_module(name, [path])
-+ mod_info = imp.find_module(elm[0], [elm[1]])
-
- except ImportError:
-- logger.warning( 'Invalid plugin "%s" in "%s"' % (name, path) )
-+ logger.warning( 'Invalid plugin "%s" in "%s"' % (elm[0], elm[1]) )
- return None
-
- try:
-- return getattr(imp.load_module( self._default_entrypoint + '.' + name , *mod_info), name)
-+ return getattr(imp.load_module( self._default_entrypoint + '.' + elm[0] , *mod_info), elm[0])
-
-- except Exception, e:
-- logger.warning( "Unable to load %(file)s: %(error)s" % {'file': name,'error': str(e),})
-+ except Exception as e:
-+ logger.warning( "Unable to load %(file)s: %(error)s" % {'file': elm[0],'error': str(e),})
- return None
-
- def getPluginCount(self):
---- ./preludecorrelator/config.py 2016-09-15 08:49:24.000000000 +0200
-+++ ./preludecorrelator/config.py 2017-02-08 07:45:06.207967658 +0100
-@@ -46,7 +46,10 @@
-
- self.read(dataset)
-
-- def get(self, section, option, raw=None, vars=None, default=None, type=str):
-+ def get(self, section, option, raw=None, vars=None, default=None, type=str, fallback=None):
-+ if default is None:
-+ default = fallback
-+
- try:
- return type(configparser.ConfigParser.get(self, section, option, raw=raw, vars=vars))
-
---- ./preludecorrelator/context.py 2016-09-15 08:49:24.000000000 +0200
-+++ ./preludecorrelator/context.py 2017-02-08 08:20:02.039908560 +0100
-@@ -362,7 +362,7 @@
-
- try:
- _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
-- except EOFError:
-+ except:
- return
-
- logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))
diff --git a/prelude-correlator.spec b/prelude-correlator.spec
index 9362eaf..d72509c 100644
--- a/prelude-correlator.spec
+++ b/prelude-correlator.spec
@@ -1,14 +1,11 @@
Name: prelude-correlator
-Version: 3.1.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Real time correlator of events received by Prelude Manager
License: GPLv2+
URL: https://www.prelude-siem.org/
-Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
-# https://www.prelude-siem.org/issues/876
-Patch0: prelude-correlator-3.1.0-python3.patch
-
BuildRequires: systemd
BuildRequires: pkgconfig(libprelude) >= %{version}
BuildRequires: python2-setuptools
@@ -19,11 +16,6 @@ BuildRequires: python3-devel
%{?systemd_requires}
Requires: python3-%{name} >= %{version}
-# Cannot build as noarch until libprelude is ported.
-# Comment out BuildArch: noarch for now.
-# BuildArch: noarch
-ExclusiveArch: %{ix86} x86_64
-
# Since mass rebuild, debugpackage wont works for prelude-correlator
%define debug_package %{nil}
@@ -40,7 +32,7 @@ correlation rules.
Summary: Real time correlator of events received by Prelude Manager
Requires: %{name} = %{version}-%{release}
Requires: python2-prelude >= %{version}
-Requires: python-netaddr
+Requires: python2-netaddr
%{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}
@@ -128,6 +120,9 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%{python3_sitelib}/prelude_correlator-%{version}-py%{python3_version}.egg-info
%changelog
+* Wed Oct 4 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
* Thu Aug 10 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 3.1.0-4
- Temporary disable debugsource since Mass rebuild
diff --git a/sources b/sources
index a016d10..21056bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (prelude-correlator-3.1.0.tar.gz) = f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79
+SHA512 (prelude-correlator-4.0.0.tar.gz) = aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
6 years, 7 months
Architecture specific change in rpms/scipy.git
by githook-noreply@fedoraproject.org
The package rpms/scipy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/scipy.git/commit/?id=dc61a2567a10....
Change:
+%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit dc61a2567a1026b1dd0652d6632821e12da736e0
Author: Christian Dersch <lupinix(a)mailbox.org>
Date: Wed Oct 4 12:57:40 2017 +0200
Use openblas where available, to use same as numpy (BZ 1472318)
diff --git a/scipy.spec b/scipy.spec
index de428f2..a95afb5 100644
--- a/scipy.spec
+++ b/scipy.spec
@@ -11,7 +11,7 @@
Summary: Scientific Tools for Python
Name: scipy
Version: 0.19.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Development/Libraries
# BSD -- whole package except:
@@ -23,7 +23,11 @@ Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%
BuildRequires: numpy, python2-devel,f2py
BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel
+%else
BuildRequires: atlas-devel
+%endif
BuildRequires: gcc-gfortran, swig
BuildRequires: qhull-devel
@@ -105,14 +109,24 @@ EOF
%if 0%{?with_python3}
env CFLAGS="$RPM_OPT_FLAGS" \
FFLAGS="$RPM_OPT_FLAGS -fPIC" \
- ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
+%ifarch %{openblas_arches}
+ OPENBLAS=%{_libdir}/openblas \
+%else
+ ATLAS=%{_libdir}/atlas \
+%endif
+ FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
%__python3 setup.py config_fc \
--fcompiler=gnu95 --noarch build
%endif # with _python3
env CFLAGS="$RPM_OPT_FLAGS" \
FFLAGS="$RPM_OPT_FLAGS -fPIC" \
- ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
+%ifarch %{openblas_arches}
+ OPENBLAS=%{_libdir}/openblas \
+%else
+ ATLAS=%{_libdir}/atlas \
+%endif
+ FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
%__python2 setup.py config_fc \
--fcompiler=gnu95 --noarch build
@@ -123,13 +137,23 @@ env CFLAGS="$RPM_OPT_FLAGS" \
%if 0%{?with_python3}
env CFLAGS="$RPM_OPT_FLAGS" \
FFLAGS="$RPM_OPT_FLAGS -fPIC" \
- ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
+%ifarch %{openblas_arches}
+ OPENBLAS=%{_libdir}/openblas \
+%else
+ ATLAS=%{_libdir}/atlas \
+%endif
+ FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
%__python3 setup.py install --root=$RPM_BUILD_ROOT
%endif # with_python3
env CFLAGS="$RPM_OPT_FLAGS" \
FFLAGS="$RPM_OPT_FLAGS -fPIC" \
- ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
+%ifarch %{openblas_arches}
+ OPENBLAS=%{_libdir}/openblas \
+%else
+ ATLAS=%{_libdir}/atlas \
+%endif
+ FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \
%__python2 setup.py install --root=$RPM_BUILD_ROOT
@@ -161,6 +185,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch} \
%endif # with_python3
%changelog
+* Wed Oct 04 2017 Christian Dersch <lupinix(a)mailbox.org> - 0.19.1-5
+- Use openblas where available, to use same as numpy (BZ 1472318)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.19.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 7 months
Architecture specific change in rpms/prelude-manager.git
by githook-noreply@fedoraproject.org
The package rpms/prelude-manager.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prelude-manager.git/commit/?id=2c....
Change:
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
Thanks.
Full change:
============
commit 2cedf608c22f4054cfadf9562c92b0c7798cd9c0
Author: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: Wed Sep 27 00:16:50 2017 +0200
Bump version 4.0.0
diff --git a/.gitignore b/.gitignore
index 6968ead..2adaba4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/prelude-manager-3.1.0.tar.gz
+/prelude-manager-4.0.0.tar.gz
diff --git a/prelude-manager-3.1.0-fix_etc_perms.patch b/prelude-manager-3.1.0-fix_etc_perms.patch
deleted file mode 100644
index b7eaef5..0000000
--- a/prelude-manager-3.1.0-fix_etc_perms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./Makefile.in 2016-09-15 09:02:20.863000884 +0200
-+++ ./Makefile.in 2017-01-30 00:38:41.513780569 +0100
-@@ -1613,12 +1613,12 @@
-
-
- install-data-local:
-- $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
-- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
-- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
-- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(configdir);
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_run_dir);
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_scheduler_dir);
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_failover_dir);
- @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \
-- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
-+ $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
- echo "********************************************************************************"; \
- echo; \
- echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist..."; \
-@@ -1626,7 +1626,7 @@
- echo; \
- echo "********************************************************************************"; \
- else \
-- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \
-+ $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \
- fi
-
- uninstall-local:
diff --git a/prelude-manager-3.1.0-gnutls_priority_init.patch b/prelude-manager-3.1.0-gnutls_priority_init.patch
deleted file mode 100644
index 06c4560..0000000
--- a/prelude-manager-3.1.0-gnutls_priority_init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/manager-auth.c 2016-09-15 08:49:17.621000884 +0200
-+++ ./src/manager-auth.c 2017-01-30 00:34:26.922258220 +0100
-@@ -557,7 +557,7 @@
- int ret;
- const char *errptr;
-
-- ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr);
-+ ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr);
- if ( ret < 0 ) {
- prelude_log(PRELUDE_LOG_ERR, "TLS priority error: %s: '%s'.\n", gnutls_strerror(ret), errptr);
- return -2;
---- ./prelude-manager.conf.in 2016-09-15 08:49:17.620000884 +0200
-+++ ./prelude-manager.conf.in 2017-02-07 01:12:13.221471869 +0100
-@@ -96,8 +96,8 @@
- # Note that much more settings might be enabled or disabled using this
- # option: please see gnutls_priority_init(3) for more details.
- #
--# The default settings is "NORMAL".
--# tls-options = NORMAL
-+# The default settings is "@SYSTEM".
-+# tls-options = @SYSTEM
-
-
- #
diff --git a/prelude-manager-4.0.0-fix_etc_perms.patch b/prelude-manager-4.0.0-fix_etc_perms.patch
new file mode 100644
index 0000000..b7eaef5
--- /dev/null
+++ b/prelude-manager-4.0.0-fix_etc_perms.patch
@@ -0,0 +1,29 @@
+--- ./Makefile.in 2016-09-15 09:02:20.863000884 +0200
++++ ./Makefile.in 2017-01-30 00:38:41.513780569 +0100
+@@ -1613,12 +1613,12 @@
+
+
+ install-data-local:
+- $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
++ $(INSTALL) -d -m 755 $(DESTDIR)$(configdir);
++ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_run_dir);
++ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_scheduler_dir);
++ $(INSTALL) -d -m 755 $(DESTDIR)$(manager_failover_dir);
+ @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \
+- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
++ $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
+ echo "********************************************************************************"; \
+ echo; \
+ echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist..."; \
+@@ -1626,7 +1626,7 @@
+ echo; \
+ echo "********************************************************************************"; \
+ else \
+- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \
++ $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \
+ fi
+
+ uninstall-local:
diff --git a/prelude-manager-4.0.0-gnutls_priority_init.patch b/prelude-manager-4.0.0-gnutls_priority_init.patch
new file mode 100644
index 0000000..06c4560
--- /dev/null
+++ b/prelude-manager-4.0.0-gnutls_priority_init.patch
@@ -0,0 +1,24 @@
+--- ./src/manager-auth.c 2016-09-15 08:49:17.621000884 +0200
++++ ./src/manager-auth.c 2017-01-30 00:34:26.922258220 +0100
+@@ -557,7 +557,7 @@
+ int ret;
+ const char *errptr;
+
+- ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr);
++ ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr);
+ if ( ret < 0 ) {
+ prelude_log(PRELUDE_LOG_ERR, "TLS priority error: %s: '%s'.\n", gnutls_strerror(ret), errptr);
+ return -2;
+--- ./prelude-manager.conf.in 2016-09-15 08:49:17.620000884 +0200
++++ ./prelude-manager.conf.in 2017-02-07 01:12:13.221471869 +0100
+@@ -96,8 +96,8 @@
+ # Note that much more settings might be enabled or disabled using this
+ # option: please see gnutls_priority_init(3) for more details.
+ #
+-# The default settings is "NORMAL".
+-# tls-options = NORMAL
++# The default settings is "@SYSTEM".
++# tls-options = @SYSTEM
+
+
+ #
diff --git a/prelude-manager-tmpfiles.conf b/prelude-manager-tmpfiles.conf
index fba0c79..7e74224 100644
--- a/prelude-manager-tmpfiles.conf
+++ b/prelude-manager-tmpfiles.conf
@@ -1 +1 @@
-d /run/prelude-manager 0750 prelude-manager prelude-manager
+d /run/prelude-manager 0750 root root
diff --git a/prelude-manager.spec b/prelude-manager.spec
index 085a9c2..b1e0414 100644
--- a/prelude-manager.spec
+++ b/prelude-manager.spec
@@ -1,23 +1,22 @@
# Notes about rpmlint
# - crypto-policy-non-compliance-gnutls-{1,2} fixed with patch
-# prelude-manager-3.1.0-gnutls_priority_init.patch
+# prelude-manager-4.0.0-gnutls_priority_init.patch
Name: prelude-manager
-Version: 3.1.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Bus communicator for Prelude modules and other IDMEF agents
# Prelude is GPL-2.0+
# libmissing is LGPL-2.1+
License: GPLv2+
URL: http://www.prelude-siem.org/
-Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}-tmpfiles.conf
# https://www.prelude-siem.org/issues/862
-Patch0: prelude-manager-3.1.0-gnutls_priority_init.patch
+Patch0: prelude-manager-4.0.0-gnutls_priority_init.patch
# https://www.prelude-siem.org/issues/870
-Patch1: prelude-manager-3.1.0-fix_etc_perms.patch
-
+Patch1: prelude-manager-4.0.0-fix_etc_perms.patch
BuildRequires: systemd
BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel
@@ -36,11 +35,9 @@ BuildRequires: valgrind
%endif
# Upstream do not use explicit version of gnulib, just checkout
-# and update files. In libprelude 3.1.0, the checkout has been done
-# on 2016-06-16
-Provides: bundled(gnulib) = 20160616
-
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
+# and update files. In libprelude 4.0.0, the checkout has been done
+# on 2017-01-05
+Provides: bundled(gnulib) = 20170105
%description
Prelude Manager is the main program of the Prelude SIEM suite. It is a
@@ -174,6 +171,9 @@ make check
%doc %{_docdir}/%{name}/smtp/template.example
%changelog
+* Sat Sep 23 2017 Thomas Andrejak <thomas.andrejak(a)gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index aa64c98..c4cc087 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (prelude-manager-3.1.0.tar.gz) = 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
+SHA512 (prelude-manager-4.0.0.tar.gz) = 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
6 years, 7 months
Architecture specific change in rpms/git-annex.git
by githook-noreply@fedoraproject.org
The package rpms/git-annex.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/git-annex.git/commit/?id=345721cc...
https://src.fedoraproject.org/cgit/rpms/git-annex.git/commit/?id=c1e34302....
Change:
-ExclusiveArch: %{ghc_arches_with_ghci}
+ExclusiveArch: %{ghc_arches_with_ghci}
Thanks.
Full change:
============
commit bc7b02932f45f505352d1d1e26145aecf103a837
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Oct 3 01:10:06 2017 -0400
Go back to Setup instead of cabal.
diff --git a/git-annex.spec b/git-annex.spec
index 742c835..aba4a09 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -18,7 +18,6 @@ Patch0: %{name}-default-flags.patch
BuildRequires: bash-completion
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
-BuildRequires: cabal-install
# Begin cabal-rpm deps:
#BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
@@ -159,12 +158,6 @@ cp %SOURCE2 doc/
%build
-# XXX: Use cabal configure instead of ./Setup configure.
-# https://git-annex.branchable.com/bugs/OOM_while_configuring_git-annex/#co...
-%global cabal \
-LANG=en_US.utf8 \
-cabal
-
%ghc_bin_build
LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \
commit 3f6c24eafd1b11568228dd955246ed6749b6baa1
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Oct 3 01:07:13 2017 -0400
Unversion flag patch.
diff --git a/git-annex-6.20170925-flags.patch b/git-annex-6.20170925-flags.patch
deleted file mode 100644
index a95663c..0000000
--- a/git-annex-6.20170925-flags.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- git-annex-6.20170520/git-annex.cabal.orig 2017-06-12 13:56:05.000000000 -0400
-+++ git-annex-6.20170520/git-annex.cabal 2017-07-21 23:00:15.772166262 -0400
-@@ -252,21 +252,27 @@
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: False
-
- Flag Pairing
- Description: Enable pairing
-+ Default: False
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -278,15 +284,19 @@
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: False
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: False
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: False
-
- Flag Benchmark
- Description: Enable benchmarking
-@@ -298,6 +308,7 @@
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- source-repository head
- type: git
diff --git a/git-annex-default-flags.patch b/git-annex-default-flags.patch
new file mode 100644
index 0000000..a95663c
--- /dev/null
+++ b/git-annex-default-flags.patch
@@ -0,0 +1,58 @@
+--- git-annex-6.20170520/git-annex.cabal.orig 2017-06-12 13:56:05.000000000 -0400
++++ git-annex-6.20170520/git-annex.cabal 2017-07-21 23:00:15.772166262 -0400
+@@ -252,21 +252,27 @@
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: False
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: False
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -278,15 +284,19 @@
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: False
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: False
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: False
+
+ Flag Benchmark
+ Description: Enable benchmarking
+@@ -298,6 +308,7 @@
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/git-annex.spec b/git-annex.spec
index c018667..742c835 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -13,7 +13,7 @@ Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
# These are missing from tarball, as it's a bit minimal.
Source1: bash-completion.bash
Source2: index.mdwn
-Patch0: %{name}-%{version}-flags.patch
+Patch0: %{name}-default-flags.patch
BuildRequires: bash-completion
BuildRequires: ghc-Cabal-devel
commit ea97f5e17759269cadb06efbe15a8b814219e601
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Oct 3 01:00:33 2017 -0400
Flatten ChangeLog.
diff --git a/git-annex.spec b/git-annex.spec
index d93e1eb..c018667 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -205,60 +205,31 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%changelog
* Fri Sep 29 2017 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 6.20170925-1
-- Update to latest version.
-- Temporarily disable features requiring new dependencies.
-
-* Sun Jul 23 2017 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 6.20170520-1
-- Update to latest version.
+- Update to 6.20170925.
- Add rsync BuildRequires.
+- Fix documentation packaging.
+- Add and install bash-completion.
-* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20161210-1
-- update to 6.20161210
-
-* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-2
-- spec file partially re-generated by cabal-rpm-0.10.0
-- Enable "s3" and "webdav" flags
-
-* Sat Jun 18 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-1
-- update to 6.20160613
-
-* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-2
-- Fix documentation packaging
-- Add and install bash-completion
-
-* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-1
-- update to 6.20160527
-
-* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-3
-- Properly remove S3 and WebDAV deps
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-2
-- Disable S3 and WebDAV support; deps not ready yet
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-1
-- update to 6.20160511
-- switch back to flag patching, which doesn't confuse cabal-rpm as much
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-* Thu May 05 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-6
-- Enable S3, WebDAV, and Torrent support
+* Mon Jun 20 2016 Jens Petersen <petersen(a)redhat.com> - 5.20140717-12
+- need network-uri
+- patch for ambiguous createPipe in Utility.Process
+- patch for ambiguous defaultTimeLocale
+- disable quvi and tahoe for build with ghc8
-* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-5
-- Enable XMPP support
-
-* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-4
-- Add more BR and enable more flags to enable the assistant
-
-* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-3
-- Correctly enable build flags for MagicMime, Pairing, and Webapp
-
-* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-2
-- Enable MagicMime, Pairing, and Webapp
-
-* Fri Apr 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-1
-- Update to 6.20160419
+* Tue Mar 8 2016 Jens Petersen <petersen(a)redhat.com> - 5.20140717-11
+- rebuild
-* Sun Aug 23 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20150812-1
-- update to 5.20150812
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Aug 08 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20140717-8
- rebuild for ghc-edit-distance and ghc-bloomfilter
commit a8624539f8f5551c944e3054d92b941de75809a1
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun Oct 1 18:16:25 2017 -0400
Add main executable to file list.
diff --git a/git-annex.spec b/git-annex.spec
index b5b6661..d93e1eb 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -189,6 +189,7 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%files
%license COPYRIGHT doc/license/GPL
%doc README CHANGELOG
+%{_bindir}/%{name}
%{_bindir}/%{name}-shell
%{_bindir}/git-remote-tor-annex
%{_mandir}/man1/git-annex*
commit 93f2964db913f9f654723af6af7f5a414347e958
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun Oct 1 16:08:18 2017 -0400
BuildRequire absolute latest ghc-persistent-sqlite.
This is the version that fixes the build error.
diff --git a/git-annex.spec b/git-annex.spec
index 5a235bd..b5b6661 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -71,7 +71,8 @@ BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
BuildRequires: ghc-path-pieces-devel
BuildRequires: ghc-persistent-devel
-BuildRequires: ghc-persistent-sqlite-devel
+# This version fixes a build issue:
+BuildRequires: ghc-persistent-sqlite-devel >= 2.6.2-5
BuildRequires: ghc-persistent-template-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
commit b0a5c0cd67a5530b1fa154207dc2e8a6ccd09629
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Sep 29 23:42:59 2017 -0400
Cleanup some minor spec bits.
diff --git a/git-annex.spec b/git-annex.spec
index eec51d4..5a235bd 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -10,7 +10,7 @@ Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
-# These are missing from tarball, but will be added back.
+# These are missing from tarball, as it's a bit minimal.
Source1: bash-completion.bash
Source2: index.mdwn
Patch0: %{name}-%{version}-flags.patch
@@ -145,7 +145,6 @@ up and use git-annex this way.
%if %{with ikiwiki}
%package docs
Summary: %{summary}
-Group: Documentation
BuildArch: noarch
%description docs
@@ -153,10 +152,9 @@ This package contains the documentation for %{name} in HTML format.
%endif
%prep
-%setup -q -b 0
+%autosetup -p1
cp %SOURCE1 .
cp %SOURCE2 doc/
-%patch0 -p1 -b .flags
%build
@@ -169,14 +167,14 @@ cabal
%ghc_bin_build
LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \
- --plugin=goodstuff \
- --no-usedirs --disable-plugin=openid --plugin=sidebar \
- --underlaydir=/dev/null --set deterministic=1 \
- --disable-plugin=shortcut --disable-plugin=smiley \
- --plugin=comments --set comments_pagespec="*" \
- --exclude='news/.*' --exclude='design/assistant/blog/*' \
- --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \
- --exclude='users/*' --exclude='devblog/*' --exclude='thanks'
+ --plugin=goodstuff \
+ --no-usedirs --disable-plugin=openid --plugin=sidebar \
+ --underlaydir=/dev/null --set deterministic=1 \
+ --disable-plugin=shortcut --disable-plugin=smiley \
+ --plugin=comments --set comments_pagespec="*" \
+ --exclude='news/.*' --exclude='design/assistant/blog/*' \
+ --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \
+ --exclude='users/*' --exclude='devblog/*' --exclude='thanks'
%install
@@ -190,7 +188,6 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%files
%license COPYRIGHT doc/license/GPL
%doc README CHANGELOG
-%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
%{_bindir}/git-remote-tor-annex
%{_mandir}/man1/git-annex*
commit e8d081512ad8a83cb7b84449e04b4adc4981b707
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Sep 29 22:35:07 2017 -0400
Update to 6.20170925.
diff --git a/.gitignore b/.gitignore
index f78d3ae..25ba2e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/git-annex-6.20160613.tar.gz
/git-annex-6.20161210.tar.gz
/git-annex-6.20170520.tar.gz
+/git-annex-6.20170925.tar.gz
diff --git a/bash-completion.bash b/bash-completion.bash
index 11f9ff8..f0c8818 100644
--- a/bash-completion.bash
+++ b/bash-completion.bash
@@ -3,7 +3,8 @@
# commands, all options, and will never go out of date!
_git-annex()
{
- local cmdline
+ local CMDLINE
+ local IFS=$'\n'
CMDLINE=(--bash-completion-index $COMP_CWORD)
for arg in ${COMP_WORDS[@]}; do
diff --git a/git-annex-6.20170520-flags.patch b/git-annex-6.20170520-flags.patch
deleted file mode 100644
index a95663c..0000000
--- a/git-annex-6.20170520-flags.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- git-annex-6.20170520/git-annex.cabal.orig 2017-06-12 13:56:05.000000000 -0400
-+++ git-annex-6.20170520/git-annex.cabal 2017-07-21 23:00:15.772166262 -0400
-@@ -252,21 +252,27 @@
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: False
-
- Flag Pairing
- Description: Enable pairing
-+ Default: False
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -278,15 +284,19 @@
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: False
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: False
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: False
-
- Flag Benchmark
- Description: Enable benchmarking
-@@ -298,6 +308,7 @@
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- source-repository head
- type: git
diff --git a/git-annex-6.20170925-flags.patch b/git-annex-6.20170925-flags.patch
new file mode 100644
index 0000000..a95663c
--- /dev/null
+++ b/git-annex-6.20170925-flags.patch
@@ -0,0 +1,58 @@
+--- git-annex-6.20170520/git-annex.cabal.orig 2017-06-12 13:56:05.000000000 -0400
++++ git-annex-6.20170520/git-annex.cabal 2017-07-21 23:00:15.772166262 -0400
+@@ -252,21 +252,27 @@
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: False
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: False
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -278,15 +284,19 @@
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: False
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: False
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: False
+
+ Flag Benchmark
+ Description: Enable benchmarking
+@@ -298,6 +308,7 @@
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/sources b/sources
index 04e3a76..2136620 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20170520.tar.gz) = 5fad4920d5defa3e750a42a545dab3d6a03417ad58f8c7f0c279d92c65e4a92fee73e2f69aecb15a9864f908ba8d60e4876a0cf1c4c4d902c303c2e95f8c36c4
+SHA512 (git-annex-6.20170925.tar.gz) = 2a298ecf0d784fc09746cfcc3796ad830c95f6a1c527dc8dfa5174a5f88e109631a8c598669970d4b026124e1c113b60141d405bd12319de3578cde49a16686b
commit f5f636e019cecb484743584b4b9b07d01bc8cdcf
Merge: 4fe4b06 8b71de8
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Sep 29 05:37:27 2017 -0400
Merge branch 'new'
diff --cc git-annex.spec
index dadcc68,b65a694..eec51d4
--- a/git-annex.spec
+++ b/git-annex.spec
@@@ -3,8 -3,8 +3,8 @@@
%bcond_without ikiwiki
Name: git-annex
- Version: 5.20140717
- Release: 15%{?dist}
-Version: 6.20170520
++Version: 6.20170925
+ Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@@ -142,26 -205,57 +205,61 @@@ install -m 644 bash-completion.bash $ba
%changelog
- * Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-15
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
++* Fri Sep 29 2017 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 6.20170925-1
++- Update to latest version.
++- Temporarily disable features requiring new dependencies.
++
+ * Sun Jul 23 2017 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 6.20170520-1
+ - Update to latest version.
+ - Add rsync BuildRequires.
+
+ * Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20161210-1
+ - update to 6.20161210
+
+ * Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-2
+ - spec file partially re-generated by cabal-rpm-0.10.0
+ - Enable "s3" and "webdav" flags
+
+ * Sat Jun 18 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-1
+ - update to 6.20160613
+
+ * Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-2
+ - Fix documentation packaging
+ - Add and install bash-completion
+
+ * Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-1
+ - update to 6.20160527
+
+ * Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-3
+ - Properly remove S3 and WebDAV deps
+
+ * Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-2
+ - Disable S3 and WebDAV support; deps not ready yet
+
+ * Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-1
+ - update to 6.20160511
+ - switch back to flag patching, which doesn't confuse cabal-rpm as much
+
+ * Thu May 05 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-6
+ - Enable S3, WebDAV, and Torrent support
+
+ * Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-5
+ - Enable XMPP support
- * Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-14
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+ * Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-4
+ - Add more BR and enable more flags to enable the assistant
- * Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-13
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+ * Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-3
+ - Correctly enable build flags for MagicMime, Pairing, and Webapp
- * Mon Jun 20 2016 Jens Petersen <petersen(a)redhat.com> - 5.20140717-12
- - need network-uri
- - patch for ambiguous createPipe in Utility.Process
- - patch for ambiguous defaultTimeLocale
- - disable quvi and tahoe for build with ghc8
+ * Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-2
+ - Enable MagicMime, Pairing, and Webapp
- * Tue Mar 8 2016 Jens Petersen <petersen(a)redhat.com> - 5.20140717-11
- - rebuild
+ * Fri Apr 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-1
+ - Update to 6.20160419
- * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.20140717-10
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+ * Sun Aug 23 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20150812-1
+ - update to 5.20150812
* Sat Aug 08 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20140717-8
- rebuild for ghc-edit-distance and ghc-bloomfilter
commit 8b71de8cb1c3b64b44d373ba98e9a035bd658764
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Sep 29 05:32:37 2017 -0400
Temporarily disable new functionality.
diff --git a/git-annex-6.20170520-flags.patch b/git-annex-6.20170520-flags.patch
index a7554cb..a95663c 100644
--- a/git-annex-6.20170520-flags.patch
+++ b/git-annex-6.20170520-flags.patch
@@ -4,11 +4,11 @@
Flag S3
Description: Enable S3 support
-+ Default: True
++ Default: False
Flag WebDAV
Description: Enable WebDAV support
-+ Default: True
++ Default: False
Flag Assistant
Description: Enable git-annex assistant and watch command
@@ -16,11 +16,11 @@
Flag Webapp
Description: Enable git-annex webapp
-+ Default: True
++ Default: False
Flag Pairing
Description: Enable pairing
-+ Default: True
++ Default: False
Flag Production
Description: Enable production build (slower build; faster binary)
@@ -36,15 +36,15 @@
Flag TorrentParser
Description: Use haskell torrent library to parse torrent files
-+ Default: True
++ Default: False
Flag MagicMime
Description: Use libmagic to determine file MIME types
-+ Default: True
++ Default: False
Flag ConcurrentOutput
Description: Use concurrent-output library
-+ Default: True
++ Default: False
Flag Benchmark
Description: Enable benchmarking
diff --git a/git-annex.spec b/git-annex.spec
index 264ddb2..b65a694 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -7,7 +7,7 @@ Version: 6.20170520
Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
-License: GPLv3+ and AGPLv3+
+License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
# These are missing from tarball, but will be added back.
@@ -20,20 +20,20 @@ BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: cabal-install
# Begin cabal-rpm deps:
-BuildRequires: ghc-DAV-devel
+#BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
-BuildRequires: ghc-aws-devel
+#BuildRequires: ghc-aws-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-byteable-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
-BuildRequires: ghc-clientsession-devel
-BuildRequires: ghc-concurrent-output-devel
+#BuildRequires: ghc-clientsession-devel
+#BuildRequires: ghc-concurrent-output-devel
BuildRequires: ghc-conduit-devel
BuildRequires: ghc-conduit-extra-devel
BuildRequires: ghc-containers-devel
@@ -57,15 +57,15 @@ BuildRequires: ghc-hslogger-devel
BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-http-types-devel
-BuildRequires: ghc-magic-devel
+#BuildRequires: ghc-magic-devel
BuildRequires: ghc-memory-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-monad-logger-devel
BuildRequires: ghc-mountpoints-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
-BuildRequires: ghc-network-info-devel
-BuildRequires: ghc-network-multicast-devel
+#BuildRequires: ghc-network-info-devel
+#BuildRequires: ghc-network-multicast-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
@@ -87,7 +87,7 @@ BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
-BuildRequires: ghc-torrent-devel
+#BuildRequires: ghc-torrent-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
@@ -97,12 +97,12 @@ BuildRequires: ghc-uuid-devel
BuildRequires: ghc-wai-devel
BuildRequires: ghc-wai-extra-devel
BuildRequires: ghc-warp-devel
-BuildRequires: ghc-warp-tls-devel
-BuildRequires: ghc-yesod-core-devel
-BuildRequires: ghc-yesod-default-devel
-BuildRequires: ghc-yesod-devel
-BuildRequires: ghc-yesod-form-devel
-BuildRequires: ghc-yesod-static-devel
+#BuildRequires: ghc-warp-tls-devel
+#BuildRequires: ghc-yesod-core-devel
+#BuildRequires: ghc-yesod-default-devel
+#BuildRequires: ghc-yesod-devel
+#BuildRequires: ghc-yesod-form-devel
+#BuildRequires: ghc-yesod-static-devel
# End cabal-rpm deps
BuildRequires: git
BuildRequires: rsync
@@ -188,7 +188,7 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%files
-%license COPYRIGHT doc/license/GPL doc/license/AGPL
+%license COPYRIGHT doc/license/GPL
%doc README CHANGELOG
%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
commit 3ccf578910441ae989d71f07b63ab494b392ff3a
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun Jul 23 21:09:14 2017 -0400
Tag new release.
diff --git a/git-annex.spec b/git-annex.spec
index 37556da..264ddb2 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -205,6 +205,10 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%changelog
+* Sun Jul 23 2017 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 6.20170520-1
+- Update to latest version.
+- Add rsync BuildRequires.
+
* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20161210-1
- update to 6.20161210
commit 2522a3be8c0d746f412a39bb055a8136c8ff2ec4
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun Jul 23 21:04:43 2017 -0400
Add rsync BuildRequires.
diff --git a/git-annex.spec b/git-annex.spec
index 0e07284..37556da 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -105,6 +105,7 @@ BuildRequires: ghc-yesod-form-devel
BuildRequires: ghc-yesod-static-devel
# End cabal-rpm deps
BuildRequires: git
+BuildRequires: rsync
%if %{with ikiwiki}
BuildRequires: ikiwiki
BuildRequires: perl(Image::Magick)
commit fe0b374f0a13fef969217f7874f4b875ca1a316f
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Jul 21 23:03:56 2017 -0400
Update to latest version.
diff --git a/.gitignore b/.gitignore
index b5d2957..f78d3ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/git-annex-6.20160527.tar.gz
/git-annex-6.20160613.tar.gz
/git-annex-6.20161210.tar.gz
+/git-annex-6.20170520.tar.gz
diff --git a/git-annex-6.20161210-flags.patch b/git-annex-6.20161210-flags.patch
deleted file mode 100644
index 9c9cd70..0000000
--- a/git-annex-6.20161210-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- git-annex-6.20161210/git-annex.cabal.orig 2016-12-10 11:24:01.000000000 -0500
-+++ git-annex-6.20161210/git-annex.cabal 2016-12-17 03:08:50.284055458 -0500
-@@ -258,21 +258,27 @@ Extra-Source-Files:
-
- Flag S3
- Description: Enable S3 support
-+ Default: True
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: True
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: True
-
- Flag Pairing
- Description: Enable pairing
-+ Default: True
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -284,15 +290,19 @@ Flag AndroidSplice
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: True
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: True
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: True
-
- Flag Benchmark
- Description: Enable benchmarking
-@@ -304,12 +314,15 @@ Flag network-uri
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: True
-
- source-repository head
- type: git
diff --git a/git-annex-6.20170520-flags.patch b/git-annex-6.20170520-flags.patch
new file mode 100644
index 0000000..a7554cb
--- /dev/null
+++ b/git-annex-6.20170520-flags.patch
@@ -0,0 +1,58 @@
+--- git-annex-6.20170520/git-annex.cabal.orig 2017-06-12 13:56:05.000000000 -0400
++++ git-annex-6.20170520/git-annex.cabal 2017-07-21 23:00:15.772166262 -0400
+@@ -252,21 +252,27 @@
+
+ Flag S3
+ Description: Enable S3 support
++ Default: True
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: True
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: True
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: True
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -278,15 +284,19 @@
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: True
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: True
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: True
+
+ Flag Benchmark
+ Description: Enable benchmarking
+@@ -298,6 +308,7 @@
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/git-annex.spec b/git-annex.spec
index 9e14976..0e07284 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,7 +3,7 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 6.20161210
+Version: 6.20170520
Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
@@ -22,7 +22,6 @@ BuildRequires: cabal-install
# Begin cabal-rpm deps:
BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
-BuildRequires: ghc-MissingH-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
@@ -53,13 +52,13 @@ BuildRequires: ghc-fdo-notify-devel
BuildRequires: ghc-feed-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-free-devel
-BuildRequires: ghc-gnutls-devel
BuildRequires: ghc-hinotify-devel
BuildRequires: ghc-hslogger-devel
BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-http-types-devel
BuildRequires: ghc-magic-devel
+BuildRequires: ghc-memory-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-monad-logger-devel
BuildRequires: ghc-mountpoints-devel
@@ -67,7 +66,6 @@ BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-network-info-devel
BuildRequires: ghc-network-multicast-devel
-BuildRequires: ghc-network-protocol-xmpp-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
@@ -83,6 +81,7 @@ BuildRequires: ghc-sandi-devel
BuildRequires: ghc-securemem-devel
BuildRequires: ghc-shakespeare-devel
BuildRequires: ghc-socks-devel
+BuildRequires: ghc-split-devel
BuildRequires: ghc-stm-chans-devel
BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
@@ -99,7 +98,6 @@ BuildRequires: ghc-wai-devel
BuildRequires: ghc-wai-extra-devel
BuildRequires: ghc-warp-devel
BuildRequires: ghc-warp-tls-devel
-BuildRequires: ghc-xml-types-devel
BuildRequires: ghc-yesod-core-devel
BuildRequires: ghc-yesod-default-devel
BuildRequires: ghc-yesod-devel
diff --git a/sources b/sources
index c24f3f9..04e3a76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20161210.tar.gz) = b793893b4dfe7f323cc48d1fb45d0eafb0378c03b823c1a91d3268882dc877cc6ebced41e7296ac5f2e14a2673643cafd90c420c05a6d8062c4e7c15c176a6e7
+SHA512 (git-annex-6.20170520.tar.gz) = 5fad4920d5defa3e750a42a545dab3d6a03417ad58f8c7f0c279d92c65e4a92fee73e2f69aecb15a9864f908ba8d60e4876a0cf1c4c4d902c303c2e95f8c36c4
commit 2c26a0cf46d7f6c6b420720c5a3372f3318f2a03
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat Dec 17 03:56:22 2016 -0500
Update to 6.20161210.
diff --git a/.gitignore b/.gitignore
index 62d8f50..b5d2957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/git-annex-6.20160511.tar.gz
/git-annex-6.20160527.tar.gz
/git-annex-6.20160613.tar.gz
+/git-annex-6.20161210.tar.gz
diff --git a/git-annex-6.20160613-flags.patch b/git-annex-6.20160613-flags.patch
deleted file mode 100644
index 4734494..0000000
--- a/git-annex-6.20160613-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- git-annex-6.20160613/git-annex.cabal.orig 2016-06-18 16:40:06.329104260 -0400
-+++ git-annex-6.20160613/git-annex.cabal 2016-06-18 16:40:11.857075061 -0400
-@@ -256,21 +256,27 @@ Extra-Source-Files:
-
- Flag S3
- Description: Enable S3 support
-+ Default: True
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: True
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: True
-
- Flag Pairing
- Description: Enable pairing
-+ Default: True
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -282,15 +288,19 @@ Flag AndroidSplice
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: True
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: True
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: True
-
- Flag EKG
- Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
-@@ -306,12 +316,15 @@ Flag network-uri
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: True
-
- source-repository head
- type: git
diff --git a/git-annex-6.20161210-flags.patch b/git-annex-6.20161210-flags.patch
new file mode 100644
index 0000000..9c9cd70
--- /dev/null
+++ b/git-annex-6.20161210-flags.patch
@@ -0,0 +1,66 @@
+--- git-annex-6.20161210/git-annex.cabal.orig 2016-12-10 11:24:01.000000000 -0500
++++ git-annex-6.20161210/git-annex.cabal 2016-12-17 03:08:50.284055458 -0500
+@@ -258,21 +258,27 @@ Extra-Source-Files:
+
+ Flag S3
+ Description: Enable S3 support
++ Default: True
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: True
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: True
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: True
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -284,15 +290,19 @@ Flag AndroidSplice
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: True
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: True
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: True
+
+ Flag Benchmark
+ Description: Enable benchmarking
+@@ -304,12 +314,15 @@ Flag network-uri
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: True
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/git-annex.spec b/git-annex.spec
index a9c3368..9e14976 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,8 +3,8 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 6.20160613
-Release: 2%{?dist}
+Version: 6.20161210
+Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+ and AGPLv3+
@@ -52,13 +52,13 @@ BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-fdo-notify-devel
BuildRequires: ghc-feed-devel
BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-free-devel
BuildRequires: ghc-gnutls-devel
BuildRequires: ghc-hinotify-devel
BuildRequires: ghc-hslogger-devel
BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-http-types-devel
-BuildRequires: ghc-json-devel
BuildRequires: ghc-magic-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-monad-logger-devel
@@ -82,6 +82,8 @@ BuildRequires: ghc-resourcet-devel
BuildRequires: ghc-sandi-devel
BuildRequires: ghc-securemem-devel
BuildRequires: ghc-shakespeare-devel
+BuildRequires: ghc-socks-devel
+BuildRequires: ghc-stm-chans-devel
BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
@@ -90,6 +92,7 @@ BuildRequires: ghc-torrent-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
+BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-uuid-devel
BuildRequires: ghc-wai-devel
@@ -190,7 +193,9 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%doc README CHANGELOG
%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
+%{_bindir}/git-remote-tor-annex
%{_mandir}/man1/git-annex*
+%{_mandir}/man1/git-remote-tor-annex*
%{_datadir}/bash-completion/
%if %{with ikiwiki}
@@ -201,6 +206,9 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%changelog
+* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20161210-1
+- update to 6.20161210
+
* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-2
- spec file partially re-generated by cabal-rpm-0.10.0
- Enable "s3" and "webdav" flags
diff --git a/sources b/sources
index 1baecba..c24f3f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20160613.tar.gz) = 38e6dde73c3420cf1d7e70ae064cad539f1a0aedfdce7e168f8bb35aebb12372f6594b5601fe9f6b000c72f2b51b043385b74a2d0fbf5d31b9e0c731f62295b4
+SHA512 (git-annex-6.20161210.tar.gz) = b793893b4dfe7f323cc48d1fb45d0eafb0378c03b823c1a91d3268882dc877cc6ebced41e7296ac5f2e14a2673643cafd90c420c05a6d8062c4e7c15c176a6e7
commit 345721ccb45e0f082dacf5c7668e549612965282
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat Dec 17 02:54:47 2016 -0500
Enable S3 and WebDAV.
diff --git a/git-annex-6.20160613-flags.patch b/git-annex-6.20160613-flags.patch
index a2cc8a3..4734494 100644
--- a/git-annex-6.20160613-flags.patch
+++ b/git-annex-6.20160613-flags.patch
@@ -4,11 +4,11 @@
Flag S3
Description: Enable S3 support
-+ Default: False
++ Default: True
Flag WebDAV
Description: Enable WebDAV support
-+ Default: False
++ Default: True
Flag Assistant
Description: Enable git-annex assistant and watch command
diff --git a/git-annex.spec b/git-annex.spec
index f381893..a9c3368 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,10 +4,10 @@
Name: git-annex
Version: 6.20160613
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Manage files with git, without checking their contents into git
-License: GPLv3+
+License: GPLv3+ and AGPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
# These are missing from tarball, but will be added back.
@@ -20,16 +20,17 @@ BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: cabal-install
# Begin cabal-rpm deps:
-# BuildRequires: ghc-DAV-devel
+BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
BuildRequires: ghc-MissingH-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
-# BuildRequires: ghc-aws-devel
+BuildRequires: ghc-aws-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bloomfilter-devel
+BuildRequires: ghc-byteable-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
BuildRequires: ghc-clientsession-devel
@@ -37,6 +38,7 @@ BuildRequires: ghc-concurrent-output-devel
BuildRequires: ghc-conduit-devel
BuildRequires: ghc-conduit-extra-devel
BuildRequires: ghc-containers-devel
+BuildRequires: ghc-crypto-api-devel
BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
BuildRequires: ghc-dbus-devel
@@ -78,6 +80,7 @@ BuildRequires: ghc-random-devel
BuildRequires: ghc-regex-tdfa-devel
BuildRequires: ghc-resourcet-devel
BuildRequires: ghc-sandi-devel
+BuildRequires: ghc-securemem-devel
BuildRequires: ghc-shakespeare-devel
BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
@@ -99,7 +102,6 @@ BuildRequires: ghc-yesod-default-devel
BuildRequires: ghc-yesod-devel
BuildRequires: ghc-yesod-form-devel
BuildRequires: ghc-yesod-static-devel
-ExclusiveArch: %{ghc_arches_with_ghci}
# End cabal-rpm deps
BuildRequires: git
%if %{with ikiwiki}
@@ -126,32 +128,17 @@ into git. While that may seem paradoxical, it is useful when dealing with files
larger than git can currently easily handle, whether due to limitations in
memory, time, or disk space.
-Even without file content tracking, being able to manage files with git, move
-files around and delete files with versioned directory trees, and use branches
-and distributed clones, are all very handy reasons to use git. And annexed
-files can co-exist in the same git repository with regularly versioned files,
-which is convenient for maintaining documents, Makefiles, etc that are
-associated with annexed files but that benefit from full revision control.
-
-When a file is annexed, its content is moved into a key-value store, and a
-symlink is made that points to the content. These symlinks are checked into git
-and versioned like regular files. You can move them around, delete them, and so
-on. Pushing to another git repository will make git-annex there aware of the
-annexed file, and it can be used to retrieve its content from the key-value
-store.
-
-# XXX: replace basic description since it references features not built here.
-#It can store large files in many places, from local hard drives, to a large
-#number of cloud storage services, including S3, WebDAV, and rsync, with a dozen
-#cloud storage providers usable via plugins. Files can be stored encrypted with
-#gpg, so that the cloud storage provider cannot see your data.
-#git-annex keeps track of where each file is stored, so it knows how many copies
-#are available, and has many facilities to ensure your data is preserved.
-#
-#git-annex can also be used to keep a folder in sync between computers, noticing
-#when files are changed, and automatically committing them to git and
-#transferring them to other computers. The git-annex webapp makes it easy to set
-#up and use git-annex this way.
+It can store large files in many places, from local hard drives, to a large
+number of cloud storage services, including S3, WebDAV, and rsync, with a dozen
+cloud storage providers usable via plugins. Files can be stored encrypted with
+gpg, so that the cloud storage provider cannot see your data.
+git-annex keeps track of where each file is stored, so it knows how many copies
+are available, and has many facilities to ensure your data is preserved.
+
+git-annex can also be used to keep a folder in sync between computers, noticing
+when files are changed, and automatically committing them to git and
+transferring them to other computers. The git-annex webapp makes it easy to set
+up and use git-annex this way.
%if %{with ikiwiki}
%package docs
@@ -199,8 +186,8 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%files
-%doc COPYRIGHT README CHANGELOG
-%license doc/license/GPL
+%license COPYRIGHT doc/license/GPL doc/license/AGPL
+%doc README CHANGELOG
%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
%{_mandir}/man1/git-annex*
@@ -214,6 +201,10 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%changelog
+* Sat Dec 17 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-2
+- spec file partially re-generated by cabal-rpm-0.10.0
+- Enable "s3" and "webdav" flags
+
* Sat Jun 18 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-1
- update to 6.20160613
commit f662c3f3e9cb82a0dcbe6899bc5369f1e41a5d85
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat Jun 18 20:40:39 2016 -0400
New upstream release.
diff --git a/.gitignore b/.gitignore
index ded8a69..62d8f50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/git-annex-6.20160419.tar.gz
/git-annex-6.20160511.tar.gz
/git-annex-6.20160527.tar.gz
+/git-annex-6.20160613.tar.gz
diff --git a/git-annex-6.20160527-flags.patch b/git-annex-6.20160527-flags.patch
deleted file mode 100644
index 7cc8b78..0000000
--- a/git-annex-6.20160527-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- git-annex-6.20160527/git-annex.cabal.orig 2016-05-27 12:37:13.000000000 -0400
-+++ git-annex-6.20160527/git-annex.cabal 2016-05-28 23:31:33.495145173 -0400
-@@ -257,21 +257,27 @@ Extra-Source-Files:
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: True
-
- Flag Pairing
- Description: Enable pairing
-+ Default: True
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -283,15 +289,19 @@ Flag AndroidSplice
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: True
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: True
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: True
-
- Flag EKG
- Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
-@@ -307,12 +317,15 @@ Flag network-uri
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: True
-
- source-repository head
- type: git
diff --git a/git-annex-6.20160613-flags.patch b/git-annex-6.20160613-flags.patch
new file mode 100644
index 0000000..a2cc8a3
--- /dev/null
+++ b/git-annex-6.20160613-flags.patch
@@ -0,0 +1,66 @@
+--- git-annex-6.20160613/git-annex.cabal.orig 2016-06-18 16:40:06.329104260 -0400
++++ git-annex-6.20160613/git-annex.cabal 2016-06-18 16:40:11.857075061 -0400
+@@ -256,21 +256,27 @@ Extra-Source-Files:
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: True
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: True
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -282,15 +288,19 @@ Flag AndroidSplice
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: True
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: True
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: True
+
+ Flag EKG
+ Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
+@@ -306,12 +316,15 @@ Flag network-uri
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: True
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/git-annex.spec b/git-annex.spec
index 2be064a..f381893 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,8 +3,8 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 6.20160527
-Release: 2%{?dist}
+Version: 6.20160613
+Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -179,11 +179,15 @@ cabal
%ghc_bin_build
-%if %{with ikiwiki}
-make docs
-%else
-make git-annex.1 git-annex-shell.1
-%endif
+LC_ALL=C TZ=UTC ikiwiki doc html -v --wikiname git-annex \
+ --plugin=goodstuff \
+ --no-usedirs --disable-plugin=openid --plugin=sidebar \
+ --underlaydir=/dev/null --set deterministic=1 \
+ --disable-plugin=shortcut --disable-plugin=smiley \
+ --plugin=comments --set comments_pagespec="*" \
+ --exclude='news/.*' --exclude='design/assistant/blog/*' \
+ --exclude='bugs/*' --exclude='todo/*' --exclude='forum/*' \
+ --exclude='users/*' --exclude='devblog/*' --exclude='thanks'
%install
@@ -210,6 +214,9 @@ install -m 644 bash-completion.bash $bash_completion_dir/git-annex
%changelog
+* Sat Jun 18 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160613-1
+- update to 6.20160613
+
* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-2
- Fix documentation packaging
- Add and install bash-completion
diff --git a/sources b/sources
index 21e8932..1baecba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20160527.tar.gz) = b2cbc56cd0d947e71d41d584f40e24fa07209f699ce004c0960fbc86bc536cc879f036a0cb37fdc52b4090759a517326e5c77bf8f2b9d3b00f9fe13609bc5212
+SHA512 (git-annex-6.20160613.tar.gz) = 38e6dde73c3420cf1d7e70ae064cad539f1a0aedfdce7e168f8bb35aebb12372f6594b5601fe9f6b000c72f2b51b043385b74a2d0fbf5d31b9e0c731f62295b4
commit 5f92be44c2cfb310165eaf3d02f2a0c95b19d5bc
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun May 29 01:40:09 2016 -0400
Fix documentation and bash completion.
diff --git a/bash-completion.bash b/bash-completion.bash
new file mode 100644
index 0000000..11f9ff8
--- /dev/null
+++ b/bash-completion.bash
@@ -0,0 +1,37 @@
+# Use git-annex's built-in bash completion
+# This bash completion is generated by the option parser, so it covers all
+# commands, all options, and will never go out of date!
+_git-annex()
+{
+ local cmdline
+ CMDLINE=(--bash-completion-index $COMP_CWORD)
+
+ for arg in ${COMP_WORDS[@]}; do
+ CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+ done
+
+ COMPREPLY=( $(git-annex "${CMDLINE[@]}") )
+}
+
+complete -o bashdefault -o default -o filenames -F _git-annex git-annex
+
+# Called by git's bash completion script when completing "git annex"
+_git_annex() {
+ local cmdline
+ CMDLINE=(--bash-completion-index $(($COMP_CWORD - 1)))
+
+ local seen_git
+ local seen_annex
+ for arg in ${COMP_WORDS[@]}; do
+ if [ "$arg" = git ] && [ -z "$seen_git" ]; then
+ seen_git=1
+ CMDLINE=(${CMDLINE[@]} --bash-completion-word git-annex)
+ elif [ "$arg" = annex ] && [ -z "$seen_annex" ]; then
+ seen_annex=1
+ else
+ CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+ fi
+ done
+
+ COMPREPLY=( $(git-annex "${CMDLINE[@]}") )
+}
diff --git a/git-annex.spec b/git-annex.spec
index 7d618a3..2be064a 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,14 +4,18 @@
Name: git-annex
Version: 6.20160527
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
+# These are missing from tarball, but will be added back.
+Source1: bash-completion.bash
+Source2: index.mdwn
Patch0: %{name}-%{version}-flags.patch
+BuildRequires: bash-completion
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: cabal-install
@@ -160,7 +164,9 @@ This package contains the documentation for %{name} in HTML format.
%endif
%prep
-%setup -q
+%setup -q -b 0
+cp %SOURCE1 .
+cp %SOURCE2 doc/
%patch0 -p1 -b .flags
@@ -183,20 +189,31 @@ make git-annex.1 git-annex-shell.1
%install
%ghc_bin_install
+bash_completion_dir=%{buildroot}$(pkg-config --variable=completionsdir bash-completion)
+mkdir -p $bash_completion_dir
+install -m 644 bash-completion.bash $bash_completion_dir/git-annex
+
%files
-%doc COPYRIGHT README debian/changelog
+%doc COPYRIGHT README CHANGELOG
+%license doc/license/GPL
%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
%{_mandir}/man1/git-annex*
+%{_datadir}/bash-completion/
%if %{with ikiwiki}
%files docs
+%license doc/license/GPL
%doc html/
%endif
%changelog
+* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-2
+- Fix documentation packaging
+- Add and install bash-completion
+
* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-1
- update to 6.20160527
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..77b61da
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,40 @@
+[[!inline raw=yes pages="summary"]]
+
+[[!sidebar content="""
+[[!inline feeds=no template=bare pages=sidebar]]
+"""]]
+
+<table>
+<tr>
+<td width="33%" valign="top">[[!inline feeds=no template=bare pages=links/key_concepts]]</td>
+<td width="33%" valign="top">[[!inline feeds=no template=bare pages=links/the_details]]</td>
+<td width="33%" valign="top">[[!inline feeds=no template=bare pages=links/other_stuff]]</td>
+</tr>
+</table>
+
+<table>
+<tr>
+<td width="50%" valign="top">[[!inline feeds=no template=bare pages=use_case/bob]]</td>
+<td width="50%" valign="top">[[!inline feeds=no template=bare pages=use_case/alice]]</td>
+</tr>
+</table>
+
+If that describes you, or if you're some from column A and some from column
+B, then git-annex may be the tool you've been looking for to expand from
+keeping all your small important files in git, to managing your large
+files with git.
+
+<table>
+<tr>
+<td width="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_a]]</td>
+<td width="50%" valign="top">[[!inline feeds=no template=bare pages=footer/column_b]]</td>
+</tr>
+</table>
+
+----
+
+git-annex is [[Free Software|license]], written in [Haskell](http://www.haskell.org/).
+You can [[contribute]]!
+
+git-annex's wiki is powered by [Ikiwiki](http://ikiwiki.info/) and
+hosted by [Branchable](http://branchable.com/).
commit b7fa9a1b1d9f57d204e0c3a048ab85858ea408d2
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat May 28 23:41:08 2016 -0400
Update to latest release.
diff --git a/.gitignore b/.gitignore
index 7124753..ded8a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/git-annex-5.20150812.tar.gz
/git-annex-6.20160419.tar.gz
/git-annex-6.20160511.tar.gz
+/git-annex-6.20160527.tar.gz
diff --git a/git-annex-6.20160511-flags.patch b/git-annex-6.20160511-flags.patch
deleted file mode 100644
index 1604ef6..0000000
--- a/git-annex-6.20160511-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- git-annex-6.20160419/git-annex.cabal.orig 2016-04-25 23:49:12.342433405 -0400
-+++ git-annex-6.20160419/git-annex.cabal 2016-04-26 00:09:03.870091223 -0400
-@@ -33,21 +33,27 @@ Description:
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: True
-
- Flag Pairing
- Description: Enable pairing
-+ Default: True
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -59,15 +65,19 @@ Flag AndroidSplice
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: True
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: True
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: True
-
- Flag EKG
- Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
-@@ -83,12 +93,15 @@ Flag network-uri
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: True
-
- Executable git-annex
- Main-Is: git-annex.hs
diff --git a/git-annex-6.20160527-flags.patch b/git-annex-6.20160527-flags.patch
new file mode 100644
index 0000000..7cc8b78
--- /dev/null
+++ b/git-annex-6.20160527-flags.patch
@@ -0,0 +1,66 @@
+--- git-annex-6.20160527/git-annex.cabal.orig 2016-05-27 12:37:13.000000000 -0400
++++ git-annex-6.20160527/git-annex.cabal 2016-05-28 23:31:33.495145173 -0400
+@@ -257,21 +257,27 @@ Extra-Source-Files:
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: True
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: True
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -283,15 +289,19 @@ Flag AndroidSplice
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: True
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: True
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: True
+
+ Flag EKG
+ Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
+@@ -307,12 +317,15 @@ Flag network-uri
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: True
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: True
+
+ source-repository head
+ type: git
diff --git a/git-annex.spec b/git-annex.spec
index eba3dbd..7d618a3 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,14 +3,14 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 6.20160511
-Release: 3%{?dist}
+Version: 6.20160527
+Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
-Patch0: git-annex-6.20160511-flags.patch
+Patch0: %{name}-%{version}-flags.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -197,6 +197,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Sun May 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160527-1
+- update to 6.20160527
+
* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-3
- Properly remove S3 and WebDAV deps
diff --git a/sources b/sources
index b75e44f..21e8932 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20160511.tar.gz) = cf5789a3700e98bbc2bf74a6f9227f21487b0415eb0b95a81e951726b54cf481d7bb7c8ef19607ef9780ad8e86df0e9e00aac04684687522e0ecc85687da215f
+SHA512 (git-annex-6.20160527.tar.gz) = b2cbc56cd0d947e71d41d584f40e24fa07209f699ce004c0960fbc86bc536cc879f036a0cb37fdc52b4090759a517326e5c77bf8f2b9d3b00f9fe13609bc5212
commit c17e953895e0e9a4f9e1e95b9cc23ec1f7cc553c
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri May 13 19:45:02 2016 -0400
Properly remove S3 and WebDAV deps.
diff --git a/git-annex.spec b/git-annex.spec
index 82f6206..eba3dbd 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160511
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -16,14 +16,14 @@ BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: cabal-install
# Begin cabal-rpm deps:
-BuildRequires: ghc-DAV-devel
+# BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
BuildRequires: ghc-MissingH-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
-BuildRequires: ghc-aws-devel
+# BuildRequires: ghc-aws-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-bytestring-devel
@@ -197,6 +197,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-3
+- Properly remove S3 and WebDAV deps
+
* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-2
- Disable S3 and WebDAV support; deps not ready yet
commit e29edcad3b91de239f7d2d97b556f7ec18b4dac5
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri May 13 19:35:11 2016 -0400
Disable S3 and WebDAV; no deps built yet.
diff --git a/git-annex-6.20160511-flags.patch b/git-annex-6.20160511-flags.patch
index 95ceba7..1604ef6 100644
--- a/git-annex-6.20160511-flags.patch
+++ b/git-annex-6.20160511-flags.patch
@@ -4,11 +4,11 @@
Flag S3
Description: Enable S3 support
-+ Default: True
++ Default: False
Flag WebDAV
Description: Enable WebDAV support
-+ Default: True
++ Default: False
Flag Assistant
Description: Enable git-annex assistant and watch command
diff --git a/git-annex.spec b/git-annex.spec
index c3a006a..82f6206 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160511
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -197,6 +197,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-2
+- Disable S3 and WebDAV support; deps not ready yet
+
* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-1
- update to 6.20160511
- switch back to flag patching, which doesn't confuse cabal-rpm as much
commit 48cc6cdb52785c436c7bb17f0be9eac1f46e6411
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri May 13 02:45:13 2016 -0400
Update to 6.20160511.
diff --git a/.gitignore b/.gitignore
index 12de8c6..7124753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/git-annex-5.20140717.tar.gz
/git-annex-5.20150812.tar.gz
/git-annex-6.20160419.tar.gz
+/git-annex-6.20160511.tar.gz
diff --git a/git-annex-6.20160511-flags.patch b/git-annex-6.20160511-flags.patch
new file mode 100644
index 0000000..95ceba7
--- /dev/null
+++ b/git-annex-6.20160511-flags.patch
@@ -0,0 +1,66 @@
+--- git-annex-6.20160419/git-annex.cabal.orig 2016-04-25 23:49:12.342433405 -0400
++++ git-annex-6.20160419/git-annex.cabal 2016-04-26 00:09:03.870091223 -0400
+@@ -33,21 +33,27 @@ Description:
+
+ Flag S3
+ Description: Enable S3 support
++ Default: True
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: True
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: True
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: True
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -59,15 +65,19 @@ Flag AndroidSplice
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: True
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: True
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: True
+
+ Flag EKG
+ Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
+@@ -83,12 +93,15 @@ Flag network-uri
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: True
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: True
+
+ Executable git-annex
+ Main-Is: git-annex.hs
diff --git a/git-annex.spec b/git-annex.spec
index 873fc89..c3a006a 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,13 +3,14 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 6.20160419
-Release: 6%{?dist}
+Version: 6.20160511
+Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
+Patch0: git-annex-6.20160511-flags.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -160,7 +161,7 @@ This package contains the documentation for %{name} in HTML format.
%prep
%setup -q
-cabal-tweak-flag TestSuite False
+%patch0 -p1 -b .flags
%build
@@ -196,6 +197,10 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160511-1
+- update to 6.20160511
+- switch back to flag patching, which doesn't confuse cabal-rpm as much
+
* Thu May 05 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-6
- Enable S3, WebDAV, and Torrent support
diff --git a/sources b/sources
index 6efdfca..b75e44f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20160419.tar.gz) = b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118
+SHA512 (git-annex-6.20160511.tar.gz) = cf5789a3700e98bbc2bf74a6f9227f21487b0415eb0b95a81e951726b54cf481d7bb7c8ef19607ef9780ad8e86df0e9e00aac04684687522e0ecc85687da215f
commit c7a4a92ddeb258912b1dddbf669d9a09c93cb6f2
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Wed May 4 23:06:50 2016 -0400
Enable S3, WebDAV, and torrent parser.
diff --git a/git-annex-6.20160419-flags.patch b/git-annex-6.20160419-flags.patch
deleted file mode 100644
index f7e244d..0000000
--- a/git-annex-6.20160419-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- git-annex-6.20160419/git-annex.cabal.orig 2016-04-25 23:49:12.342433405 -0400
-+++ git-annex-6.20160419/git-annex.cabal 2016-04-26 00:09:03.870091223 -0400
-@@ -33,21 +33,27 @@ Description:
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: True
-
- Flag Pairing
- Description: Enable pairing
-+ Default: True
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
-@@ -59,15 +65,19 @@ Flag AndroidSplice
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: False
-
- Flag MagicMime
- Description: Use libmagic to determine file MIME types
-+ Default: True
-
- Flag ConcurrentOutput
- Description: Use concurrent-output library
-+ Default: True
-
- Flag EKG
- Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
-@@ -83,12 +93,15 @@ Flag network-uri
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: True
-
- Executable git-annex
- Main-Is: git-annex.hs
diff --git a/git-annex.spec b/git-annex.spec
index bb23ff7..873fc89 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,30 +4,33 @@
Name: git-annex
Version: 6.20160419
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
-Patch0: git-annex-6.20160419-flags.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: cabal-install
# Begin cabal-rpm deps:
+BuildRequires: ghc-DAV-devel
BuildRequires: ghc-IfElse-devel
BuildRequires: ghc-MissingH-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
+BuildRequires: ghc-aws-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
BuildRequires: ghc-clientsession-devel
BuildRequires: ghc-concurrent-output-devel
+BuildRequires: ghc-conduit-devel
+BuildRequires: ghc-conduit-extra-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
@@ -75,6 +78,7 @@ BuildRequires: ghc-stm-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
+BuildRequires: ghc-torrent-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
@@ -102,22 +106,12 @@ BuildRequires: perl(Image::Magick)
#Benchmark:
# BuildRequires: ghc-criterion-devel (unpackaged)
# BuildRequires: ghc-deepseq-devel
-#ConcurrentOutput:
-# BuildRequires: ghc-concurrent-output-devel (unpackaged)
-#S3:
-# BuildRequires: ghc-aws-devel (unpackaged)
-# BuildRequires: ghc-conduit-devel
-# BuildRequires: ghc-conduit-extra-devel
#TestSuite:
# BuildRequires: ghc-crypto-api-devel
# BuildRequires: ghc-tasty-devel (unpackaged)
# BuildRequires: ghc-tasty-hunit-devel (unpackaged)
# BuildRequires: ghc-tasty-quickcheck-devel (unpackaged)
# BuildRequires: ghc-tasty-rerun-devel (unpackaged)
-#TorrentParser:
-# BuildRequires: ghc-torrent-devel (unpackaged)
-#WebDAV:
-# BuildRequires: ghc-DAV-devel (unpackaged)
Requires: git
@@ -166,7 +160,7 @@ This package contains the documentation for %{name} in HTML format.
%prep
%setup -q
-%patch0 -p1 -b .flags
+cabal-tweak-flag TestSuite False
%build
@@ -202,6 +196,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Thu May 05 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-6
+- Enable S3, WebDAV, and Torrent support
+
* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-5
- Enable XMPP support
commit e152a6280d25f2655b13892d716a5135013bcb57
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mon May 2 23:12:10 2016 -0400
Enable XMPP support.
diff --git a/git-annex-6.20160419-flags.patch b/git-annex-6.20160419-flags.patch
index a63f907..f7e244d 100644
--- a/git-annex-6.20160419-flags.patch
+++ b/git-annex-6.20160419-flags.patch
@@ -60,7 +60,7 @@
Flag XMPP
Description: Enable notifications using XMPP
-+ Default: False
++ Default: True
Executable git-annex
Main-Is: git-annex.hs
diff --git a/git-annex.spec b/git-annex.spec
index d7c3a83..bb23ff7 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160419
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -42,6 +42,7 @@ BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-fdo-notify-devel
BuildRequires: ghc-feed-devel
BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-gnutls-devel
BuildRequires: ghc-hinotify-devel
BuildRequires: ghc-hslogger-devel
BuildRequires: ghc-http-client-devel
@@ -56,6 +57,7 @@ BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-network-info-devel
BuildRequires: ghc-network-multicast-devel
+BuildRequires: ghc-network-protocol-xmpp-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
@@ -82,6 +84,7 @@ BuildRequires: ghc-wai-devel
BuildRequires: ghc-wai-extra-devel
BuildRequires: ghc-warp-devel
BuildRequires: ghc-warp-tls-devel
+BuildRequires: ghc-xml-types-devel
BuildRequires: ghc-yesod-core-devel
BuildRequires: ghc-yesod-default-devel
BuildRequires: ghc-yesod-devel
@@ -115,10 +118,6 @@ BuildRequires: perl(Image::Magick)
# BuildRequires: ghc-torrent-devel (unpackaged)
#WebDAV:
# BuildRequires: ghc-DAV-devel (unpackaged)
-#XMPP:
-# BuildRequires: ghc-gnutls-devel (unpackaged)
-# BuildRequires: ghc-network-protocol-xmpp-devel (unpackaged)
-# BuildRequires: ghc-xml-types-devel
Requires: git
@@ -203,6 +202,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-5
+- Enable XMPP support
+
* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-4
- Add more BR and enable more flags to enable the assistant
commit 4c0a9819b0c06cec76337f594e3bff14e1042da5
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mon May 2 19:27:00 2016 -0400
Add stuff to enable the assistant.
diff --git a/git-annex-6.20160419-flags.patch b/git-annex-6.20160419-flags.patch
index 928f8e4..a63f907 100644
--- a/git-annex-6.20160419-flags.patch
+++ b/git-annex-6.20160419-flags.patch
@@ -28,7 +28,7 @@
Flag Android
Description: Cross building for Android
-@@ -59,15 +65,18 @@ Flag AndroidSplice
+@@ -59,15 +65,19 @@ Flag AndroidSplice
Flag TestSuite
Description: Embed the test suite into git-annex
@@ -36,6 +36,7 @@
Flag TorrentParser
Description: Use haskell torrent library to parse torrent files
++ Default: False
Flag MagicMime
Description: Use libmagic to determine file MIME types
@@ -43,11 +44,11 @@
Flag ConcurrentOutput
Description: Use concurrent-output library
-+ Default: False
++ Default: True
Flag EKG
Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
-@@ -83,12 +92,15 @@ Flag network-uri
+@@ -83,12 +93,15 @@ Flag network-uri
Flag Cryptonite
Description: Use the cryptonite library, instead of the older cryptohash
diff --git a/git-annex.spec b/git-annex.spec
index a6a8c79..d7c3a83 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160419
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -27,6 +27,7 @@ BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
BuildRequires: ghc-clientsession-devel
+BuildRequires: ghc-concurrent-output-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
@@ -34,6 +35,7 @@ BuildRequires: ghc-dbus-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-disk-free-space-devel
BuildRequires: ghc-dlist-devel
+BuildRequires: ghc-dns-devel
BuildRequires: ghc-edit-distance-devel
BuildRequires: ghc-esqueleto-devel
BuildRequires: ghc-exceptions-devel
@@ -49,6 +51,7 @@ BuildRequires: ghc-json-devel
BuildRequires: ghc-magic-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-monad-logger-devel
+BuildRequires: ghc-mountpoints-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-network-info-devel
@@ -98,10 +101,7 @@ BuildRequires: perl(Image::Magick)
# BuildRequires: ghc-deepseq-devel
#ConcurrentOutput:
# BuildRequires: ghc-concurrent-output-devel (unpackaged)
-#DNS:
-# BuildRequires: ghc-dns-devel (unpackaged)
#S3:
-# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
# BuildRequires: ghc-aws-devel (unpackaged)
# BuildRequires: ghc-conduit-devel
# BuildRequires: ghc-conduit-extra-devel
@@ -115,7 +115,6 @@ BuildRequires: perl(Image::Magick)
# BuildRequires: ghc-torrent-devel (unpackaged)
#WebDAV:
# BuildRequires: ghc-DAV-devel (unpackaged)
-# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
#XMPP:
# BuildRequires: ghc-gnutls-devel (unpackaged)
# BuildRequires: ghc-network-protocol-xmpp-devel (unpackaged)
@@ -204,6 +203,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Mon May 02 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-4
+- Add more BR and enable more flags to enable the assistant
+
* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-3
- Correctly enable build flags for MagicMime, Pairing, and Webapp
commit 627ee5f4c32ee501e784a31ef2e6e9183823559e
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mon May 2 04:36:32 2016 -0400
Actually enable flags that were added.
diff --git a/git-annex-6.20160419-flags.patch b/git-annex-6.20160419-flags.patch
index 9ca51ec..928f8e4 100644
--- a/git-annex-6.20160419-flags.patch
+++ b/git-annex-6.20160419-flags.patch
@@ -16,11 +16,11 @@
Flag Webapp
Description: Enable git-annex webapp
-+ Default: False
++ Default: True
Flag Pairing
Description: Enable pairing
-+ Default: False
++ Default: True
Flag Production
Description: Enable production build (slower build; faster binary)
@@ -39,7 +39,7 @@
Flag MagicMime
Description: Use libmagic to determine file MIME types
-+ Default: False
++ Default: True
Flag ConcurrentOutput
Description: Use concurrent-output library
@@ -51,7 +51,7 @@
Flag Cryptonite
Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: False
++ Default: True
Flag Dbus
Description: Enable dbus support
diff --git a/git-annex.spec b/git-annex.spec
index 11bb1c1..a6a8c79 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160419
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -204,6 +204,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-3
+- Correctly enable build flags for MagicMime, Pairing, and Webapp
+
* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-2
- Enable MagicMime, Pairing, and Webapp
commit 033ee01ec6d1db0e2937829c01c75d6bd646cc4f
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sun May 1 23:04:23 2016 -0400
Enable MagicMime, Pairing, and Webapp.
diff --git a/git-annex-default-flags.patch b/git-annex-default-flags.patch
deleted file mode 100644
index 0d4db31..0000000
--- a/git-annex-default-flags.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -u -r -U5 git-annex-5.20140717/git-annex.cabal git-annex-5.20140717.flags/git-annex.cabal
---- git-annex-5.20140717/git-annex.cabal 2014-07-17 11:53:21.000000000 -0400
-+++ git-annex-5.20140717.flags/git-annex.cabal 2014-07-23 00:40:49.402565558 -0400
-@@ -26,40 +26,51 @@
- etc that are associated with annexed files but that benefit from full
- revision control.
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Inotify
- Description: Enable inotify support
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: False
-
- Flag Webapp-secure
- Description: Secure webapp
-+ Default: False
-
- Flag Pairing
- Description: Enable pairing
-+ Default: False
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: False
-
- Flag DNS
- Description: Enable the haskell DNS library for DNS lookup
-+ Default: False
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
- Default: False
-
-@@ -67,28 +78,35 @@
- Description: Building to get TH splices for Android
- Default: False
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TDFA
- Description: Use regex-tdfa for wildcards
-+ Default: True
-
- Flag Feed
- Description: Enable podcast feed support
-+ Default: False
-
- Flag Quvi
- Description: Enable use of quvi to download videos
-+ Default: True
-
- Flag Tahoe
- Description: Enable the tahoe special remote
-+ Default: True
-
- Flag CryptoHash
- Description: Enable use of cryptohash for checksumming
-+ Default: True
-
- Flag DesktopNotify
- Description: Enable desktop environment notifications
-+ Default: False
-
- Flag EKG
- Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
- Default: False
-
diff --git a/git-annex.spec b/git-annex.spec
index 1d17667..11bb1c1 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -4,7 +4,7 @@
Name: git-annex
Version: 6.20160419
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
@@ -22,9 +22,11 @@ BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
+BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
+BuildRequires: ghc-clientsession-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
@@ -44,13 +46,17 @@ BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-http-types-devel
BuildRequires: ghc-json-devel
+BuildRequires: ghc-magic-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-monad-logger-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
+BuildRequires: ghc-network-info-devel
+BuildRequires: ghc-network-multicast-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
+BuildRequires: ghc-path-pieces-devel
BuildRequires: ghc-persistent-devel
BuildRequires: ghc-persistent-sqlite-devel
BuildRequires: ghc-persistent-template-devel
@@ -59,7 +65,9 @@ BuildRequires: ghc-random-devel
BuildRequires: ghc-regex-tdfa-devel
BuildRequires: ghc-resourcet-devel
BuildRequires: ghc-sandi-devel
+BuildRequires: ghc-shakespeare-devel
BuildRequires: ghc-stm-devel
+BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-devel
@@ -67,6 +75,15 @@ BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-uuid-devel
+BuildRequires: ghc-wai-devel
+BuildRequires: ghc-wai-extra-devel
+BuildRequires: ghc-warp-devel
+BuildRequires: ghc-warp-tls-devel
+BuildRequires: ghc-yesod-core-devel
+BuildRequires: ghc-yesod-default-devel
+BuildRequires: ghc-yesod-devel
+BuildRequires: ghc-yesod-form-devel
+BuildRequires: ghc-yesod-static-devel
ExclusiveArch: %{ghc_arches_with_ghci}
# End cabal-rpm deps
BuildRequires: git
@@ -83,9 +100,6 @@ BuildRequires: perl(Image::Magick)
# BuildRequires: ghc-concurrent-output-devel (unpackaged)
#DNS:
# BuildRequires: ghc-dns-devel (unpackaged)
-#Pairing:
-# BuildRequires: ghc-network-info-devel (unpackaged)
-# BuildRequires: ghc-network-multicast-devel (unpackaged)
#S3:
# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
# BuildRequires: ghc-aws-devel (unpackaged)
@@ -102,23 +116,6 @@ BuildRequires: perl(Image::Magick)
#WebDAV:
# BuildRequires: ghc-DAV-devel (unpackaged)
# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
-#Webapp:
-# BuildRequires: ghc-blaze-builder-devel
-# BuildRequires: ghc-clientsession-devel (unpackaged)
-# BuildRequires: ghc-path-pieces-devel
-# BuildRequires: ghc-shakespeare-devel
-# BuildRequires: ghc-template-haskell-devel
-# BuildRequires: ghc-wai-devel
-# BuildRequires: ghc-wai-extra-devel
-# BuildRequires: ghc-warp-devel
-# BuildRequires: ghc-warp-tls-devel (unpackaged)
-# BuildRequires: ghc-yesod-core-devel (unpackaged)
-# BuildRequires: ghc-yesod-default-devel (unpackaged)
-# BuildRequires: ghc-yesod-devel (unpackaged)
-# BuildRequires: ghc-yesod-form-devel (unpackaged)
-# BuildRequires: ghc-yesod-static-devel (unpackaged)
-#MagicMime:
-# BuildRequires: ghc-magic-devel (unpackaged)
#XMPP:
# BuildRequires: ghc-gnutls-devel (unpackaged)
# BuildRequires: ghc-network-protocol-xmpp-devel (unpackaged)
@@ -207,6 +204,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Sun May 01 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-2
+- Enable MagicMime, Pairing, and Webapp
+
* Fri Apr 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-1
- Update to 6.20160419
commit 5f7bb8ae19bc2a231d6b19b12ec9e003601dea52
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Fri Apr 29 16:42:54 2016 -0400
Update to 6.20160419.
diff --git a/.gitignore b/.gitignore
index 900f8fe..12de8c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/git-annex-5.20140221.tar.gz
/git-annex-5.20140717.tar.gz
/git-annex-5.20150812.tar.gz
+/git-annex-6.20160419.tar.gz
diff --git a/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch b/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
deleted file mode 100644
index f9a9791..0000000
--- a/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b762790c196f61287a1da837754cd9013f26ca66 Mon Sep 17 00:00:00 2001
-From: Ben Boeckel <mathstuf(a)gmail.com>
-Date: Sun, 23 Aug 2015 18:23:27 -0400
-Subject: [PATCH] ImportFeed: fix signature of mkquvi without libquvi
-
----
- Command/ImportFeed.hs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
-index d82d734..647cd26 100644
---- a/Command/ImportFeed.hs
-+++ b/Command/ImportFeed.hs
-@@ -148,7 +148,7 @@ findDownloads u = go =<< downloadFeed u
- )
- Nothing -> return Nothing
- #else
-- mkquvi = return Nothing
-+ mkquvi _ _ = return Nothing
- #endif
-
- {- Feeds change, so a feed download cannot be resumed. -}
---
-2.5.0
-
diff --git a/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch b/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
deleted file mode 100644
index 3e0454e..0000000
--- a/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4613735d3e61082ec63c0c5982441330adcf32a2 Mon Sep 17 00:00:00 2001
-From: Ben Boeckel <mathstuf(a)gmail.com>
-Date: Sun, 23 Aug 2015 18:02:29 -0400
-Subject: [PATCH] fsck: move ScheduleIncremental inside WITH_DATABASE
-
----
- Command/Fsck.hs | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Command/Fsck.hs b/Command/Fsck.hs
-index c3b73ed..3104e54 100644
---- a/Command/Fsck.hs
-+++ b/Command/Fsck.hs
-@@ -457,8 +457,8 @@ runFsck inc file key a = ifM (needFsck inc key)
-
- {- Check if a key needs to be fscked, with support for incremental fscks. -}
- needFsck :: Incremental -> Key -> Annex Bool
--needFsck (ScheduleIncremental _ _ i) k = needFsck i k
- #ifdef WITH_DATABASE
-+needFsck (ScheduleIncremental _ _ i) k = needFsck i k
- needFsck (ContIncremental h) key = liftIO $ not <$> FsckDb.inDb h key
- #endif
- needFsck _ _ = return True
-@@ -547,6 +547,7 @@ prepIncremental _ _ = error "This git-annex was not built with database support;
- #endif
-
- cleanupIncremental :: Incremental -> Annex ()
-+#if WITH_DATABASE
- cleanupIncremental (ScheduleIncremental delta u i) = do
- v <- getStartTime u
- case v of
-@@ -556,6 +557,7 @@ cleanupIncremental (ScheduleIncremental delta u i) = do
- when (now - realToFrac started >= durationToPOSIXTime delta) $
- resetStartTime u
- cleanupIncremental i
-+#endif
- cleanupIncremental _ = return ()
-
- #ifdef WITH_DATABASE
---
-2.5.0
-
diff --git a/git-annex-5.20150812-flags.patch b/git-annex-5.20150812-flags.patch
deleted file mode 100644
index 9ecc06c..0000000
--- a/git-annex-5.20150812-flags.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -u -r -U5 --no-dereference git-annex-5.20150812/git-annex.cabal git-annex-5.20150812.flags/git-annex.cabal
---- git-annex-5.20150812/git-annex.cabal 2015-08-12 11:25:41.000000000 -0400
-+++ git-annex-5.20150812.flags/git-annex.cabal 2015-08-23 15:32:06.898329682 -0400
-@@ -31,40 +31,51 @@
- to git and transferring them to other computers. The git-annex webapp
- makes it easy to set up and use git-annex this way.
-
- Flag S3
- Description: Enable S3 support
-+ Default: False
-
- Flag WebDAV
- Description: Enable WebDAV support
-+ Default: False
-
- Flag Inotify
- Description: Enable inotify support
-+ Default: True
-
- Flag Dbus
- Description: Enable dbus support
-+ Default: True
-
- Flag Assistant
- Description: Enable git-annex assistant and watch command
-+ Default: True
-
- Flag Webapp
- Description: Enable git-annex webapp
-+ Default: False
-
- Flag Webapp-secure
- Description: Secure webapp
-+ Default: False
-
- Flag Pairing
- Description: Enable pairing
-+ Default: False
-
- Flag XMPP
- Description: Enable notifications using XMPP
-+ Default: False
-
- Flag DNS
- Description: Enable the haskell DNS library for DNS lookup
-+ Default: False
-
- Flag Production
- Description: Enable production build (slower build; faster binary)
-+ Default: True
-
- Flag Android
- Description: Cross building for Android
- Default: False
-
-@@ -72,28 +83,35 @@
- Description: Building to get TH splices for Android
- Default: False
-
- Flag TestSuite
- Description: Embed the test suite into git-annex
-+ Default: False
-
- Flag TDFA
- Description: Use regex-tdfa for wildcards
-+ Default: False
-
- Flag Feed
- Description: Enable podcast feed support
-+ Default: True
-
- Flag Quvi
- Description: Enable use of quvi to download videos
-+ Default: False
-
- Flag Tahoe
- Description: Enable the tahoe special remote
-+ Default: False
-
- Flag DesktopNotify
- Description: Enable desktop environment notifications
-+ Default: True
-
- Flag TorrentParser
- Description: Use haskell torrent library to parse torrent files
-+ Default: False
-
- Flag AsciiProgress
- Description: Use ascii-progress library (experimental)
- Default: False
-
-@@ -105,14 +123,15 @@
- Description: Get Network.URI from the network-uri package
- Default: True
-
- Flag Database
- Description: Enable building with persistent for database use (disable to build on platforms not supporting TH)
-- Default: True
-+ Default: False
-
- Flag Cryptonite
- Description: Use the cryptonite library, instead of the older cryptohash
-+ Default: False
-
- Executable git-annex
- Main-Is: git-annex.hs
- Build-Depends:
- base (>= 4.5 && < 4.9),
-Only in git-annex-5.20150812.flags: git-annex.cabal.orig
-Only in git-annex-5.20150812.flags: git-annex.cabal.rej
diff --git a/git-annex-6.20160419-flags.patch b/git-annex-6.20160419-flags.patch
new file mode 100644
index 0000000..9ca51ec
--- /dev/null
+++ b/git-annex-6.20160419-flags.patch
@@ -0,0 +1,65 @@
+--- git-annex-6.20160419/git-annex.cabal.orig 2016-04-25 23:49:12.342433405 -0400
++++ git-annex-6.20160419/git-annex.cabal 2016-04-26 00:09:03.870091223 -0400
+@@ -33,21 +33,27 @@ Description:
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: False
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: False
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+@@ -59,15 +65,18 @@ Flag AndroidSplice
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
+
+ Flag MagicMime
+ Description: Use libmagic to determine file MIME types
++ Default: False
+
+ Flag ConcurrentOutput
+ Description: Use concurrent-output library
++ Default: False
+
+ Flag EKG
+ Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
+@@ -83,12 +92,15 @@ Flag network-uri
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: False
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: False
+
+ Executable git-annex
+ Main-Is: git-annex.hs
diff --git a/git-annex.spec b/git-annex.spec
index 09dc2a4..1d17667 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,18 +3,14 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 5.20150812
+Version: 6.20160419
Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
-Patch0: git-annex-5.20150812-flags.patch
-# https://github.com/joeyh/git-annex/pull/45
-Patch1: 0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
-# https://github.com/joeyh/git-annex/pull/46
-Patch2: 0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
+Patch0: git-annex-6.20160419-flags.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -34,14 +30,17 @@ BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
BuildRequires: ghc-dbus-devel
BuildRequires: ghc-directory-devel
+BuildRequires: ghc-disk-free-space-devel
BuildRequires: ghc-dlist-devel
BuildRequires: ghc-edit-distance-devel
+BuildRequires: ghc-esqueleto-devel
BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-fdo-notify-devel
BuildRequires: ghc-feed-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hinotify-devel
BuildRequires: ghc-hslogger-devel
+BuildRequires: ghc-http-client-devel
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-http-types-devel
BuildRequires: ghc-json-devel
@@ -52,6 +51,9 @@ BuildRequires: ghc-network-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-optparse-applicative-devel
+BuildRequires: ghc-persistent-devel
+BuildRequires: ghc-persistent-sqlite-devel
+BuildRequires: ghc-persistent-template-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
BuildRequires: ghc-regex-tdfa-devel
@@ -74,13 +76,13 @@ BuildRequires: perl(Image::Magick)
%endif
# XXX: feature flag dependencies:
+#Benchmark:
+# BuildRequires: ghc-criterion-devel (unpackaged)
+# BuildRequires: ghc-deepseq-devel
+#ConcurrentOutput:
+# BuildRequires: ghc-concurrent-output-devel (unpackaged)
#DNS:
# BuildRequires: ghc-dns-devel (unpackaged)
-#Database:
-# BuildRequires: ghc-esqueleto-devel (unpackaged)
-# BuildRequires: ghc-persistent-devel (unpackaged)
-# BuildRequires: ghc-persistent-sqlite-devel (unpackaged)
-# BuildRequires: ghc-persistent-template-devel (unpackaged)
#Pairing:
# BuildRequires: ghc-network-info-devel (unpackaged)
# BuildRequires: ghc-network-multicast-devel (unpackaged)
@@ -115,9 +117,8 @@ BuildRequires: perl(Image::Magick)
# BuildRequires: ghc-yesod-devel (unpackaged)
# BuildRequires: ghc-yesod-form-devel (unpackaged)
# BuildRequires: ghc-yesod-static-devel (unpackaged)
-#Webapp-secure:
-# BuildRequires: ghc-byteable-devel
-# BuildRequires: ghc-securemem-devel
+#MagicMime:
+# BuildRequires: ghc-magic-devel (unpackaged)
#XMPP:
# BuildRequires: ghc-gnutls-devel (unpackaged)
# BuildRequires: ghc-network-protocol-xmpp-devel (unpackaged)
@@ -171,8 +172,6 @@ This package contains the documentation for %{name} in HTML format.
%prep
%setup -q
%patch0 -p1 -b .flags
-%patch1 -p1 -b .no-database
-%patch2 -p1 -b .no-quvi
%build
@@ -208,6 +207,9 @@ make git-annex.1 git-annex-shell.1
%changelog
+* Fri Apr 29 2016 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 6.20160419-1
+- Update to 6.20160419
+
* Sun Aug 23 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20150812-1
- update to 5.20150812
diff --git a/sources b/sources
index cdc7ce7..6efdfca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-5.20150812.tar.gz) = 68ebe51049ee5d5f5be98ae8832a7522b631286ec030969f7305216736f302572db3172aa6f6a6f94488d588314ac55e6bdec8b3ec3b1454e4ac055a2883d40d
+SHA512 (git-annex-6.20160419.tar.gz) = b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118
commit c1e343027ab759f6fd1e9f0a8fa2d9d5cf11df33
Author: Ben Boeckel <mathstuf(a)gmail.com>
Date: Sun Aug 23 04:52:54 2015 -0400
Update to 5.20150812.
diff --git a/.gitignore b/.gitignore
index 433770c..900f8fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/git-annex-5.20140116.tar.gz
/git-annex-5.20140221.tar.gz
/git-annex-5.20140717.tar.gz
+/git-annex-5.20150812.tar.gz
diff --git a/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch b/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
new file mode 100644
index 0000000..f9a9791
--- /dev/null
+++ b/0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
@@ -0,0 +1,25 @@
+From b762790c196f61287a1da837754cd9013f26ca66 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <mathstuf(a)gmail.com>
+Date: Sun, 23 Aug 2015 18:23:27 -0400
+Subject: [PATCH] ImportFeed: fix signature of mkquvi without libquvi
+
+---
+ Command/ImportFeed.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
+index d82d734..647cd26 100644
+--- a/Command/ImportFeed.hs
++++ b/Command/ImportFeed.hs
+@@ -148,7 +148,7 @@ findDownloads u = go =<< downloadFeed u
+ )
+ Nothing -> return Nothing
+ #else
+- mkquvi = return Nothing
++ mkquvi _ _ = return Nothing
+ #endif
+
+ {- Feeds change, so a feed download cannot be resumed. -}
+--
+2.5.0
+
diff --git a/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch b/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
new file mode 100644
index 0000000..3e0454e
--- /dev/null
+++ b/0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
@@ -0,0 +1,42 @@
+From 4613735d3e61082ec63c0c5982441330adcf32a2 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <mathstuf(a)gmail.com>
+Date: Sun, 23 Aug 2015 18:02:29 -0400
+Subject: [PATCH] fsck: move ScheduleIncremental inside WITH_DATABASE
+
+---
+ Command/Fsck.hs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Command/Fsck.hs b/Command/Fsck.hs
+index c3b73ed..3104e54 100644
+--- a/Command/Fsck.hs
++++ b/Command/Fsck.hs
+@@ -457,8 +457,8 @@ runFsck inc file key a = ifM (needFsck inc key)
+
+ {- Check if a key needs to be fscked, with support for incremental fscks. -}
+ needFsck :: Incremental -> Key -> Annex Bool
+-needFsck (ScheduleIncremental _ _ i) k = needFsck i k
+ #ifdef WITH_DATABASE
++needFsck (ScheduleIncremental _ _ i) k = needFsck i k
+ needFsck (ContIncremental h) key = liftIO $ not <$> FsckDb.inDb h key
+ #endif
+ needFsck _ _ = return True
+@@ -547,6 +547,7 @@ prepIncremental _ _ = error "This git-annex was not built with database support;
+ #endif
+
+ cleanupIncremental :: Incremental -> Annex ()
++#if WITH_DATABASE
+ cleanupIncremental (ScheduleIncremental delta u i) = do
+ v <- getStartTime u
+ case v of
+@@ -556,6 +557,7 @@ cleanupIncremental (ScheduleIncremental delta u i) = do
+ when (now - realToFrac started >= durationToPOSIXTime delta) $
+ resetStartTime u
+ cleanupIncremental i
++#endif
+ cleanupIncremental _ = return ()
+
+ #ifdef WITH_DATABASE
+--
+2.5.0
+
diff --git a/git-annex-5.20150812-flags.patch b/git-annex-5.20150812-flags.patch
new file mode 100644
index 0000000..9ecc06c
--- /dev/null
+++ b/git-annex-5.20150812-flags.patch
@@ -0,0 +1,110 @@
+diff -u -r -U5 --no-dereference git-annex-5.20150812/git-annex.cabal git-annex-5.20150812.flags/git-annex.cabal
+--- git-annex-5.20150812/git-annex.cabal 2015-08-12 11:25:41.000000000 -0400
++++ git-annex-5.20150812.flags/git-annex.cabal 2015-08-23 15:32:06.898329682 -0400
+@@ -31,40 +31,51 @@
+ to git and transferring them to other computers. The git-annex webapp
+ makes it easy to set up and use git-annex this way.
+
+ Flag S3
+ Description: Enable S3 support
++ Default: False
+
+ Flag WebDAV
+ Description: Enable WebDAV support
++ Default: False
+
+ Flag Inotify
+ Description: Enable inotify support
++ Default: True
+
+ Flag Dbus
+ Description: Enable dbus support
++ Default: True
+
+ Flag Assistant
+ Description: Enable git-annex assistant and watch command
++ Default: True
+
+ Flag Webapp
+ Description: Enable git-annex webapp
++ Default: False
+
+ Flag Webapp-secure
+ Description: Secure webapp
++ Default: False
+
+ Flag Pairing
+ Description: Enable pairing
++ Default: False
+
+ Flag XMPP
+ Description: Enable notifications using XMPP
++ Default: False
+
+ Flag DNS
+ Description: Enable the haskell DNS library for DNS lookup
++ Default: False
+
+ Flag Production
+ Description: Enable production build (slower build; faster binary)
++ Default: True
+
+ Flag Android
+ Description: Cross building for Android
+ Default: False
+
+@@ -72,28 +83,35 @@
+ Description: Building to get TH splices for Android
+ Default: False
+
+ Flag TestSuite
+ Description: Embed the test suite into git-annex
++ Default: False
+
+ Flag TDFA
+ Description: Use regex-tdfa for wildcards
++ Default: False
+
+ Flag Feed
+ Description: Enable podcast feed support
++ Default: True
+
+ Flag Quvi
+ Description: Enable use of quvi to download videos
++ Default: False
+
+ Flag Tahoe
+ Description: Enable the tahoe special remote
++ Default: False
+
+ Flag DesktopNotify
+ Description: Enable desktop environment notifications
++ Default: True
+
+ Flag TorrentParser
+ Description: Use haskell torrent library to parse torrent files
++ Default: False
+
+ Flag AsciiProgress
+ Description: Use ascii-progress library (experimental)
+ Default: False
+
+@@ -105,14 +123,15 @@
+ Description: Get Network.URI from the network-uri package
+ Default: True
+
+ Flag Database
+ Description: Enable building with persistent for database use (disable to build on platforms not supporting TH)
+- Default: True
++ Default: False
+
+ Flag Cryptonite
+ Description: Use the cryptonite library, instead of the older cryptohash
++ Default: False
+
+ Executable git-annex
+ Main-Is: git-annex.hs
+ Build-Depends:
+ base (>= 4.5 && < 4.9),
+Only in git-annex-5.20150812.flags: git-annex.cabal.orig
+Only in git-annex-5.20150812.flags: git-annex.cabal.rej
diff --git a/git-annex.spec b/git-annex.spec
index 2841869..09dc2a4 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,23 +3,26 @@
%bcond_without ikiwiki
Name: git-annex
-Version: 5.20140717
-Release: 8%{?dist}
+Version: 5.20150812
+Release: 1%{?dist}
Summary: Manage files with git, without checking their contents into git
License: GPLv3+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}...
-Patch0: git-annex-default-flags.patch
+Patch0: git-annex-5.20150812-flags.patch
+# https://github.com/joeyh/git-annex/pull/45
+Patch1: 0001-fsck-move-ScheduleIncremental-inside-WITH_DATABASE.patch
+# https://github.com/joeyh/git-annex/pull/46
+Patch2: 0001-ImportFeed-fix-signature-of-mkquvi-without-libquvi.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
+BuildRequires: cabal-install
# Begin cabal-rpm deps:
-BuildRequires: ghc-HTTP-devel
BuildRequires: ghc-IfElse-devel
BuildRequires: ghc-MissingH-devel
BuildRequires: ghc-QuickCheck-devel
-BuildRequires: ghc-SHA-devel
BuildRequires: ghc-SafeSemaphore-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-async-devel
@@ -27,33 +30,42 @@ BuildRequires: ghc-bloomfilter-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
BuildRequires: ghc-containers-devel
-BuildRequires: ghc-cryptohash-devel
+BuildRequires: ghc-cryptonite-devel
BuildRequires: ghc-data-default-devel
-BuildRequires: ghc-dataenc-devel
BuildRequires: ghc-dbus-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-dlist-devel
BuildRequires: ghc-edit-distance-devel
BuildRequires: ghc-exceptions-devel
-BuildRequires: ghc-extensible-exceptions-devel
+BuildRequires: ghc-fdo-notify-devel
+BuildRequires: ghc-feed-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hinotify-devel
BuildRequires: ghc-hslogger-devel
+BuildRequires: ghc-http-conduit-devel
+BuildRequires: ghc-http-types-devel
BuildRequires: ghc-json-devel
BuildRequires: ghc-monad-control-devel
+BuildRequires: ghc-monad-logger-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
+BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-old-locale-devel
+BuildRequires: ghc-optparse-applicative-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
BuildRequires: ghc-regex-tdfa-devel
+BuildRequires: ghc-resourcet-devel
+BuildRequires: ghc-sandi-devel
BuildRequires: ghc-stm-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
+BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-uuid-devel
+ExclusiveArch: %{ghc_arches_with_ghci}
# End cabal-rpm deps
BuildRequires: git
%if %{with ikiwiki}
@@ -61,6 +73,56 @@ BuildRequires: ikiwiki
BuildRequires: perl(Image::Magick)
%endif
+# XXX: feature flag dependencies:
+#DNS:
+# BuildRequires: ghc-dns-devel (unpackaged)
+#Database:
+# BuildRequires: ghc-esqueleto-devel (unpackaged)
+# BuildRequires: ghc-persistent-devel (unpackaged)
+# BuildRequires: ghc-persistent-sqlite-devel (unpackaged)
+# BuildRequires: ghc-persistent-template-devel (unpackaged)
+#Pairing:
+# BuildRequires: ghc-network-info-devel (unpackaged)
+# BuildRequires: ghc-network-multicast-devel (unpackaged)
+#S3:
+# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
+# BuildRequires: ghc-aws-devel (unpackaged)
+# BuildRequires: ghc-conduit-devel
+# BuildRequires: ghc-conduit-extra-devel
+#TestSuite:
+# BuildRequires: ghc-crypto-api-devel
+# BuildRequires: ghc-tasty-devel (unpackaged)
+# BuildRequires: ghc-tasty-hunit-devel (unpackaged)
+# BuildRequires: ghc-tasty-quickcheck-devel (unpackaged)
+# BuildRequires: ghc-tasty-rerun-devel (unpackaged)
+#TorrentParser:
+# BuildRequires: ghc-torrent-devel (unpackaged)
+#WebDAV:
+# BuildRequires: ghc-DAV-devel (unpackaged)
+# BuildRequires: ghc-http-client-devel (RHBZ #1256073)
+#Webapp:
+# BuildRequires: ghc-blaze-builder-devel
+# BuildRequires: ghc-clientsession-devel (unpackaged)
+# BuildRequires: ghc-path-pieces-devel
+# BuildRequires: ghc-shakespeare-devel
+# BuildRequires: ghc-template-haskell-devel
+# BuildRequires: ghc-wai-devel
+# BuildRequires: ghc-wai-extra-devel
+# BuildRequires: ghc-warp-devel
+# BuildRequires: ghc-warp-tls-devel (unpackaged)
+# BuildRequires: ghc-yesod-core-devel (unpackaged)
+# BuildRequires: ghc-yesod-default-devel (unpackaged)
+# BuildRequires: ghc-yesod-devel (unpackaged)
+# BuildRequires: ghc-yesod-form-devel (unpackaged)
+# BuildRequires: ghc-yesod-static-devel (unpackaged)
+#Webapp-secure:
+# BuildRequires: ghc-byteable-devel
+# BuildRequires: ghc-securemem-devel
+#XMPP:
+# BuildRequires: ghc-gnutls-devel (unpackaged)
+# BuildRequires: ghc-network-protocol-xmpp-devel (unpackaged)
+# BuildRequires: ghc-xml-types-devel
+
Requires: git
%description
@@ -83,6 +145,19 @@ on. Pushing to another git repository will make git-annex there aware of the
annexed file, and it can be used to retrieve its content from the key-value
store.
+# XXX: replace basic description since it references features not built here.
+#It can store large files in many places, from local hard drives, to a large
+#number of cloud storage services, including S3, WebDAV, and rsync, with a dozen
+#cloud storage providers usable via plugins. Files can be stored encrypted with
+#gpg, so that the cloud storage provider cannot see your data.
+#git-annex keeps track of where each file is stored, so it knows how many copies
+#are available, and has many facilities to ensure your data is preserved.
+#
+#git-annex can also be used to keep a folder in sync between computers, noticing
+#when files are changed, and automatically committing them to git and
+#transferring them to other computers. The git-annex webapp makes it easy to set
+#up and use git-annex this way.
+
%if %{with ikiwiki}
%package docs
Summary: %{summary}
@@ -96,9 +171,17 @@ This package contains the documentation for %{name} in HTML format.
%prep
%setup -q
%patch0 -p1 -b .flags
+%patch1 -p1 -b .no-database
+%patch2 -p1 -b .no-quvi
%build
+# XXX: Use cabal configure instead of ./Setup configure.
+# https://git-annex.branchable.com/bugs/OOM_while_configuring_git-annex/#co...
+%global cabal \
+LANG=en_US.utf8 \
+cabal
+
%ghc_bin_build
%if %{with ikiwiki}
@@ -110,19 +193,13 @@ make git-annex.1 git-annex-shell.1
%install
%ghc_bin_install
-ln -s %{name} %{buildroot}%{_bindir}/%{name}-shell
-
-mkdir -p %{buildroot}%{_mandir}/man1
-install -m 0644 git-annex.1 %{buildroot}%{_mandir}/man1
-install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
%files
%doc COPYRIGHT README debian/changelog
%attr(755,root,root) %{_bindir}/%{name}
%{_bindir}/%{name}-shell
-%{_mandir}/man1/git-annex.1*
-%{_mandir}/man1/git-annex-shell.1*
+%{_mandir}/man1/git-annex*
%if %{with ikiwiki}
%files docs
@@ -131,6 +208,9 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
%changelog
+* Sun Aug 23 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20150812-1
+- update to 5.20150812
+
* Sat Aug 08 2015 Ben Boeckel <mathstuf(a)gmail.com> - 5.20140717-8
- rebuild for ghc-edit-distance and ghc-bloomfilter
diff --git a/sources b/sources
index 2c5003a..cdc7ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dabee1f57b0c4da3ee5359f3787cb16e git-annex-5.20140717.tar.gz
+SHA512 (git-annex-5.20150812.tar.gz) = 68ebe51049ee5d5f5be98ae8832a7522b631286ec030969f7305216736f302572db3172aa6f6a6f94488d588314ac55e6bdec8b3ec3b1454e4ac055a2883d40d
6 years, 7 months
Architecture specific change in rpms/libiscsi.git
by githook-noreply@fedoraproject.org
The package rpms/libiscsi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libiscsi.git/commit/?id=af96b5f0d....
Change:
+%ifnarch armv7hl
Thanks.
Full change:
============
commit af96b5f0d3623028b9912bf9534189c685dbcc8d
Author: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Tue Oct 3 17:23:48 2017 +0200
fix armv7hl build
diff --git a/libiscsi.spec b/libiscsi.spec
index 9b29a59..ca5a376 100644
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -18,8 +18,10 @@ BuildRequires: popt-devel
BuildRequires: CUnit-devel
BuildRequires: libgcrypt-devel
+%ifnarch armv7hl
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
+%endif
%description
libiscsi is a library for attaching to iSCSI resources across
6 years, 7 months
Architecture specific change in rpms/glusterfs.git
by githook-noreply@fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=e43af053....
Change:
+%ifarch s390 s390x %{arm}
Thanks.
Full change:
============
commit e43af053e2972d37f1bc2fe80264b9691919e03f
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Oct 3 10:14:07 2017 -0400
3.10.6 GA
diff --git a/glusterfs.spec b/glusterfs.spec
index 355f777..ff7c68c 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -22,7 +22,7 @@
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
# No RDMA Support on s390(x)
-%ifarch s390 s390x
+%ifarch s390 s390x %{arm}
%global _without_rdma --disable-ibverbs
%endif
@@ -100,8 +100,6 @@
%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%global _rundir %{_localstatedir}/run
-%else
-%global _rundir /run
%endif
%if ( 0%{?_with_systemd:1} )
@@ -170,7 +168,7 @@
Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
-Version: 3.10.5
+Version: 3.10.6
Release: 1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
@@ -543,8 +541,12 @@ Obsoletes: python-gluster < 3.10
%package rdma
Summary: GlusterFS rdma support for ib-verbs
Group: Applications/File
+%if ( 0%{?fedora} && 0%{?fedora} > 26 )
+BuildRequires: rdma-core-devel
+%else
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel >= 1.0.15
+%endif
Requires: %{name} = %{version}-%{release}
%description rdma
@@ -1389,6 +1391,9 @@ exit 0
%endif
%changelog
+* Tue Oct 3 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-1
+- 3.10.6 GA
+
* Sat Aug 12 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.5-1
- 3.10.5 GA
diff --git a/sources b/sources
index 195f00b..dd80a72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.10.5.tar.gz) = c83187545517527e59de41a0d431cd99f535bd47be93a5ea82a2a0fef4600c06d12f1e5b3e0963569680f2a02bf96ad0a380b9fb5077b473453613ec5e538776
+SHA512 (glusterfs-3.10.6.tar.gz) = db9e22c2992dc20e4542634c8c3406d082b0678fdd0678b6538877f9ee4f7d7a8eb01c8ec0183de5f2cf1031d440685f91d160636e423d19f049b64d1c8a0a6e
6 years, 7 months
Architecture specific change in rpms/nss-softokn.git
by githook-noreply@fedoraproject.org
The package rpms/nss-softokn.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss-softokn.git/commit/?id=0abb65....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit 0abb65b5997ff1114d8657869ff284167095bb7c
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Tue Oct 3 14:03:25 2017 +0200
Update to NSS 3.33.0
diff --git a/.gitignore b/.gitignore
index 7450aa1..5eafc5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/nss-softokn-3.30.2.tar.gz
/nss-softokn-3.31.0.tar.gz
/nss-softokn-3.32.0.tar.gz
+/nss-softokn-3.33.0.tar.gz
diff --git a/iquote.patch b/iquote.patch
index f87f10e..8cd372a 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -1,39 +1,13 @@
-diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
---- ./nss/cmd/bltest/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/cmd/bltest/Makefile 2016-06-24 15:04:36.742545266 -0700
-@@ -45,6 +45,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (6) Execute "component" rules. (OPTIONAL) #
- #######################################################################
-
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
-
-
- #######################################################################
-diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
---- ./nss/coreconf/location.mk.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/coreconf/location.mk 2016-06-24 15:04:36.820545264 -0700
-@@ -45,6 +45,10 @@ endif
-
- ifdef NSS_INCLUDE_DIR
- INCLUDES += -I$(NSS_INCLUDE_DIR)
-+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
-+ INCLUDES += -iquote $(DIST)/../public/nss
-+ INCLUDES += -iquote $(DIST)/../private/nss
-+ endif
- endif
-
- ifndef NSS_LIB_DIR
-diff -up ./nss/lib/softoken/Makefile.iquote ./nss/lib/softoken/Makefile
---- ./nss/lib/softoken/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/lib/softoken/Makefile 2016-06-24 15:04:36.820545264 -0700
-@@ -52,6 +52,9 @@ ifdef NSS_DISABLE_DBM
- DIRS=
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote 2017-07-27 16:09:32.000000000 +0200
++++ nss/coreconf/location.mk 2017-08-30 15:17:56.553361830 +0200
+@@ -75,4 +75,9 @@ ifndef SQLITE_LIB_NAME
+ SQLITE_LIB_NAME = sqlite3
endif
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
++# Prefer in-tree headers over system headers
++ifdef IN_TREE_FREEBL_HEADERS_FIRST
++ INCLUDES += -iquote $(DIST)/../public/nss -iquote $(DIST)/../private/nss
++endif
+
- #######################################################################
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
+ MK_LOCATION = included
diff --git a/nss-softokn-add_encrypt_derive.patch b/nss-softokn-add_encrypt_derive.patch
index 89cc516..e6a04db 100644
--- a/nss-softokn-add_encrypt_derive.patch
+++ b/nss-softokn-add_encrypt_derive.patch
@@ -1,7 +1,7 @@
-diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive ./lib/softoken/pkcs11.c
---- ./lib/softoken/pkcs11.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11.c 2017-08-11 09:34:37.633756798 -0700
-@@ -423,11 +423,22 @@ static const struct mechanismList mechan
+diff -up nss/lib/softoken/pkcs11.c.add_encrypt_derive nss/lib/softoken/pkcs11.c
+--- nss/lib/softoken/pkcs11.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11.c 2017-10-03 13:48:02.077083318 +0200
+@@ -421,11 +421,22 @@ static const struct mechanismList mechan
#endif
/* --------------------- Secret Key Operations ------------------------ */
{ CKM_GENERIC_SECRET_KEY_GEN, { 1, 32, CKF_GENERATE }, PR_TRUE },
@@ -28,11 +28,11 @@ diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive ./lib/softoken/pkcs11.c
/* ---------------------- SSL Key Derivations ------------------------- */
{ CKM_SSL3_PRE_MASTER_KEY_GEN, { 48, 48, CKF_GENERATE }, PR_FALSE },
{ CKM_SSL3_MASTER_KEY_DERIVE, { 48, 48, CKF_DERIVE }, PR_FALSE },
-diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
---- ./lib/softoken/pkcs11c.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11c.c 2017-08-11 09:45:01.285575175 -0700
-@@ -6269,6 +6269,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
- #endif /* NSS_DISABLE_ECC */
+diff -up nss/lib/softoken/pkcs11c.c.add_encrypt_derive nss/lib/softoken/pkcs11c.c
+--- nss/lib/softoken/pkcs11c.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11c.c 2017-10-03 13:48:40.428235402 +0200
+@@ -6242,6 +6242,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
+ }
/*
+ * Handle The derive from a block encryption cipher
@@ -76,7 +76,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
* SSL Key generation given pre master secret
*/
#define NUM_MIXERS 9
-@@ -6313,6 +6351,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6286,6 +6324,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
CK_KEY_TYPE keyType = CKK_GENERIC_SECRET;
CK_OBJECT_CLASS classType = CKO_SECRET_KEY;
CK_KEY_DERIVATION_STRING_DATA *stringPtr;
@@ -86,7 +86,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
CK_MECHANISM_TYPE mechanism = pMechanism->mechanism;
PRBool isTLS = PR_FALSE;
PRBool isDH = PR_FALSE;
-@@ -6322,6 +6363,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6295,6 +6336,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
unsigned int outLen;
unsigned char sha_out[SHA1_LENGTH];
unsigned char key_block[NUM_MIXERS * SFTK_MAX_MAC_LENGTH];
@@ -94,7 +94,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
PRBool isFIPS;
HASH_HashType hashType;
PRBool extractValue = PR_TRUE;
-@@ -6926,6 +6968,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6899,6 +6941,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
break;
}
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 4e712b7..45edd0d 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.16.0
+%global nspr_version 4.17.0
%global nss_name nss
-%global nss_util_version 3.32.0
+%global nss_util_version 3.33.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
%global prelink_conf_dir %{_sysconfdir}/prelink.conf.d/
@@ -29,10 +29,10 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.32.0
+Version: 3.33.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 1.2%{?dist}
+Release: 1.0%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -67,23 +67,23 @@ Source4: nss-softokn-prelink.conf
Source5: nss-softokn-dracut-module-setup.sh
Source6: nss-softokn-dracut.conf
-# Select the tests to run based on the type of build
-# This patch uses the gcc-iquote dir option documented at
+# This patch uses the GCC -iquote option documented at
# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
-# to place the in-tree directories at the head of the list on list of directories
-# to be searched for for header files. This ensures a build even when system freebl
-# headers are older. Such is the case when we are starting a major update.
-# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers.
-# Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
+# to give the in-tree headers a higher priority over the system headers,
+# when they are included through the quote form (#include "file.h").
+#
+# This ensures a build even when system freebl headers are older. Such
+# is the case when we are starting a major update.
+#
+# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl
+# headers. Once has been bootstapped the patch may be removed, but it
+# doesn't hurt to keep it.
Patch10: iquote.patch
# Patch adapted from rhel-7
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1236720
Patch11: nss-softokn-add_encrypt_derive.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1389052
-Patch12: nss-softokn-aligned_alloc.patch
-
%description
Network Security Services Softoken Cryptographic Module
@@ -133,11 +133,10 @@ Header and library files for doing development with Network Security Services.
%prep
%setup -q
-# activate if needed when doing a major update with new apis
-%patch10 -p0 -b .iquote
pushd nss
-%patch11 -p0 -b .add_encrypt_derive
-%patch12 -p1 -b .aligned_alloc
+# activate if needed when doing a major update with new apis
+%patch10 -p1 -b .iquote
+%patch11 -p1 -b .add_encrypt_derive
popd
%build
@@ -166,6 +165,13 @@ export BUILD_OPT=1
# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
+# In Fedora 27, we still don't allow SSE2 on i686
+%ifarch i686
+XCFLAGS="$XCFLAGS -mno-sse2"
+export NSS_DISABLE_PCLMUL=1
+export NSS_DISABLE_HW_AES=1
+export NSS_DISABLE_AVX=1
+%endif
export XCFLAGS
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -437,6 +443,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Tue Oct 3 2017 Daiki Ueno <dueno(a)redhat.com> - 3.33.0-1.0
+- Update to NSS 3.33.0
+- Update iquote.patch to really prefer in-tree headers over system headers
+
* Fri Aug 11 2017 Elio Maldonado <elio.maldonado.batiz(a)gmail.com> - 3.32.0-1.2
- Restore missing portions of add encrypt derive patch
diff --git a/sources b/sources
index 5b1aaa5..3b5bf3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nss-softokn-3.32.0.tar.gz) = 3c2deaa1bfe4509efd1f2c65cc4a7b4dc8178cc80124b0279b9ecd0cbea7b13b71dffa9027750b70a5a9ef094eb2e1827f214f953945cc00790fba867d8b7887
+SHA512 (nss-softokn-3.33.0.tar.gz) = 16688e71ee775b1a4ffaa93577b1f46664204b698e574198bc204a9d3451180f6962a73ada9b3427e9f0c094e3d1b1a86c1a9261e4e36f42959aef6ebb51452c
6 years, 7 months
Architecture specific change in rpms/nss-softokn.git
by githook-noreply@fedoraproject.org
The package rpms/nss-softokn.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss-softokn.git/commit/?id=adde27....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit adde27e55ecda414c684728b31dd4b7a049bac5e
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Tue Oct 3 13:55:18 2017 +0200
Update to NSS 3.33.0
diff --git a/.gitignore b/.gitignore
index efa7ada..5f0af4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/nss-softokn-3.30.2.tar.gz
/nss-softokn-3.31.0.tar.gz
/nss-softokn-3.32.0.tar.gz
+/nss-softokn-3.33.0.tar.gz
diff --git a/iquote.patch b/iquote.patch
index f87f10e..8cd372a 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -1,39 +1,13 @@
-diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
---- ./nss/cmd/bltest/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/cmd/bltest/Makefile 2016-06-24 15:04:36.742545266 -0700
-@@ -45,6 +45,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (6) Execute "component" rules. (OPTIONAL) #
- #######################################################################
-
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
-
-
- #######################################################################
-diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
---- ./nss/coreconf/location.mk.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/coreconf/location.mk 2016-06-24 15:04:36.820545264 -0700
-@@ -45,6 +45,10 @@ endif
-
- ifdef NSS_INCLUDE_DIR
- INCLUDES += -I$(NSS_INCLUDE_DIR)
-+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
-+ INCLUDES += -iquote $(DIST)/../public/nss
-+ INCLUDES += -iquote $(DIST)/../private/nss
-+ endif
- endif
-
- ifndef NSS_LIB_DIR
-diff -up ./nss/lib/softoken/Makefile.iquote ./nss/lib/softoken/Makefile
---- ./nss/lib/softoken/Makefile.iquote 2016-06-20 10:11:28.000000000 -0700
-+++ ./nss/lib/softoken/Makefile 2016-06-24 15:04:36.820545264 -0700
-@@ -52,6 +52,9 @@ ifdef NSS_DISABLE_DBM
- DIRS=
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote 2017-07-27 16:09:32.000000000 +0200
++++ nss/coreconf/location.mk 2017-08-30 15:17:56.553361830 +0200
+@@ -75,4 +75,9 @@ ifndef SQLITE_LIB_NAME
+ SQLITE_LIB_NAME = sqlite3
endif
-+INCLUDES += -iquote $(DIST)/../public/nss
-+INCLUDES += -iquote $(DIST)/../private/nss
++# Prefer in-tree headers over system headers
++ifdef IN_TREE_FREEBL_HEADERS_FIRST
++ INCLUDES += -iquote $(DIST)/../public/nss -iquote $(DIST)/../private/nss
++endif
+
- #######################################################################
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
+ MK_LOCATION = included
diff --git a/nss-softokn-add_encrypt_derive.patch b/nss-softokn-add_encrypt_derive.patch
index 89cc516..e6a04db 100644
--- a/nss-softokn-add_encrypt_derive.patch
+++ b/nss-softokn-add_encrypt_derive.patch
@@ -1,7 +1,7 @@
-diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive ./lib/softoken/pkcs11.c
---- ./lib/softoken/pkcs11.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11.c 2017-08-11 09:34:37.633756798 -0700
-@@ -423,11 +423,22 @@ static const struct mechanismList mechan
+diff -up nss/lib/softoken/pkcs11.c.add_encrypt_derive nss/lib/softoken/pkcs11.c
+--- nss/lib/softoken/pkcs11.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11.c 2017-10-03 13:48:02.077083318 +0200
+@@ -421,11 +421,22 @@ static const struct mechanismList mechan
#endif
/* --------------------- Secret Key Operations ------------------------ */
{ CKM_GENERIC_SECRET_KEY_GEN, { 1, 32, CKF_GENERATE }, PR_TRUE },
@@ -28,11 +28,11 @@ diff -up ./lib/softoken/pkcs11.c.add_encrypt_derive ./lib/softoken/pkcs11.c
/* ---------------------- SSL Key Derivations ------------------------- */
{ CKM_SSL3_PRE_MASTER_KEY_GEN, { 48, 48, CKF_GENERATE }, PR_FALSE },
{ CKM_SSL3_MASTER_KEY_DERIVE, { 48, 48, CKF_DERIVE }, PR_FALSE },
-diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
---- ./lib/softoken/pkcs11c.c.add_encrypt_derive 2017-07-27 07:09:32.000000000 -0700
-+++ ./lib/softoken/pkcs11c.c 2017-08-11 09:45:01.285575175 -0700
-@@ -6269,6 +6269,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
- #endif /* NSS_DISABLE_ECC */
+diff -up nss/lib/softoken/pkcs11c.c.add_encrypt_derive nss/lib/softoken/pkcs11c.c
+--- nss/lib/softoken/pkcs11c.c.add_encrypt_derive 2017-09-20 08:47:27.000000000 +0200
++++ nss/lib/softoken/pkcs11c.c 2017-10-03 13:48:40.428235402 +0200
+@@ -6242,6 +6242,44 @@ sftk_ANSI_X9_63_kdf(CK_BYTE **key, CK_UL
+ }
/*
+ * Handle The derive from a block encryption cipher
@@ -76,7 +76,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
* SSL Key generation given pre master secret
*/
#define NUM_MIXERS 9
-@@ -6313,6 +6351,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6286,6 +6324,9 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
CK_KEY_TYPE keyType = CKK_GENERIC_SECRET;
CK_OBJECT_CLASS classType = CKO_SECRET_KEY;
CK_KEY_DERIVATION_STRING_DATA *stringPtr;
@@ -86,7 +86,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
CK_MECHANISM_TYPE mechanism = pMechanism->mechanism;
PRBool isTLS = PR_FALSE;
PRBool isDH = PR_FALSE;
-@@ -6322,6 +6363,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6295,6 +6336,7 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
unsigned int outLen;
unsigned char sha_out[SHA1_LENGTH];
unsigned char key_block[NUM_MIXERS * SFTK_MAX_MAC_LENGTH];
@@ -94,7 +94,7 @@ diff -up ./lib/softoken/pkcs11c.c.add_encrypt_derive ./lib/softoken/pkcs11c.c
PRBool isFIPS;
HASH_HashType hashType;
PRBool extractValue = PR_TRUE;
-@@ -6926,6 +6968,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
+@@ -6899,6 +6941,136 @@ NSC_DeriveKey(CK_SESSION_HANDLE hSession
break;
}
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 66199c1..b429078 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.16.0
+%global nspr_version 4.17.0
%global nss_name nss
-%global nss_util_version 3.32.0
+%global nss_util_version 3.33.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
%global prelink_conf_dir %{_sysconfdir}/prelink.conf.d/
@@ -29,10 +29,10 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.32.0
+Version: 3.33.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
-Release: 1.2%{?dist}
+Release: 1.0%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -67,23 +67,23 @@ Source4: nss-softokn-prelink.conf
Source5: nss-softokn-dracut-module-setup.sh
Source6: nss-softokn-dracut.conf
-# Select the tests to run based on the type of build
-# This patch uses the gcc-iquote dir option documented at
+# This patch uses the GCC -iquote option documented at
# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
-# to place the in-tree directories at the head of the list on list of directories
-# to be searched for for header files. This ensures a build even when system freebl
-# headers are older. Such is the case when we are starting a major update.
-# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers.
-# Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
+# to give the in-tree headers a higher priority over the system headers,
+# when they are included through the quote form (#include "file.h").
+#
+# This ensures a build even when system freebl headers are older. Such
+# is the case when we are starting a major update.
+#
+# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl
+# headers. Once has been bootstapped the patch may be removed, but it
+# doesn't hurt to keep it.
Patch10: iquote.patch
# Patch adapted from rhel-7
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1236720
Patch11: nss-softokn-add_encrypt_derive.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1389052
-Patch12: nss-softokn-aligned_alloc.patch
-
%description
Network Security Services Softoken Cryptographic Module
@@ -132,11 +132,10 @@ Header and library files for doing development with Network Security Services.
%prep
%setup -q
-# activate if needed when doing a major update with new apis
-%patch10 -p0 -b .iquote
pushd nss
-%patch11 -p0 -b .add_encrypt_derive
-%patch12 -p1 -b .aligned_alloc
+# activate if needed when doing a major update with new apis
+%patch10 -p1 -b .iquote
+%patch11 -p1 -b .add_encrypt_derive
popd
%build
@@ -165,6 +164,13 @@ export BUILD_OPT=1
# Generate symbolic info for debuggers
XCFLAGS=$RPM_OPT_FLAGS
+# In Fedora 27, we still don't allow SSE2 on i686
+%ifarch i686
+XCFLAGS="$XCFLAGS -mno-sse2"
+export NSS_DISABLE_PCLMUL=1
+export NSS_DISABLE_HW_AES=1
+export NSS_DISABLE_AVX=1
+%endif
export XCFLAGS
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -436,6 +442,10 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Tue Oct 3 2017 Daiki Ueno <dueno(a)redhat.com> - 3.33.0-1.0
+- Update to NSS 3.33.0
+- Update iquote.patch to really prefer in-tree headers over system headers
+
* Fri Aug 11 2017 Elio Maldonado <elio.maldonado.batiz(a)gmail.com> - 3.32.0-1.2
- Restore missing portions of add encrypt derive patch
diff --git a/sources b/sources
index 5b1aaa5..3b5bf3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nss-softokn-3.32.0.tar.gz) = 3c2deaa1bfe4509efd1f2c65cc4a7b4dc8178cc80124b0279b9ecd0cbea7b13b71dffa9027750b70a5a9ef094eb2e1827f214f953945cc00790fba867d8b7887
+SHA512 (nss-softokn-3.33.0.tar.gz) = 16688e71ee775b1a4ffaa93577b1f46664204b698e574198bc204a9d3451180f6962a73ada9b3427e9f0c094e3d1b1a86c1a9261e4e36f42959aef6ebb51452c
6 years, 7 months
Architecture specific change in rpms/petsc.git
by githook-noreply@fedoraproject.org
The package rpms/petsc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/petsc.git/commit/?id=c3c3682ba7fc....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit ec327e91630534cc297ae0d1fcee5988a11597d9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Oct 2 13:54:52 2017 +0200
Unset default compiler flags when tests are built
diff --git a/petsc.spec b/petsc.spec
index 1be6c40..0b06bec 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_without debug
+%bcond_with debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -381,8 +381,8 @@ cp -a %{name}-%{version} buildmpich_dir
pushd %{name}-%{version}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -461,8 +461,8 @@ popd
pushd build64
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -523,8 +523,8 @@ pushd buildopenmpi_dir
%{_openmpi_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -635,8 +635,8 @@ pushd buildmpich_dir
%{_mpich_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -917,7 +917,9 @@ export PETSC_ARCH=%{_arch}
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=yes"
make -C %{name}-%{version} test MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/bin/petscmpiexec -valgrind'
%else
-
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C %{name}-%{version} test
%endif
@@ -934,6 +936,9 @@ ln -s %{_builddir}/%{name}-%{version}/build64/%{_arch}/lib/libpetsc64.so %{_buil
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=yes"
make -C build64 test MPIEXEC='%{_builddir}/%{name}-%{version}/build64/bin/petscmpiexec -valgrind'
%else
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C build64 test
%endif
%endif
@@ -944,6 +949,9 @@ export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildopenmpi_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C buildopenmpi_dir test
%{_openmpi_unload}
@@ -956,6 +964,9 @@ export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildmpich_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C buildmpich_dir test
%{_mpich_unload}
@@ -1012,6 +1023,10 @@ make -C buildmpich_dir test
%endif
%changelog
+* Mon Oct 02 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-5
+- Disable debugging
+- Unset default compiler flags when tests are built
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
- Rebuild for debugging
commit 9617ef11e174d85b5ab2a7bdf99e7863fa78c2b2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 16:55:11 2017 +0200
Rebuild for debugging
diff --git a/petsc.spec b/petsc.spec
index c65d692..1be6c40 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_with debug
+%bcond_without debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -379,8 +379,14 @@ cp -a %{name}-%{version} buildmpich_dir
%build
pushd %{name}-%{version}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -453,8 +459,14 @@ popd
%if %{with arch64}
pushd build64
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -509,8 +521,14 @@ popd
%if %{with openmpi}
pushd buildopenmpi_dir
%{_openmpi_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -615,8 +633,14 @@ popd
%if %{with mpich}
pushd buildmpich_dir
%{_mpich_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -988,6 +1012,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
+- Rebuild for debugging
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
- Exclude MPI builds on s390x
commit c3c3682ba7fc4527c62364cd9e34cc868292c9ad
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 14:29:45 2017 +0200
Exclude MPI builds on s390x
diff --git a/petsc.spec b/petsc.spec
index 4cabede..c65d692 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -14,22 +14,29 @@
#
# No MPICH support on these arches
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifarch %{power64}
%bcond_with mpich
%endif
%endif
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifnarch %{power64}
%bcond_without mpich
%endif
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%bcond_without mpich
-%endif
+%if 0%{?fedora}
+## Exclude MPI builds on s390x
%ifarch s390x
+%bcond_with mpich
%bcond_with openmpi
%else
+%bcond_without mpich
+%bcond_without openmpi
+%endif
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} >= 7
+%bcond_without mpich
%bcond_without openmpi
%endif
@@ -39,10 +46,7 @@
## PETSC looks incompatible with serial MUMPS
%bcond_with mumps_serial
#
-## Does not build with SuperLU < 5.2.0
-%if 0%{?fedora} >= 25
%bcond_without superlu
-%endif
#
## SuperLUDIST needs parmetis
@@ -64,25 +68,12 @@
%{!?el6:%global with_suitesparse 1}
#
-## PETSc needs fftw's MPI implementation
-%if 0%{?fedora} >= 25
-%bcond_without fftw
-%else
-%bcond_with fftw
-%endif
-#
-
# 'scalapack' is required by 'mumps'
%if %{with openmpi}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -90,13 +81,8 @@
%if %{with mpich}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -124,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -1002,6 +988,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
+- Exclude MPI builds on s390x
+
* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
- Enable mpiuni-fortran-binding on MPI builds
commit 4983e8c181bfd8fe34ce56195b1cbba5033fb5dd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Sep 30 17:37:38 2017 +0200
Enable mpiuni-fortran-binding on MPI builds
diff --git a/petsc.spec b/petsc.spec
index 33e7c83..4cabede 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -124,7 +124,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -569,7 +569,7 @@ pushd buildopenmpi_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -675,7 +675,7 @@ pushd buildmpich_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -1002,6 +1002,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
+- Enable mpiuni-fortran-binding on MPI builds
+
* Tue Sep 26 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-1
- Update to 3.7.7
- Move petscvariables/petscrules under a private directory of libdir
6 years, 7 months
Architecture specific change in rpms/petsc.git
by githook-noreply@fedoraproject.org
The package rpms/petsc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/petsc.git/commit/?id=c3c3682ba7fc....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit ec327e91630534cc297ae0d1fcee5988a11597d9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Oct 2 13:54:52 2017 +0200
Unset default compiler flags when tests are built
diff --git a/petsc.spec b/petsc.spec
index 1be6c40..0b06bec 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_without debug
+%bcond_with debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -381,8 +381,8 @@ cp -a %{name}-%{version} buildmpich_dir
pushd %{name}-%{version}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -461,8 +461,8 @@ popd
pushd build64
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -523,8 +523,8 @@ pushd buildopenmpi_dir
%{_openmpi_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -635,8 +635,8 @@ pushd buildmpich_dir
%{_mpich_load}
%configure \
%if %{with debug}
-CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
- CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{_libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
%else
CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
@@ -917,7 +917,9 @@ export PETSC_ARCH=%{_arch}
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=yes"
make -C %{name}-%{version} test MPIEXEC='%{_builddir}/%{name}-%{version}/%{name}-%{version}/bin/petscmpiexec -valgrind'
%else
-
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C %{name}-%{version} test
%endif
@@ -934,6 +936,9 @@ ln -s %{_builddir}/%{name}-%{version}/build64/%{_arch}/lib/libpetsc64.so %{_buil
export PETSCVALGRIND_OPTIONS=" --tool=memcheck --leak-check=yes --track-origins=yes"
make -C build64 test MPIEXEC='%{_builddir}/%{name}-%{version}/build64/bin/petscmpiexec -valgrind'
%else
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C build64 test
%endif
%endif
@@ -944,6 +949,9 @@ export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildopenmpi_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C buildopenmpi_dir test
%{_openmpi_unload}
@@ -956,6 +964,9 @@ export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/build
export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildmpich_dir
export PETSC_ARCH=%{_arch}
export MPI_INTERFACE_HOSTNAME=localhost
+export CFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export CXXFLAGS="-O0 -g -Wl,-z,now -fPIC"
+export FFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{_libdir}/gfortran/modules"
make -C buildmpich_dir test
%{_mpich_unload}
@@ -1012,6 +1023,10 @@ make -C buildmpich_dir test
%endif
%changelog
+* Mon Oct 02 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-5
+- Disable debugging
+- Unset default compiler flags when tests are built
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
- Rebuild for debugging
commit 9617ef11e174d85b5ab2a7bdf99e7863fa78c2b2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 16:55:11 2017 +0200
Rebuild for debugging
diff --git a/petsc.spec b/petsc.spec
index c65d692..1be6c40 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -5,7 +5,7 @@
%bcond_without check
## Debug builds ?
-%bcond_with debug
+%bcond_without debug
#
# Define _pkgdocdir macro on epel
@@ -110,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -379,8 +379,14 @@ cp -a %{name}-%{version} buildmpich_dir
%build
pushd %{name}-%{version}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -453,8 +459,14 @@ popd
%if %{with arch64}
pushd build64
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -509,8 +521,14 @@ popd
%if %{with openmpi}
pushd buildopenmpi_dir
%{_openmpi_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -615,8 +633,14 @@ popd
%if %{with mpich}
pushd buildmpich_dir
%{_mpich_load}
-%configure CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%configure \
+%if %{with debug}
+CFLAGS="-O0 -g -Wl,-z,now" CXXFLAGS="-O0 -g -Wl,-z,now" FFLAGS="-O0 -g -Wl,-z,now -I%{libdir}/gfortran/modules" COPTFLAGS="-O0 -g -Wl,-z,now" \
+ CXXOPTFLAGS="-O0 -g -Wl,-z,now" FOPTFLAGS="-O0 -g -Wl,-z,now -fPIC -I%{libdir}/gfortran/modules" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
+%else
+CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now -fPIC" \
COPTFLAGS="$COPTFLAGS" CXXOPTFLAGS="$CXXOPTFLAGS" FOPTFLAGS="$FOPTFLAGS -Wl,-z,now -fPIC" \
+%endif
--with-default-arch=0 --with-make=1 \
--with-single-library=1 \
--with-precision=double \
@@ -988,6 +1012,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-4
+- Rebuild for debugging
+
* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
- Exclude MPI builds on s390x
commit c3c3682ba7fc4527c62364cd9e34cc868292c9ad
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 1 14:29:45 2017 +0200
Exclude MPI builds on s390x
diff --git a/petsc.spec b/petsc.spec
index 4cabede..c65d692 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -14,22 +14,29 @@
#
# No MPICH support on these arches
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifarch %{power64}
%bcond_with mpich
%endif
%endif
-%if 0%{?rhel} || 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
%ifnarch %{power64}
%bcond_without mpich
%endif
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%bcond_without mpich
-%endif
+%if 0%{?fedora}
+## Exclude MPI builds on s390x
%ifarch s390x
+%bcond_with mpich
%bcond_with openmpi
%else
+%bcond_without mpich
+%bcond_without openmpi
+%endif
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} >= 7
+%bcond_without mpich
%bcond_without openmpi
%endif
@@ -39,10 +46,7 @@
## PETSC looks incompatible with serial MUMPS
%bcond_with mumps_serial
#
-## Does not build with SuperLU < 5.2.0
-%if 0%{?fedora} >= 25
%bcond_without superlu
-%endif
#
## SuperLUDIST needs parmetis
@@ -64,25 +68,12 @@
%{!?el6:%global with_suitesparse 1}
#
-## PETSc needs fftw's MPI implementation
-%if 0%{?fedora} >= 25
-%bcond_without fftw
-%else
-%bcond_with fftw
-%endif
-#
-
# 'scalapack' is required by 'mumps'
%if %{with openmpi}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -90,13 +81,8 @@
%if %{with mpich}
%bcond_without mpi
%bcond_without sundials
-%ifarch s390x
-%bcond_with scalapack
-%bcond_with mumps
-%else
%bcond_without scalapack
%bcond_without mumps
-%endif
%bcond_without ptscotch
%bcond_without hypre
%endif
@@ -124,7 +110,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -1002,6 +988,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sun Oct 01 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-3
+- Exclude MPI builds on s390x
+
* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
- Enable mpiuni-fortran-binding on MPI builds
commit 4983e8c181bfd8fe34ce56195b1cbba5033fb5dd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Sep 30 17:37:38 2017 +0200
Enable mpiuni-fortran-binding on MPI builds
diff --git a/petsc.spec b/petsc.spec
index 33e7c83..4cabede 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -124,7 +124,7 @@
Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation
Version: 3.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
URL: https://www.mcs.anl.gov/petsc
Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -569,7 +569,7 @@ pushd buildopenmpi_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -675,7 +675,7 @@ pushd buildmpich_dir
--with-mpi=1 \
--with-mpi-compilers=$MPI_BIN/mpicc \
--with-mpiexec=$MPI_BIN/mpiexec \
- --with-mpiuni-fortran-binding=0 \
+ --with-mpiuni-fortran-binding=1 \
%endif
%if %{with cgns}
--with-cgns=1 \
@@ -1002,6 +1002,9 @@ make -C buildmpich_dir test
%endif
%changelog
+* Sat Sep 30 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-2
+- Enable mpiuni-fortran-binding on MPI builds
+
* Tue Sep 26 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 3.7.7-1
- Update to 3.7.7
- Move petscvariables/petscrules under a private directory of libdir
6 years, 7 months