Architecture specific change in rpms/zydis.git
by githook-noreply@fedoraproject.org
The package rpms/zydis.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/zydis.git/commit/?id=e469abe87cec....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit cb022484501a67091d107de4c8ecacfa0ee99d9c
Author: topazus <topazus(a)outlook.com>
Date: Wed Jan 3 10:04:10 2024 +0800
fix -doc subpackage build architecture
diff --git a/zydis.spec b/zydis.spec
index 2eb64c7..58bbd3c 100644
--- a/zydis.spec
+++ b/zydis.spec
@@ -46,7 +46,6 @@ developing applications that use %{name}.
%package doc
Summary: Documentation for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
BuildArch: noarch
%description doc
commit e469abe87ceca6afc68ad1c7e3641c7690e88cb8
Author: topazus <topazus(a)outlook.com>
Date: Wed Jan 3 09:50:40 2024 +0800
disable s390x build
diff --git a/zydis.spec b/zydis.spec
index da9fba2..2eb64c7 100644
--- a/zydis.spec
+++ b/zydis.spec
@@ -12,6 +12,8 @@ Patch0: https://github.com/zyantific/zydis/commit/c683b1273104b19300a830
# Add ZYDIS_BUILD_TESTS option and include tests in CMakeLists.txt
Patch1: https://github.com/zyantific/zydis/commit/a56a39f15efe64a41013ec142c028e6...
+ExcludeArch: s390x
+
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
4 months, 4 weeks
Architecture specific change in rpms/zydis.git
by githook-noreply@fedoraproject.org
The package rpms/zydis.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/zydis.git/commit/?id=e469abe87cec....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit cb022484501a67091d107de4c8ecacfa0ee99d9c
Author: topazus <topazus(a)outlook.com>
Date: Wed Jan 3 10:04:10 2024 +0800
fix -doc subpackage build architecture
diff --git a/zydis.spec b/zydis.spec
index 2eb64c7..58bbd3c 100644
--- a/zydis.spec
+++ b/zydis.spec
@@ -46,7 +46,6 @@ developing applications that use %{name}.
%package doc
Summary: Documentation for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
BuildArch: noarch
%description doc
commit e469abe87ceca6afc68ad1c7e3641c7690e88cb8
Author: topazus <topazus(a)outlook.com>
Date: Wed Jan 3 09:50:40 2024 +0800
disable s390x build
diff --git a/zydis.spec b/zydis.spec
index da9fba2..2eb64c7 100644
--- a/zydis.spec
+++ b/zydis.spec
@@ -12,6 +12,8 @@ Patch0: https://github.com/zyantific/zydis/commit/c683b1273104b19300a830
# Add ZYDIS_BUILD_TESTS option and include tests in CMakeLists.txt
Patch1: https://github.com/zyantific/zydis/commit/a56a39f15efe64a41013ec142c028e6...
+ExcludeArch: s390x
+
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
4 months, 4 weeks
Architecture specific change in rpms/frama-c.git
by githook-noreply@fedoraproject.org
The package rpms/frama-c.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/frama-c.git/commit/?id=4a2f9ebc5a....
Change:
-%ifnarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 4a2f9ebc5aa4d5c0ba56a439c4cb6a65cea57ff5
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Jan 2 19:56:05 2024 -0700
Version 28.0
Other changes:
- Drop upstreamed patches
- Add patch for whitespace differences in the tests
diff --git a/frama-c-ocamlgraph-2.1.0.patch b/frama-c-ocamlgraph-2.1.0.patch
deleted file mode 100644
index d5a1438..0000000
--- a/frama-c-ocamlgraph-2.1.0.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/assigned_param.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/assigned_param.dot 2023-09-01 13:54:29.280214011 -0600
-@@ -20,4 +20,4 @@ digraph G {
- cp7 -> cp3;
- cp9 -> cp5;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/callstack_global.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/callstack_global.dot 2023-09-01 13:54:39.561046218 -0600
-@@ -46,4 +46,4 @@ digraph G {
- cp23 -> cp19;
- cp25 -> cp21;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/callstack_strategy.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/callstack_strategy.dot 2023-09-01 13:54:49.472884454 -0600
-@@ -42,4 +42,4 @@ digraph G {
- cp15 -> cp18;
- cp18 -> cp13;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/const.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/const.dot 2023-09-01 13:55:00.104710939 -0600
-@@ -27,4 +27,4 @@ digraph G {
- cp13 -> cp9;
- cp13 -> cp11;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/exceptional.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/exceptional.dot 2023-09-01 13:55:10.096547868 -0600
-@@ -24,4 +24,4 @@ digraph G {
- cp11 -> cp5;
- cp13 -> cp7;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/global.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/global.dot 2023-09-01 13:55:20.032385690 -0600
-@@ -20,4 +20,4 @@ digraph G {
- cp7 -> cp3;
- cp9 -> cp3;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/manydeps.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/manydeps.dot 2023-09-01 13:55:46.303956900 -0600
-@@ -41,4 +41,4 @@ digraph G {
- cp25 -> cp24 [style="bold", ];
- cp27 -> cp24;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/per_callstack.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/per_callstack.dot 2023-09-01 13:55:37.200105483 -0600
-@@ -48,4 +48,4 @@ digraph G {
- cp23 -> cp17;
- cp25 -> cp19;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/pointed_param.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/pointed_param.dot 2023-09-01 13:55:28.568246370 -0600
-@@ -30,4 +30,4 @@ digraph G {
- cp11 -> cp9;
- cp13 -> cp11;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot 2023-09-01 13:55:55.895800352 -0600
-@@ -19,4 +19,4 @@ digraph G {
- cp5 -> cp2;
- cp8 -> cp2;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/ranges.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/ranges.dot 2023-09-01 13:56:03.614674382 -0600
-@@ -120,4 +120,4 @@ digraph G {
- cp95 -> cp37;
- cp97 -> cp37;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot 2023-09-01 13:56:10.527561568 -0600
-@@ -28,4 +28,4 @@ digraph G {
- cp9 -> cp5;
- cp9 -> cp7;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/various.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/src/plugins/dive/tests/dive/oracle/various.dot 2023-09-01 13:56:18.631429285 -0600
-@@ -68,4 +68,4 @@ digraph G {
- cp30 -> cp25;
- cp32 -> cp27;
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/tests/misc/oracle/interpreted_automata_dataflow_backward.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/tests/misc/oracle/interpreted_automata_dataflow_backward.dot 2023-09-01 13:54:15.682435949 -0600
-@@ -73,4 +73,4 @@ digraph G {
- cp32 -> cp31 [label=<int a = 1;>, ];
- cp33 -> cp23 [label=<i ++;>, ];
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/tests/misc/oracle/interpreted_automata_dataflow_forward.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/tests/misc/oracle/interpreted_automata_dataflow_forward.dot 2023-09-01 13:54:02.080657968 -0600
-@@ -73,4 +73,4 @@ digraph G {
- cp32 -> cp31 [label=<int a = 1;>, ];
- cp33 -> cp23 [label=<i ++;>, ];
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/tests/pdg/oracle/call.f.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/tests/pdg/oracle/call.f.dot 2023-09-01 13:56:26.975293090 -0600
-@@ -28,4 +28,4 @@ digraph G {
- 8 -> 9 [color="#0000FF", ];
- 9 -> 10 [color="#0000FF", ];
-
-- }
-\ No newline at end of file
-+ }
---- frama-c-27.1-Cobalt/tests/pdg/oracle/call.g.dot.orig 2023-07-17 18:00:00.000000000 -0600
-+++ frama-c-27.1-Cobalt/tests/pdg/oracle/call.g.dot 2023-09-01 13:56:36.158143213 -0600
-@@ -45,4 +45,4 @@ digraph G {
- 24 -> 27 [color="#0000FF", ];
- 27 -> 28 [color="#0000FF", ];
-
-- }
-\ No newline at end of file
-+ }
diff --git a/frama-c-test.patch b/frama-c-test.patch
new file mode 100644
index 0000000..e51155e
--- /dev/null
+++ b/frama-c-test.patch
@@ -0,0 +1,1130 @@
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing_usable.res.oracle 2023-12-22 17:11:41.764182403 -0700
+@@ -12,6 +12,7 @@
+ --- Context 'typed_usable_lemma' Cluster 'Chunk'
+ ---------------------------------------------
+ theory Chunk
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -32,11 +33,13 @@ theory Chunk
+
+ predicate is_sint32_chunk (m:addr -> int) =
+ forall a:addr. is_sint32 (get m a)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_lemma' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -54,11 +57,13 @@ theory Compound
+ (* use frama_c_wp.memory.Memory *)
+
+ function shift_sint32 (p:addr) (k:int) : addr = shift p k
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_lemma' Cluster 'A_Occ'
+ ---------------------------------------------
+ theory A_Occ
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -103,11 +108,13 @@ theory A_Occ
+ f < t ->
+ is_sint32_chunk mint ->
+ is_sint32 v -> is_sint32 x1 -> L_occ mint v p f x = L_occ mint v p f t
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_lemma' Cluster 'Axiomatic1'
+ ---------------------------------------------
+ theory Axiomatic1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -135,9 +142,11 @@ theory Axiomatic1
+ is_sint32_chunk mint ->
+ is_sint32 v ->
+ (L_occ mint v p f s + L_occ mint v p s t) = L_occ mint v p f t
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -165,11 +174,13 @@ end
+ is_uint32 i ->
+ is_sint32 i2 ->
+ (L_occ t i2 a i i3 + L_occ t i2 a i3 i1) = L_occ t i2 a i i1
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_axiom' Cluster 'Chunk'
+ ---------------------------------------------
+ theory Chunk1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -190,11 +201,13 @@ theory Chunk1
+
+ predicate is_sint32_chunk1 (m:addr1 -> int) =
+ forall a:addr1. is_sint321 (get1 m a)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_axiom' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -212,11 +225,13 @@ theory Compound1
+ (* use frama_c_wp.memory.Memory1 *)
+
+ function shift_sint321 (p:addr1) (k:int) : addr1 = shift1 p k
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_axiom' Cluster 'A_Occ'
+ ---------------------------------------------
+ theory A_Occ1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -263,11 +278,13 @@ theory A_Occ1
+ is_sint32_chunk1 mint ->
+ is_sint321 v ->
+ is_sint321 x1 -> L_occ1 mint v p f x = L_occ1 mint v p f t
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_usable_axiom' Cluster 'Axiomatic1'
+ ---------------------------------------------
+ theory Axiomatic11
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -295,9 +312,11 @@ theory Axiomatic11
+ is_sint32_chunk1 mint ->
+ is_sint321 v ->
+ (L_occ1 mint v p f s +' L_occ1 mint v p s t) = L_occ1 mint v p f t
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -324,11 +343,13 @@ end
+ is_sint32_chunk1 t ->
+ is_uint321 i1 ->
+ is_uint321 i -> is_sint321 i2 -> L_occ1 t i2 a i x = L_occ1 t i2 a i i1
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'Chunk'
+ ---------------------------------------------
+ theory Chunk2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool2 *)
+@@ -349,11 +370,13 @@ theory Chunk2
+
+ predicate is_sint32_chunk2 (m:addr2 -> int) =
+ forall a:addr2. is_sint322 (get2 m a)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool2 *)
+@@ -371,11 +394,13 @@ theory Compound2
+ (* use frama_c_wp.memory.Memory2 *)
+
+ function shift_sint322 (p:addr2) (k:int) : addr2 = shift2 p k
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'A_Occ'
+ ---------------------------------------------
+ theory A_Occ2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool2 *)
+@@ -422,9 +447,11 @@ theory A_Occ2
+ is_sint32_chunk2 mint ->
+ is_sint322 v ->
+ is_sint322 x1 -> L_occ2 mint v p f x = L_occ2 mint v p f t
++
+ end
+ [wp:print-generated]
+ theory WP2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool2 *)
+@@ -452,6 +479,7 @@ end
+ is_sint32_chunk2 t ->
+ is_sint322 i3 ->
+ (L_occ2 t i3 a i i1 +'' L_occ2 t i3 a i1 i2) = L_occ2 t i3 a i i2
++
+ end
+ [wp] 3 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle 2023-12-22 17:12:15.458748469 -0700
+@@ -13,6 +13,7 @@
+ [wp] 8 goals scheduled
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -41,9 +42,11 @@
+ forall f:t.
+ let r = of_f32 f in
+ eq_f32 f (0x1.99999Ap-4:t) -> of_f32 (to_f32 (of_f64 (to_f64 r))) = r
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -72,9 +75,11 @@
+ forall f:t.
+ eq_f32 f (0x1.99999Ap-4:t) ->
+ not of_f32 f = (3602879701896397.0 / 36028797018963968.0)
++
+ end
+ [wp:print-generated]
+ theory WP2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -102,9 +107,11 @@
+ goal wp_goal :
+ forall f:t.
+ eq_f32 f (0x1.99999Ap-4:t) -> of_f32 f = (13421773.0 / 134217728.0)
++
+ end
+ [wp:print-generated]
+ theory WP3
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -131,9 +138,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f32 f (0x1.99999Ap-4:t) -> not of_f32 f = (1.0 / 10.0)
++
+ end
+ [wp:print-generated]
+ theory WP4
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -162,9 +171,11 @@
+ forall f:t1.
+ let r = of_f321 (to_f321 (of_f641 f)) in
+ eq_f64 f (0x1.999999999999Ap-4:t1) -> of_f641 (to_f641 r) = r
++
+ end
+ [wp:print-generated]
+ theory WP5
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -193,9 +204,11 @@
+ forall f:t1.
+ eq_f64 f (0x1.999999999999Ap-4:t1) ->
+ not of_f641 f = (13421773.0 /' 134217728.0)
++
+ end
+ [wp:print-generated]
+ theory WP6
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -224,9 +237,11 @@
+ forall f:t1.
+ eq_f64 f (0x1.999999999999Ap-4:t1) ->
+ of_f641 f = (3602879701896397.0 /' 36028797018963968.0)
++
+ end
+ [wp:print-generated]
+ theory WP7
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -254,6 +269,7 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f64 f (0x1.999999999999Ap-4:t1) -> not of_f641 f = (1.0 /' 10.0)
++
+ end
+ [wp] 8 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/inductive.res.oracle 2023-12-22 17:12:01.210931957 -0700
+@@ -6,6 +6,7 @@
+ --- Context 'typed' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -25,9 +26,11 @@ theory Compound
+ function shift_sint32 (p:addr) (k:int) : addr = shift p k
+
+ function shiftfield_F1__list_next (p:addr) : addr = shift p 1
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -67,9 +70,11 @@ end
+ goal wp_goal :
+ forall t:int -> int, t1:int -> int, t2:addr -> addr, t3:addr -> addr, a:
+ addr, a1:addr. P_reachable t1 t3 a a1 -> not P_reachable t t2 a a1
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -92,9 +97,11 @@ end
+
+ goal wp_goal :
+ forall i:int, i1:int, i2:int. P_is_gcd1 i i1 i2 -> not P_is_gcd1 i1 i2 i
++
+ end
+ [wp:print-generated]
+ theory WP2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -179,6 +186,7 @@ end
+ forall t:addr -> int, t1:addr -> int, t2:addr -> int, a:addr, a1:addr, i:
+ int, i1:int, i2:int, i3:int.
+ P_same_elements t1 t2 a a1 i i2 -> not P_same_elements t t1 a1 a i1 i3
++
+ end
+ [wp] 3 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/predicates_functions.res.oracle 2023-12-22 17:12:36.818473934 -0700
+@@ -4,6 +4,7 @@
+ [wp] 1 goal scheduled
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -33,6 +34,7 @@
+ forall i:int. L_RF i = (if i <= 0 then 0 else L_F i + L_RF ((- 1) + i))
+
+ goal wp_goal : forall i:int. 0 < i -> P_RP (L_RF i)
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/struct_fields.res.oracle 2023-12-22 17:13:02.355146116 -0700
+@@ -9,6 +9,7 @@
+ --- Context 'typed_foo' Cluster 'Chunk'
+ ---------------------------------------------
+ theory Chunk
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -35,11 +36,13 @@ theory Chunk
+
+ predicate is_sint32_chunk (m:addr -> int) =
+ forall a:addr. is_sint32 (get m a)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_foo' Cluster 'S1_X'
+ ---------------------------------------------
+ theory S1_X
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -61,11 +64,13 @@ theory S1_X
+
+ predicate IsS1_X (s:S1_X) =
+ (is_sint8 (F1_X_a s) /\ is_sint16 (F1_X_b s)) /\ is_sint32 (F1_X_c s)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_foo' Cluster 'Init_S1_X'
+ ---------------------------------------------
+ theory Init_S1_X
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -82,11 +87,13 @@ theory Init_S1_X
+
+ type Init_S1_X =
+ | Init_S1_X1 (Init_F1_X_a:bool) (Init_F1_X_b:bool) (Init_F1_X_c:bool)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_foo' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -209,9 +216,11 @@ theory Compound
+ [Load_Init_S1_X p (havoc init1 init q n)].
+ separated p 3 q n ->
+ Load_Init_S1_X p (havoc init1 init q n) = Load_Init_S1_X p init
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -245,9 +254,11 @@ end
+ sconst t2 ->
+ cinits t ->
+ valid_rd t1 a 3 -> IsS1_X (Load_S1_X a t2 t3 t4) -> valid_rw t1 a 3
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -281,6 +292,7 @@ end
+ linked t1 ->
+ sconst t2 ->
+ cinits t -> IsS1_X (Load_S1_X a t2 t3 t4) -> valid_rd t1 a 3
++
+ end
+ [wp] 2 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_acsl/oracle/sum_types.res.oracle 2023-12-22 17:13:18.426939801 -0700
+@@ -6,6 +6,7 @@
+ --- Context 'typed' Cluster 'A_A'
+ ---------------------------------------------
+ theory A_A
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -33,11 +34,13 @@ theory A_A
+ | Q_IAi : forall p:int. is_InAxiomatic (C_IAi p)
+
+ predicate P_P A_InAxiomatic
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'Axiomatic1'
+ ---------------------------------------------
+ theory Axiomatic1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -67,11 +70,13 @@ theory Axiomatic1
+ (* use A_A *)
+
+ lemma Q_LA : forall a:A_InAxiomatic. is_InAxiomatic a -> P_P a
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'A_X'
+ ---------------------------------------------
+ theory A_X
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -89,11 +94,13 @@ theory A_X
+ (* use Axiomatic1 *)
+
+ predicate P_Q A_AtTopLevel
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'Axiomatic2'
+ ---------------------------------------------
+ theory Axiomatic2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -124,11 +131,13 @@ theory Axiomatic2
+ (* use A_X *)
+
+ lemma Q_LB : forall a:A_AtTopLevel. is_AtTopLevel a -> P_Q a
++
+ end
+ ---------------------------------------------
+ --- Context 'typed' Cluster 'A_Y'
+ ---------------------------------------------
+ theory A_Y
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -146,9 +155,11 @@ theory A_Y
+ (* use Axiomatic2 *)
+
+ predicate P_R A_Rec
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -168,9 +179,11 @@ end
+ (* use A_Y *)
+
+ goal wp_goal : forall r:A_Rec. is_Rec r -> P_R r
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -190,9 +203,11 @@ end
+ (* use A_X *)
+
+ goal wp_goal : forall a:A_AtTopLevel. is_AtTopLevel a -> P_Q a
++
+ end
+ [wp:print-generated]
+ theory WP2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -210,6 +225,7 @@ end
+ (* use A_A *)
+
+ goal wp_goal : forall i:A_InAxiomatic. is_InAxiomatic i -> P_P i
++
+ end
+ [wp] 3 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle 2023-12-22 17:10:21.197219990 -0700
+@@ -11,6 +11,7 @@
+ --- Context 'typed_myMain' Cluster 'S2_A'
+ ---------------------------------------------
+ theory S2_A
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -33,11 +34,13 @@ theory S2_A
+ predicate IsS2_A (s:S2_A) = is_sint32 (F2_A_dummy s)
+
+ predicate EqS2_A (s:S2_A) (s1:S2_A) = F2_A_dummy s1 = F2_A_dummy s
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_myMain' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -80,9 +83,11 @@ theory Compound
+ [Load_S2_A p (havoc mint1 mint q n)].
+ separated p 1 q n ->
+ Load_S2_A p (havoc mint1 mint q n) = Load_S2_A p mint
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -111,6 +116,7 @@ end
+ region (a1.base) <= 0 ->
+ region (a.base) <= 0 ->
+ is_sint32 i -> IsS2_A a3 -> is_sint32 x -> IsS2_A a4 -> EqS2_A a4 a3
++
+ end
+ [wp] [Generated] Goal typed_myMain_terminates (Qed)
+ [wp] 3 goals generated
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp/oracle/sharing.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp/oracle/sharing.res.oracle 2023-12-22 17:09:06.494182057 -0700
+@@ -9,6 +9,7 @@
+ --- Context 'typed_f' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -26,9 +27,11 @@ theory Compound
+ (* use frama_c_wp.memory.Memory *)
+
+ function shift_sint32 (p:addr) (k:int) : addr = shift p k
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -67,6 +70,7 @@ end
+ valid_rw t a1 10 ->
+ (forall i2:int. 0 <= i2 -> i2 <= 9 -> 0 <= get t1 (shift_sint32 a i2)) ->
+ 0 <= get (set m3 (shift_sint32 a 4) (get m3 a2)) (shift_sint32 a i)
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp/oracle/wp_eqb.res.oracle 2023-12-22 17:09:29.349887717 -0700
+@@ -7,6 +7,7 @@
+ [wp] 1 goal scheduled
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -28,6 +29,7 @@
+ (if i3 = i2 then 1 else 0) = (if i1 = i then 1 else 0) ->
+ is_sint32 i3 ->
+ is_sint32 i2 -> is_sint32 i1 -> is_sint32 i -> i3 = i2 <-> i1 = i
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/float_driver.res.oracle 2023-12-22 17:14:01.970380828 -0700
+@@ -9,6 +9,7 @@
+ [wp] 20 goals scheduled
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -35,9 +36,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f64 (add_f64 f (0x1.0p0:t)) (round_double RTP (of_f64 f))
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -64,9 +67,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f64 (add_f64 f (0x1.0p0:t)) (round_double RTZ (of_f64 f))
++
+ end
+ [wp:print-generated]
+ theory WP2
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -93,9 +98,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f64 (add_f64 f (0x1.0p0:t)) (round_double RNA (of_f64 f))
++
+ end
+ [wp:print-generated]
+ theory WP3
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -122,9 +129,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f64 (add_f64 f (0x1.0p0:t)) (round_double RNE (of_f64 f))
++
+ end
+ [wp:print-generated]
+ theory WP4
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -150,9 +159,11 @@
+ (* use frama_c_wp.cfloat.Cfloat *)
+
+ goal wp_goal : forall f:t. is_NaN_f64 (add_f64 f (0x1.0p0:t))
++
+ end
+ [wp:print-generated]
+ theory WP5
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -178,9 +189,11 @@
+ (* use frama_c_wp.cfloat.Cfloat *)
+
+ goal wp_goal : forall f:t. is_infinite_f64 (add_f64 f (0x1.0p0:t))
++
+ end
+ [wp:print-generated]
+ theory WP6
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -206,9 +219,11 @@
+ (* use frama_c_wp.cfloat.Cfloat *)
+
+ goal wp_goal : forall f:t. is_finite_f64 (add_f64 f (0x1.0p0:t))
++
+ end
+ [wp:print-generated]
+ theory WP7
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -235,9 +250,11 @@
+
+ goal wp_goal :
+ forall f:t. eq_f64 (add_f64 f (0x1.0p0:t)) (round_double RTN (of_f64 f))
++
+ end
+ [wp:print-generated]
+ theory WP8
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -265,9 +282,11 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f32 (add_f32 f (0x1.0p0:t1)) (round_float RNA1 (of_f32 f))
++
+ end
+ [wp:print-generated]
+ theory WP9
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -295,9 +314,11 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f32 (add_f32 f (0x1.0p0:t1)) (round_float RNE1 (of_f32 f))
++
+ end
+ [wp:print-generated]
+ theory WP10
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -323,9 +344,11 @@
+ (* use frama_c_wp.cfloat.Cfloat *)
+
+ goal wp_goal : forall f:t. is_negative_infinite_f64 (add_f64 f (0x1.0p0:t))
++
+ end
+ [wp:print-generated]
+ theory WP11
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -351,9 +374,11 @@
+ (* use frama_c_wp.cfloat.Cfloat *)
+
+ goal wp_goal : forall f:t. is_positive_infinite_f64 (add_f64 f (0x1.0p0:t))
++
+ end
+ [wp:print-generated]
+ theory WP12
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -379,9 +404,11 @@
+ (* use frama_c_wp.cfloat.Cfloat1 *)
+
+ goal wp_goal : forall f:t1. is_finite_f32 (add_f32 f (0x1.0p0:t1))
++
+ end
+ [wp:print-generated]
+ theory WP13
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -409,9 +436,11 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f32 (add_f32 f (0x1.0p0:t1)) (round_float RTN1 (of_f32 f))
++
+ end
+ [wp:print-generated]
+ theory WP14
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -439,9 +468,11 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f32 (add_f32 f (0x1.0p0:t1)) (round_float RTP1 (of_f32 f))
++
+ end
+ [wp:print-generated]
+ theory WP15
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -469,9 +500,11 @@
+ goal wp_goal :
+ forall f:t1.
+ eq_f32 (add_f32 f (0x1.0p0:t1)) (round_float RTZ1 (of_f32 f))
++
+ end
+ [wp:print-generated]
+ theory WP16
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -498,9 +531,11 @@
+
+ goal wp_goal :
+ forall f:t1. is_negative_infinite_f32 (add_f32 f (0x1.0p0:t1))
++
+ end
+ [wp:print-generated]
+ theory WP17
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -527,9 +562,11 @@
+
+ goal wp_goal :
+ forall f:t1. is_positive_infinite_f32 (add_f32 f (0x1.0p0:t1))
++
+ end
+ [wp:print-generated]
+ theory WP18
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -555,9 +592,11 @@
+ (* use frama_c_wp.cfloat.Cfloat1 *)
+
+ goal wp_goal : forall f:t1. is_NaN_f32 (add_f32 f (0x1.0p0:t1))
++
+ end
+ [wp:print-generated]
+ theory WP19
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -583,6 +622,7 @@
+ (* use frama_c_wp.cfloat.Cfloat1 *)
+
+ goal wp_goal : forall f:t1. is_infinite_f32 (add_f32 f (0x1.0p0:t1))
++
+ end
+ [wp] 20 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/inductive.res.oracle 2023-12-22 17:13:42.865626075 -0700
+@@ -6,6 +6,7 @@
+ --- Context 'typed' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -25,9 +26,11 @@ theory Compound
+ function shift_sint32 (p:addr) (k:int) : addr = shift p k
+
+ function shiftfield_F1__list_next (p:addr) : addr = shift p 1
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -62,9 +65,11 @@ end
+ a1 = a \/
+ valid_rw t a1 2 /\
+ P_reachable t t1 (get t1 (shiftfield_F1__list_next a1)) a
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -143,6 +148,7 @@ end
+ int.
+ P_same_elements t t1 (shift_sint32 a i2) (shift_sint32 a1 i2) i i1 ->
+ P_same_elements t t1 a a1 (i + i2) (i1 + i2)
++
+ end
+ [wp] 2 goals generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle 2023-12-22 17:14:20.745139817 -0700
+@@ -11,6 +11,7 @@
+ --- Context 'typed_f' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -28,11 +29,13 @@ theory Compound
+ (* use frama_c_wp.memory.Memory *)
+
+ function shift_sint32 (p:addr) (k:int) : addr = shift p k
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_f' Cluster 'Axiomatic'
+ ---------------------------------------------
+ theory Axiomatic
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -48,9 +51,11 @@ theory Axiomatic
+ (* use map.Map *)
+
+ predicate P_P int
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -77,6 +82,7 @@ end
+ forall t:addr -> int, i:int, a:addr.
+ let x = get t (shift_sint32 a i) in
+ region (a.base) <= 0 -> is_sint32 i -> is_sint32 x -> P_P x
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+@@ -100,6 +106,7 @@ Prove: P_P(x).
+ --- Context 'typed_ref_f' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -117,11 +124,13 @@ theory Compound1
+ (* use frama_c_wp.memory.Memory1 *)
+
+ function shift_sint321 (p:addr1) (k:int) : addr1 = shift1 p k
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_ref_f' Cluster 'Axiomatic'
+ ---------------------------------------------
+ theory Axiomatic1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -137,9 +146,11 @@ theory Axiomatic1
+ (* use map.Map1 *)
+
+ predicate P_P1 int
++
+ end
+ [wp:print-generated]
+ theory WP1
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool1 *)
+@@ -166,6 +177,7 @@ end
+ forall t:addr1 -> int, i:int, a:addr1.
+ let x = get1 t (shift_sint321 a i) in
+ region1 (a.base1) <=' 0 -> is_sint321 i -> is_sint321 x -> P_P1 x
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle 2023-12-22 17:10:51.755826433 -0700
+@@ -9,6 +9,7 @@
+ --- Context 'typed_job' Cluster 'Matrix'
+ ---------------------------------------------
+ theory Matrix
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -31,11 +32,13 @@ theory Matrix
+
+ predicate EqArray_int (n:int) (t:int -> int) (t1:int -> int) =
+ forall i:int. 0 <= i -> i < n -> get t1 i = get t i
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_job' Cluster 'S1_S'
+ ---------------------------------------------
+ theory S1_S
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -62,11 +65,13 @@ theory S1_S
+ predicate EqS1_S (s:S1_S) (s1:S1_S) =
+ (F1_S_f s1 = F1_S_f s /\ EqArray_int 5 (F1_S_a s) (F1_S_a s1)) /\
+ EqArray_int 5 (F1_S_b s) (F1_S_b s1)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_job' Cluster 'Compound'
+ ---------------------------------------------
+ theory Compound
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -221,9 +226,11 @@ theory Compound
+ separated p 11 q n ->
+ Load_S1_S p mint1 mint (havoc mint3 mint2 q n) =
+ Load_S1_S p mint1 mint mint2
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -249,6 +256,7 @@ end
+ let a1 = Load_S1_S a t t2 t1 in
+ let a2 = Load_S1_S a t (set t2 (shiftfield_F1_S_f a) i) t1 in
+ region (a.base) <= 0 -> IsS1_S a1 -> IsS1_S a2 -> EqS1_S a2 a1
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
+--- frama-c-28.0-Nickel/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle.orig 2023-11-29 17:00:00.000000000 -0700
++++ frama-c-28.0-Nickel/src/plugins/wp/tests/wp_typed/oracle/struct_array_type.res.oracle 2023-12-22 17:11:10.715582269 -0700
+@@ -9,6 +9,7 @@
+ --- Context 'typed_f' Cluster 'Matrix'
+ ---------------------------------------------
+ theory Matrix
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -26,11 +27,13 @@ theory Matrix
+ (* use frama_c_wp.cint.Cint *)
+
+ predicate IsArray_sint32 (t:int -> int) = forall i:int. is_sint32 (get t i)
++
+ end
+ ---------------------------------------------
+ --- Context 'typed_f' Cluster 'S1_s'
+ ---------------------------------------------
+ theory S1_s
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -54,9 +57,11 @@ theory S1_s
+ IsArray_sint32 (F1_s_a s) /\ IsArray_sint32 (F1_s_b s)
+
+ predicate IsArray_S1_s (t:int -> S1_s) = forall i:int. IsS1_s (get t i)
++
+ end
+ [wp:print-generated]
+ theory WP
++
+ (* use why3.BuiltIn.BuiltIn *)
+
+ (* use bool.Bool *)
+@@ -86,6 +91,7 @@ end
+ is_uint32 i ->
+ is_sint32 a2 ->
+ is_sint32 a1 -> is_sint32 ((1 + ((- 1) * a1)) + a3) -> (2 * a1) <= a3
++
+ end
+ [wp] 1 goal generated
+ ------------------------------------------------------------
diff --git a/frama-c.spec b/frama-c.spec
index 5d84e5f..d28eeb3 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -1,19 +1,15 @@
# Coq's plugin architecture requires cmxs files, so:
ExclusiveArch: %{ocaml_native_compiler}
-%ifnarch %{ocaml_native_compiler}
-%global debug_package %{nil}
-%endif
-
# Without this, gcc flags are passed to frama-c in the test suite
%undefine _auto_set_build_flags
Name: frama-c
-Version: 27.1
-Release: 5%{?dist}
+Version: 28.0
+Release: 1%{?dist}
Summary: Framework for source code analysis of C software
-%global pkgversion %{version}-Cobalt
+%global pkgversion %{version}-Nickel
# Licensing breakdown in source file frama-c.licensing
License: LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND GPL-2.0-or-later AND CC0-1.0 AND CC-BY-SA-4.0 AND BSD-3-Clause AND QPL-1.0-INRIA-2004 WITH QPL-1.0-INRIA-2004-exception
@@ -38,8 +34,8 @@ Source15: com.%{name}.%{name}-gui.metainfo.xml
Source16: acsl.el
Source17: frama-c.licensing
-# ocamlgraph 2.1.0 adds newlines at the ends of dot files, breaking tests
-Patch0: %{name}-ocamlgraph-2.1.0.patch
+# Ignore whitespace differences in the tests
+Patch0: %{name}-test.patch
BuildRequires: alt-ergo
BuildRequires: clang
@@ -66,6 +62,7 @@ BuildRequires: ocaml-ppx-deriving-devel
BuildRequires: ocaml-ppx-deriving-yaml-devel >= 0.2.0
BuildRequires: ocaml-ppx-deriving-yojson-devel
BuildRequires: ocaml-ppx-import-devel
+BuildRequires: ocaml-unionfind-devel
BuildRequires: ocaml-why3-devel >= 1.6.0
BuildRequires: ocaml-yaml-devel >= 3.0.0
BuildRequires: ocaml-yojson-devel >= 2.0.1
@@ -132,7 +129,7 @@ This package contains an Emacs support file for working with C source
files marked up with ACSL.
%prep
-%autosetup -n %{name}-%{pkgversion} -p1
+%autosetup -p1 -n %{name}-%{pkgversion}
%setup -q -T -D -a 1 -n %{name}-%{pkgversion}
%setup -q -T -D -a 2 -n %{name}-%{pkgversion}
%setup -q -T -D -a 13 -n %{name}-%{pkgversion}
@@ -269,6 +266,11 @@ make default-tests PTESTS_OPTS=-error-code
%{_emacs_sitestartdir}/acsl.el
%changelog
+* Tue Jan 2 2024 Jerry James <loganjerry(a)gmail.com> - 28.0-1
+- Version 28.0
+- Drop upstreamed patches
+- Add patch for whitespace differences in the tests
+
* Tue Nov 14 2023 Jerry James <loganjerry(a)gmail.com> - 27.1-5
- Fix failure to find plugins (bz 2249607)
- Install the zsh completion file
diff --git a/sources b/sources
index 89cc9d2..83aedb8 100644
--- a/sources
+++ b/sources
@@ -1,14 +1,15 @@
-SHA512 (frama-c-27.1-Cobalt.tar.gz) = cfc1104b94adc687209ed28f4417baa95f24d0b353fa1be799743c0374a2fc37fc9fe80e455a21b0802df8b496d20a83c39c2fc0d940a3e04391881947e6f5d8
-SHA512 (frama-c-27.1-Cobalt-api.tar.gz) = 0e0ffdf51fdd60ae68deedc8ac94e6422ebbcd1aefff5575173e9b7d8a50eac6f92ca3e4dc6177809134c26bcf063d10b2a0b94ab2afbbaa65f08337c8e84af3
-SHA512 (frama-c-server-27.1-Cobalt-api.tar.gz) = 6942a59d7ef797e7af2b1f7daaa21e85bec059c1a3f619d724edf0591ccd0e10e6937e29ab0c7265e6e2c61acde543f563d7dc111047692be0c1e80c0314a37d
+SHA512 (frama-c-28.0-Nickel.tar.gz) = 4688c84287bd0738c9e8adc11d542b4c12ab8b1bbe6e5f5ac5bde1ff7e6ceaa64a89c2308711af024816a74f12a69485e3fc38bea1fb70aca706c1b2ead1e0c9
+SHA512 (frama-c-28.0-Nickel-api.tar.gz) = f97a2b0fa0e892d36c0dcdb60b3b45169dc31f851ebfdb9439f100e9009158057c969fb06a4f3ca9c2baa6fe1d188917c455fde500a576cf4706c598db5668d0
+SHA512 (frama-c-server-28.0-Nickel-api.tar.gz) = 66ec88396a2aa375e04e9debf1680c796f54bf712397c2248deb76b143a2db9f2ed71ba3924e6873e87dedcf76e0247e84c76ea870c4d772b4abc1956642c26a
SHA512 (frama-c-icons.tar.xz) = 9fb1f6fc32559cfb74491c7f284c4c111d1ce0720fecca8a84713cb68bfa1c77cbeb241c720f58ef0a1140076d2d324f1dcae6cb47650e73c7915e82b2a6914d
SHA512 (acsl-implementation-27.1-Cobalt.pdf) = 1ea8b72f24a4fb9ef375da03be19ac92b62f79029662acd26c5386aec98c42a76727c2b2eb4eac08412e3f6ede60b93ef0166a22f8b3c33f628ab9d95f212207
-SHA512 (aorai-manual-27.1-Cobalt.pdf) = 0816f3443b2fa1ca573c68d0845b329454b23beaeebb060839502f44b9d3e2554e1da4299808f37d7bff552d010f0f84ab4cc5131c8cbb62ecfc908e6e6fc8fb
-SHA512 (e-acsl-implementation-27.1-Cobalt.pdf) = 8255182be488505b0bbdd1816cfcdb3ac2c6c2594db8fcbf57c9c93c27d243e003076214ba7c2ace489a62886b9f94d4c91806884c44d2b173a7ddbd047eee2b
-SHA512 (e-acsl-manual-27.1-Cobalt.pdf) = 98eccec17254823ad050affe706aa7bdfc15a7de8fab6f8cdc4ab2309d75a7e10780890e01520ffa77a509503a0e3d2cac6e285df5130c3975e0cd0a3e3752dc
-SHA512 (eva-manual-27.1-Cobalt.pdf) = 917eeeed31842961800b05990bf01dcf4bf76488f7a9616de814c5f410708b8f01f97b9e4302efd0971aa57c6a89bfe0f98f86592b356b2bf8e0003f5b1a64f6
-SHA512 (metrics-manual-27.1-Cobalt.pdf) = b00996c1cc7857ee2616901f6ce2313753ac9b7c6f68b924f944b825a35b6b9736cc75a5c91c151d11397058e4ca3c55a79cb94cfa8c85e0213916645a1a61e6
-SHA512 (plugin-development-guide-27.1-Cobalt.pdf) = 56654bf97208e01ad24f4998ee6c3abb2d39a19de0c43c528f77f20232170599505043325b72afddf4add1044147c60ff250adc937ce554f54145699a3d6f1a4
-SHA512 (rte-manual-27.1-Cobalt.pdf) = cbd74d31e6d093f4e207b2f7beb0505b2a04ca2f7593dce8d8295c10a2033cba38b701073d835d12433f385fcba8b789b12f49d456b9e6badd6e9c0b6ce01982
-SHA512 (user-manual-27.1-Cobalt.pdf) = ea49532b9590e905ac1c2129c2942c56434796f33b1e1006acf0ebaaeb12e42cdaf8be6e58bec1f8e949b0411504287955950e47aa3cbd6a6b7378b53a8f3075
-SHA512 (wp-manual-27.1-Cobalt.pdf) = e7f08057957283d5597c5ede862bfaf66fe9ceee4182d014b01b0ccde88dc6df1606f7f1cf0ce691fb6d6d2551ea2542e538e8c7ab59c930363fb0ae1d83c148
+SHA512 (acsl-implementation-28.0-Nickel.pdf) = b01681a164c3739151ec39c2d0a73816e7cdbc753b8025cfd48ece775814fc25a726abd9a59c2a68e41fc42cca830408bedb604856b3f73097e1980bddfd8c20
+SHA512 (aorai-manual-28.0-Nickel.pdf) = 902b4d21875a3fa87d6ae96693efbee2633c14efdf112ec4c60be20902625b7b6c0580bd18816e67401cc55056a4df17ba66f6a1921499fce3ff0fecdbf86866
+SHA512 (e-acsl-implementation-28.0-Nickel.pdf) = 0357d46be488b69924b6dd3a13336003c133e394714984aa2100ebd65c2488f5862cb63bc14ee4c1d927576deeccd952d52eee8a5937a57330c5e65620a21579
+SHA512 (e-acsl-manual-28.0-Nickel.pdf) = 9122c94449ebacac2733a175225058ddbb4354a766209227ef21ee6c24f30b89cfbc9f6df8f2f66f3997c096aa063d07173fe394561bf37cd45fd94700228728
+SHA512 (eva-manual-28.0-Nickel.pdf) = e6876f902cadf811294a215af523dcf517d3c9149f989274e74c872c41067c41e43bdc5fb5f034d5bf9f2c6b825058c15c646e46b9e6d40aa50cc93387e48de8
+SHA512 (metrics-manual-28.0-Nickel.pdf) = ce241960c831e205e5d2a39f781054cf49f6b99dfe23284033637e5cc433566cd6e4f8d85ac5a3db7fb853a5755fa608596762dff208c5cd9fab85a1537a1c95
+SHA512 (plugin-development-guide-28.0-Nickel.pdf) = b32ed62263e48b5f2a8764e2cc453cc45f486236a0b5ba0685c5f1db25a3ce54b7702b3b5ba2a4ef7203d72745292c2c82e13ddde009410845cf3a27d356f177
+SHA512 (rte-manual-28.0-Nickel.pdf) = 35c4f5719d733f4eca2edbcf10c8ed7d52b9b4c7da57087b90016fb92268688f0fb803ad05dc655bf406c2a3ce04a58403400774df88965c8603a1752306709f
+SHA512 (user-manual-28.0-Nickel.pdf) = 6a521e5973e93464b72228692fdb79c47e8979cd3d447eb0a1a66271663ece9bfb9bd7fcba341cbda48dc124308fdf7aa2dad5427b6caf211815199876639c1d
+SHA512 (wp-manual-28.0-Nickel.pdf) = 70f06fb2dc6b4cee5a659cf3caaa91c28aad2d814e858c90fca4881ba1e0febe51f1959b0569b7deec1e241a847edf1085289824236b279092aba62711ee720a
4 months, 4 weeks
Architecture specific change in rpms/ocaml-unionfind.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-unionfind.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/ocaml-unionfind.git/commit/?id=78...
https://src.fedoraproject.org/cgit/rpms/ocaml-unionfind.git/commit/?id=05....
Change:
+%ifnarch %{ocaml_native_compiler}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 78031279a5e1772cfd410f88d2dad0102975388d
Author: Jerry James <loganjerry(a)gmail.com>
Date: Fri Dec 29 08:48:29 2023 -0700
Disable debuginfo on bytecode architectures
diff --git a/ocaml-unionfind.spec b/ocaml-unionfind.spec
index 0c2e197..3de83ef 100644
--- a/ocaml-unionfind.spec
+++ b/ocaml-unionfind.spec
@@ -1,3 +1,7 @@
+%ifnarch %{ocaml_native_compiler}
+%global debug_package %{nil}
+%endif
+
Name: ocaml-unionfind
Version: 20220122
Release: %autorelease
commit 05152f7da4dcc8b61c6d1abf298612594af688a9
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Dec 28 20:47:46 2023 -0700
Initial RPM
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..81b1550
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/unionfind-*.tar.bz2
diff --git a/ocaml-unionfind.spec b/ocaml-unionfind.spec
new file mode 100644
index 0000000..0c2e197
--- /dev/null
+++ b/ocaml-unionfind.spec
@@ -0,0 +1,50 @@
+Name: ocaml-unionfind
+Version: 20220122
+Release: %autorelease
+Summary: OCaml implementations of the union-find data structure
+
+License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
+URL: https://gitlab.inria.fr/fpottier/unionfind
+Source0: %{url}/-/archive/%{version}/unionfind-%{version}.tar.bz2
+
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+
+BuildRequires: ocaml >= 4.05
+BuildRequires: ocaml-dune >= 1.4
+
+%description
+The OCaml library unionFind offers two implementations of the union-find
+data structure. Both implementations are based on disjoint sets
+forests, with path compression and linking-by-rank, so as to guarantee
+good asymptotic complexity: every operation requires a quasi-constant
+number of accesses to the store.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and signature
+files for developing applications that use %{name}.
+
+%prep
+%autosetup -n unionfind-%{version}
+
+%build
+%dune_build
+
+%install
+%dune_install
+
+%check
+%dune_check
+
+%files -f .ofiles
+%license LICENSE
+%doc AUTHORS CHANGES.md README.md
+
+%files devel -f .ofiles-devel
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..b13b0ff
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (unionfind-20220122.tar.bz2) = ff7c17eb120c9bc67d188b0a722e1a2f8cb62788540edc400514a93b610b2a924e8c0a52cb298679220972835c2593d04c3025aa0a2b6061b62b75192ac1072e
4 months, 4 weeks
Architecture specific change in rpms/gappa.git
by githook-noreply@fedoraproject.org
The package rpms/gappa.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/gappa.git/commit/?id=1e247bc04cfc....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 1e247bc04cfc184d7633fb16a17916605abbdd8c
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Jan 2 11:37:04 2024 -0700
Version 1.4.2. New URLs.
diff --git a/gappa.spec b/gappa.spec
index 4c7c4cf..da0abf4 100644
--- a/gappa.spec
+++ b/gappa.spec
@@ -1,21 +1,22 @@
-%global commit edac95d7f6cb65ca676c59d3c5a5d69cbe27345f
%global _docdir_fmt %{name}
Name: gappa
-Version: 1.4.1
-Release: 3%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: Prove programs with floating-point or fixed-point arithmetic
License: GPL-3.0-only OR CECILL-2.1
-URL: https://gitlab.inria.fr/gappa/gappa
-Source0: %{url}/-/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL: https://gappa.gitlabpages.inria.fr/
+Source0: %{url}/releases/%{name}-%{version}.tar.gz
+
+# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: gmp-devel
-BuildRequires: libtool
BuildRequires: mpfr-devel
BuildRequires: %{py3_dist sphinx}
BuildRequires: remake
@@ -56,14 +57,11 @@ License: (GPL-3.0-only OR CECILL-2.1) AND MIT AND BSD-2-Clause AND BSD-3-Clause
Documentation for gappa.
%prep
-%autosetup -n %{name}-%{name}-%{version}-%{commit}
+%autosetup
# Increase the test timeout for ARM
sed -i 's/timeout 5/&0/' Remakefile.in
-# Generate the configure script
-./autogen.sh
-
%build
%configure
# Use the system remake
@@ -88,6 +86,10 @@ remake check
%doc AUTHORS doc/html
%changelog
+* Tue Jan 2 2024 Jerry James <loganjerry(a)gmail.com> - 1.4.2-1
+- Version 1.4.2
+- New URLs
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index c6a1cc9..9da42cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gappa-1.4.1.tar.gz) = c881eb35ad867320c2232c200dde66149fcd8a27972b8dfac1256a477a53e1885a7f89f82e70dbef553ce152e4afb0778bc347ed28cd4d698a1a69e308114aa2
+SHA512 (gappa-1.4.2.tar.gz) = aec04da1a478ecc876794b06a92a56ceb76ae2b1edd0da2a18cb509b3ae6f81437fe73777b7b05ef129edd8754528330f3f3a4713713c70934af3a6bdac4c7e5
4 months, 4 weeks
Architecture specific change in rpms/rpm-ostree.git
by githook-noreply@fedoraproject.org
The package rpms/rpm-ostree.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/rpm-ostree.git/commit/?id=2b0651e....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 5d386d26be0edebbbf3597a0aadd4eeff3445dd7
Merge: f8acec1 04d8520
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Jan 2 17:26:33 2024 -0500
Merge remote-tracking branch 'origin/rawhide' into f39
commit 04d852040b40f0af3faf848b0f5ec337c4ca7ff7
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Jan 2 17:24:01 2024 -0500
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5d1ef64
--- /dev/null
+++ b/changelog
@@ -0,0 +1,796 @@
+* Tue Jan 02 2024 Colin Walters <walters(a)verbum.org> - 2024.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
+
+* Mon Dec 18 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.12-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.12
+
+* Wed Nov 29 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.11-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.11
+
+* Wed Nov 15 2023 Timothée Ravier <tim(a)siosm.fr> - 2023.10-4
+- Setup rpm-ostree-countme.timer according to presets
+
+* Thu Oct 26 2023 Colin Walters <walters(a)verbum.org> - 2023.10-3
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.10
+
+* Wed Oct 04 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.8-3
+- Update python3 macros and dependency.
+
+* Wed Sep 27 2023 Colin Walters <walters(a)verbum.org> - 2023.8-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.8
+
+* Tue Aug 29 2023 Colin Walters <walters(a)verbum.org> - 2023.6-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.7
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2023.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 21 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.5-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.5
+
+* Tue Jun 13 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.4-5
+- Switch License tags to SPDX
+
+* Thu May 25 2023 Adam Williamson <awilliam(a)redhat.com> - 2023.4-4
+- Backport libdnf patches to work with rpm-4.19
+
+* Fri May 19 2023 Petr Pisar <ppisar(a)redhat.com> - 2023.4-3
+- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
+
+* Thu May 18 2023 Colin Walters <walters(a)verbum.org> - 2023.4-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.4
+
+* Mon Apr 24 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.3-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.3
+
+* Tue Mar 07 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.2-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.2
+
+* Thu Feb 16 2023 Colin Walters <walters(a)verbum.org> - 2023.1-4
+- Cherry pick
+ https://github.com/coreos/rpm-ostree/pull/4308/commits/476afb1d08513cb74c...
+
+* Sun Feb 05 2023 Fabio Valentini <decathorpe(a)gmail.com> - 2023.1-3
+- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2023.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Jonathan Lebon <jonathan(a)jlebon.com> - 2023.1-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2023.1
+
+* Tue Dec 20 2022 Colin Walters <walters(a)verbum.org> - 2022.19-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
+
+* Tue Dec 13 2022 Colin Walters <walters(a)verbum.org> - 2022.18-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.18
+
+* Mon Dec 12 2022 Colin Walters <walters(a)verbum.org> - 2022.17-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.17
+
+* Mon Nov 28 2022 Colin Walters <walters(a)verbum.org> - 2022.16-2
+- Cherry pick https://github.com/coreos/rpm-ostree/pull/4166
+
+* Fri Nov 18 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.16-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.16
+
+* Wed Nov 02 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.15-3
+- Backport semanage bug workaround
+ https://github.com/coreos/rpm-ostree/pull/4122
+
+* Tue Nov 01 2022 Colin Walters <walters(a)verbum.org> - 2022.15-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.15
+
+* Thu Oct 13 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.14-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.14
+
+* Sat Aug 27 2022 Colin Walters <walters(a)verbum.org> - 2022.13-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.13
+
+* Sun Aug 07 2022 Colin Walters <walters(a)verbum.org> - 2022.12-4
+- Cherry pick patch to work around filesystem package
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2022.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Colin Walters <walters(a)verbum.org> - 2022.12-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
+
+* Mon Jul 11 2022 Colin Walters <walters(a)verbum.org> - 2022.11-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.11
+
+* Thu Jun 16 2022 Colin Walters <walters(a)verbum.org> - 2022.10-3
+- Backport https://github.com/coreos/rpm-ostree/pull/3771
+
+* Tue Jun 14 2022 Colin Walters <walters(a)verbum.org> - 2022.10-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.10
+
+* Fri May 13 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.9-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.9
+
+* Wed Apr 20 2022 Colin Walters <walters(a)verbum.org> - 2022.8-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.8
+
+* Mon Apr 11 2022 Colin Walters <walters(a)verbum.org> - 2022.7-2
+- Rebase to 2022.7
+
+* Fri Apr 08 2022 Colin Walters <walters(a)verbum.org> - 2022.6-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.6
+
+* Thu Mar 24 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.5.80.gb7f91619
+- Git snapshot for https://github.com/coreos/rpm-ostree/pull/3535
+
+* Thu Mar 03 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.5-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.5
+
+* Tue Mar 01 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.4-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.4
+
+* Mon Feb 28 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.3-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.3
+
+* Thu Feb 03 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.2-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.2
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2022.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Colin Walters <walters(a)verbum.org> - 2022.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2022.1
+
+* Wed Nov 17 2021 Colin Walters <walters(a)verbum.org> - 2021.14-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.14
+
+* Wed Nov 03 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.13-2
+- Backport patch to fix F35 rebases through DBus
+ https://github.com/coreos/rpm-ostree/pull/3199
+
+* Tue Nov 02 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.13-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2021.13
+
+* Thu Oct 14 2021 Colin Walters <walters(a)verbum.org> - 2021.12-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.12
+
+* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3
+- Backport patch for openshift/os extensions + multiarch
+
+* Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
+
+* Tue Sep 14 2021 Sahana Prasad <sahana(a)redhat.com> - 2021.10-3
+- Rebuilt with OpenSSL 3.0.0
+
+* Fri Aug 27 2021 Colin Walters <walters(a)verbum.org> - 2021.10-2
+- Backport
+ https://github.com/coreos/rpm-ostree/pull/3095/commits/1d445170b97e8eaad6...
+
+* Thu Aug 26 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.10-1
+- New release v2021.10
+ https://github.com/coreos/rpm-ostree/releases/tag/v2021.10
+
+* Thu Aug 19 2021 Colin Walters <walters(a)verbum.org> - 2021.9-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.9
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2021.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.7-1
+- New release v2021.7
+ https://github.com/coreos/rpm-ostree/releases/tag/v2021.7
+
+* Sat Jul 10 2021 Björn Esser <besser82(a)fedoraproject.org> - 2021.6-3
+- Rebuild for versioned symbols in json-c
+
+* Tue Jun 22 2021 Colin Walters <walters(a)verbum.org>
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.6
+
+* Thu Jun 17 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.5-2
+- Backport _dbpath fixes, see
+ https://github.com/coreos/rpm-ostree/issues/2904
+
+* Wed May 12 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.5-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2021.5
+
+* Sun May 09 2021 Jeff Law <jlaw(a)tachyum.com> - 2021.4-4
+- Re-enable LTO
+
+* Wed Apr 28 2021 Colin Walters <walters(a)verbum.org> - 2021.4-3
+- Backport another patch for https://pagure.io/fedora-infrastructure/issue/9909
+
+* Tue Apr 27 2021 Colin Walters <walters(a)verbum.org> - 2021.4-2
+- Backport patch for https://pagure.io/fedora-infrastructure/issue/9909
+
+* Mon Apr 12 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.4-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.4
+
+* Wed Mar 17 2021 Colin Walters <walters(a)verbum.org> - 2021.3-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.3
+
+* Wed Feb 17 2021 Colin Walters <walters(a)verbum.org> - 2021.2-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.2
+
+* Wed Feb 10 2021 Colin Walters <walters(a)verbum.org> - 2021.1-4
+- Backport patches from https://github.com/coreos/rpm-ostree/pull/2553
+
+* Tue Jan 26 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.1-3
+- Backport https://github.com/coreos/rpm-ostree/pull/2490 for rawhide
+
+* Tue Jan 19 15:08:59 UTC 2021 Colin Walters <walters(a)verbum.org> - 2021.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2021.1
+
+* Fri Dec 11 19:13:03 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.10-3
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.10
+
+* Fri Dec 11 13:42:33 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.9-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.9
+
+* Sat Nov 14 14:51:20 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.8-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.8
+
+* Mon Nov 02 2020 Luca BRUNO <lucab(a)lucabruno.net> - 2020.7-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
+
+* Mon Nov 02 2020 Jeff Law <law(a)redhat.com> - 2020.6-2
+- Fix invalid use of volatile caught by gcc-11
+
+* Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.6-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
+
+* Wed Oct 28 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> - 2020.5-2
+- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
+
+* Tue Sep 15 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.5-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2020.5
+
+* Mon Aug 17 2020 Colin Walters <walters(a)verbum.org> - 2020.4.15.g8b0bcd7b-2
+- Update to latest upstream git for
+ https://bugzilla.redhat.com/show_bug.cgi?id=1865397
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2020.4-2
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.4-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2020.4
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2020.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Jeff Law <aw(a)redhat.com> - 2020.3-2
+- Disable LTO
+
+* Fri Jun 19 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.3-1
+- New upstream version
+ https://github.com/coreos/rpm-ostree/releases/tag/v2020.3
+
+* Fri May 15 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.2-3
+- Backport https://github.com/coreos/rpm-ostree/pull/2096
+ See https://github.com/coreos/fedora-coreos-tracker/issues/481
+
+* Fri May 15 2020 Colin Walters <walters(a)verbum.org> - 2020.2-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.2
+
+* Tue Apr 21 2020 Björn Esser <besser82(a)fedoraproject.org> - 2020.1.80.g3ec5e287-2
+- Rebuild (json-c)
+
+* Mon Apr 20 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1.80.g3ec5e287-1
+- git master snapshot for using strict mode and lockfile-repos in FCOS:
+ https://github.com/coreos/rpm-ostree/pull/1858
+ https://github.com/coreos/rpm-ostree/pull/2058
+ https://github.com/coreos/fedora-coreos-tracker/issues/454
+
+* Fri Mar 13 2020 Colin Walters <walters(a)verbum.org> - 2020.1.21.ge9011530-2
+- Backport https://github.com/coreos/rpm-ostree/pull/2015
+ See https://github.com/coreos/fedora-coreos-tracker/issues/343
+
+* Thu Feb 27 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1.21.ge9011530-1
+- git master snapshot for using base initramfs kargs in RHCOS:
+ https://github.com/coreos/rpm-ostree/pull/1998
+ https://github.com/coreos/rpm-ostree/pull/1997
+ https://bugzilla.redhat.com/show_bug.cgi?id=1806588
+
+* Wed Feb 05 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1-1
+- New upstream version
+
+* Tue Feb 04 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7.31.g70c38563-1
+- git master snapshot for Silverblue rawhide compose fixes
+ https://pagure.io/releng/failed-composes/issue/717
+ https://pagure.io/releng/failed-composes/issue/929
+ https://github.com/rpm-software-management/libdnf/pull/885
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2019.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 09 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7-2
+- Backport patch for Silverblue composes:
+ https://pagure.io/releng/failed-composes/issue/717
+
+* Thu Dec 19 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7-1
+- New upstream version
+
+* Sat Dec 14 2019 Jeff Law <law(a)redhat.com> - 2019.6.24.gfec61ce5-2
+- Fix missing #includes for gcc-10
+
+* Thu Oct 31 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6.27.g3b8a1ec6-1
+- git master snapshot for dracut cpio cap_mknod fix:
+ https://github.com/coreos/rpm-ostree/pull/1946
+
+* Thu Oct 31 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6.24.gfec61ce5-1
+- git master snapshot for HMAC path fix for FIPS:
+ https://github.com/coreos/rpm-ostree/pull/1934
+
+* Wed Sep 25 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6-1
+- New upstream version
+
+* Thu Aug 22 2019 Colin Walters <walters(a)verbum.org> - 2019.5.7.gcac5aa41-3
+- New upstream git snapshot, mainly for backporting the arch-includes conditionals
+ to aid Fedora CoreOS on s390x.
+
+* Wed Jul 31 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 2019.5-2
+- Fix libmodulemd dependencies
+
+* Thu Jul 25 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.5-1
+- New upstream version
+
+* Fri Jul 19 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.39.g8d90d03d-1
+- git master snapshot for --parent and lockfile overrides
+ https://github.com/projectatomic/rpm-ostree/pull/1871
+ https://github.com/projectatomic/rpm-ostree/pull/1867
+
+* Fri Jul 12 2019 Colin Walters <walters(a)verbum.org> - 2019.4.28.g44395673-3
+- Update rpmostree-rust.h in sources
+
+* Fri Jul 12 2019 Colin Walters <walters(a)verbum.org> - 2019.4.28.g44395673-2
+- Update with git snapshot for zstd support
+
+* Wed Jul 10 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.27.gb381e029-1
+- git master snapshot for add-commit-metadata
+ https://github.com/projectatomic/rpm-ostree/pull/1865/
+
+* Fri Jun 14 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.15.gbbc9aa9f-1
+- git master snapshot for OSTree layers
+ https://github.com/projectatomic/rpm-ostree/pull/1830/
+
+* Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2019.4.10.gc1cc0827-3
+- Rebuild for RPM 4.15
+
+* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2019.4.10.gc1cc0827-2
+- Rebuild for RPM 4.15
+
+* Thu Jun 06 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.10.gc1cc0827-1
+- git master snapshot for lockfile
+ https://github.com/projectatomic/rpm-ostree/pull/1745/
+
+* Tue May 28 2019 Dusty Mabe <dusty(a)dustymabe.com> - 2019.4-3
+- Add back in ppc64le and ppc64
+
+* Thu May 23 2019 Dusty Mabe <dusty(a)dustymabe.com> - 2019.4-2
+- Backport patch for db diff --format=json
+
+* Tue May 21 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4-1
+- New upstream version
+
+* Mon May 06 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3.5.g0da9f997-2
+- Add temporary hack to avoid UTF-8 for Bodhi
+ https://pagure.io/releng/issue/8330
+
+* Tue Apr 09 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3.5.g0da9f997-1
+- git master snapshot to test coreos-continuous tag
+
+* Wed Mar 27 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3-1
+- New upstream version
+
+* Thu Feb 14 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.2-1
+- New upstream version
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2019.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 22 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.1-1
+- New upstream version
+
+* Fri Dec 14 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.10-1
+- New upstream version
+
+* Tue Dec 04 2018 Jonathan Lebon <jonathan(a)jlebon.com>
+- Simplify Rust conditionals
+
+* Fri Nov 02 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.9-3
+- Backport patch for https://pagure.io/dusty/failed-composes/issue/956
+
+* Tue Oct 30 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2018.9-2
+- Rebuild for libsolv 0.7
+
+* Sun Oct 28 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.9-1
+- New upstream version
+
+* Tue Sep 11 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.8-1
+- New upstream version
+
+* Thu Aug 09 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.7-1
+- New upstream version
+
+* Wed Aug 01 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6.42.gda27b94b-1
+- git master snapshot for https://bugzilla.redhat.com/show_bug.cgi?id=1565647
+
+* Mon Jul 30 2018 Colin Walters <walters(a)verbum.org> - 2018.6-4
+- Backport patch for https://bugzilla.redhat.com/show_bug.cgi?id=1607223
+ from https://github.com/projectatomic/rpm-ostree/pull/1469
+- Also https://github.com/projectatomic/rpm-ostree/pull/1461
+
+* Mon Jul 16 2018 Colin Walters <walters(a)verbum.org> - 2018.6-3
+- Make build python3-only compatible for distributions that want that
+
+* Fri Jun 29 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6-2
+- Rebuild for yummy Rusty bitsy
+
+* Fri Jun 29 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6-1
+- New upstream version
+
+* Tue May 15 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.5-1
+- New upstream version
+
+* Mon Mar 26 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.4-1
+- New upstream version
+
+* Sun Mar 18 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2018.3-4
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Wed Mar 07 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.3-3
+- Add BR on gcc-c++
+
+* Thu Mar 01 2018 Dusty Mabe <dusty(a)dustymabe.com> - 2018.3-2
+- backport treating FUSE as netfs
+- See https://github.com/projectatomic/rpm-ostree/pull/1285
+
+* Sun Feb 18 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.3-1
+- New upstream version (minor bugfix release)
+
+* Fri Feb 16 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.2-1
+- New upstream version
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2018.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 19 2018 Dusty Mabe <dusty(a)dustymabe.com> - 2018.1-2
+- Revert the ostree:// formatting in the output.
+- See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137
+
+* Mon Jan 15 2018 Colin Walters <walters(a)verbum.org> - 2018.1-1
+- https://github.com/projectatomic/rpm-ostree/releases/tag/v2018.1
+
+* Tue Dec 05 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.11-1
+- New upstream version
+
+* Wed Nov 22 2017 Colin Walters <walters(a)verbum.org> - 2017.10-3
+- Backport patch for NFS issues
+- https://pagure.io/atomic-wg/issue/387
+
+* Sun Nov 12 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.10-2
+- Backport fix for --repo handling
+ https://github.com/projectatomic/rpm-ostree/pull/1101
+
+* Thu Nov 02 2017 Colin Walters <walters(a)verbum.org> - 2017.10-1
+- https://github.com/projectatomic/rpm-ostree/releases/tag/v2017.10
+
+* Mon Sep 25 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.9-1
+- New upstream version
+
+* Mon Aug 21 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.8-2
+- Patch to allow metadata_expire=0
+ https://github.com/projectatomic/rpm-ostree/issues/930
+
+* Fri Aug 18 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.8-1
+- New upstream version
+
+* Thu Aug 10 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 2017.7-7
+- Rebuilt for RPM soname bump
+
+* Thu Aug 10 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 2017.7-6
+- Rebuilt for RPM soname bump
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.7-3
+- Tweak new pkg name to rpm-ostree-libs to be more consistent with the main
+ package name and ostree's ostree-libs.
+
+* Fri Jul 21 2017 Colin Walters <walters(a)verbum.org> - 2017.7-2
+- Enable introspection, rename shared lib to librpmostree
+ Due to an oversight, we were not actually building with introspection.
+ Fix that. And while we are here, split out a shared library package,
+ so that e.g. containers can do `from gi.repository import RpmOstree`
+ without dragging in the systemd service, etc. (RHBZ#1473701)
+
+* Mon Jul 10 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.7-1
+- New upstream version
+
+* Sat Jun 24 2017 Colin Walters <walters(a)verbum.org>
+- Update to git snapshot to help debug compose failure
+
+* Wed May 31 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-3
+- Make sure we don't auto-provide libdnf (RHBZ#1457089)
+
+* Fri May 26 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-2
+- Bump libostree dep
+
+* Fri May 26 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-1
+- New upstream version
+
+* Fri Apr 28 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.5-2
+- Bump libostree dep and rebuild in override
+
+* Fri Apr 28 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.5-1
+- New upstream version
+
+* Fri Apr 14 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.4-2
+- Backport patch to allow unprivileged `rpm-ostree status`
+
+* Thu Apr 13 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.4-1
+- New upstream version.
+
+* Fri Apr 07 2017 Colin Walters <walters(a)verbum.org> - 2017.3-4
+- Backport patch to add API devices for running on CentOS 7
+ https://github.com/projectatomic/rpm-ostree/issues/727
+
+* Thu Mar 16 2017 Colin Walters <walters(a)verbum.org> - 2017.3-3
+- Add patch to fix f26 altfiles
+
+* Fri Mar 10 2017 Colin Walters <walters(a)verbum.org> - 2017.3-2
+- Backport patch for running in koji
+
+* Mon Mar 06 2017 Colin Walters <walters(a)verbum.org> - 2017.3-1
+- New upstream version
+ Fixes: CVE-2017-2623
+ Resolves: #1422157
+
+* Fri Mar 03 2017 Colin Walters <walters(a)verbum.org> - 2017.2-5
+- Add patch to bump requires for ostree
+
+* Mon Feb 27 2017 Colin Walters <walters(a)verbum.org> - 2017.2-4
+- Add requires on ostree
+
+* Sat Feb 18 2017 Colin Walters <walters(a)verbum.org> - 2017.2-3
+- Add patch for gperf 3.1 compatibility
+ Resolves: #1424268
+
+* Wed Feb 15 2017 Colin Walters <walters(a)verbum.org> - 2017.2-2
+- New upstream version
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Colin Walters <walters(a)verbum.org> - 2017.1-3
+- Back out netns usage for now for https://pagure.io/releng/issue/6602
+
+* Sun Jan 22 2017 Colin Walters <walters(a)verbum.org> - 2017.1-2
+- New upstream version
+
+* Mon Dec 12 2016 walters(a)redhat.com - 2016.13-1
+- New upstream version
+
+* Sat Nov 26 2016 walters(a)redhat.com - 2016.12-4
+- Backport patch to fix install-langs
+
+* Tue Nov 15 2016 walters(a)redhat.com - 2016.11-2
+- New upstream version
+
+* Mon Oct 24 2016 walters(a)verbum.org - 2016.11-1
+- New upstream version
+
+* Fri Oct 07 2016 walters(a)redhat.com - 2016.10-1
+- New upstream version
+
+* Thu Sep 08 2016 walters(a)redhat.com - 2016.9-1
+- New upstream version
+
+* Thu Sep 08 2016 walters(a)redhat.com - 2016.8-1
+- New upstream version
+
+* Thu Sep 01 2016 walters(a)redhat.com - 2016.7-4
+- Add requires on fuse https://github.com/projectatomic/rpm-ostree/issues/443
+
+* Wed Aug 31 2016 Colin Walters <walters(a)verbum.org> - 2016.7-3
+- Backport patch for running inside mock
+
+* Sat Aug 13 2016 walters(a)redhat.com - 2016.6-3
+- New upstream version
+
+* Sat Aug 13 2016 Colin Walters <walters(a)verbum.org> - 2016.6-2
+- Backport patches from master to fix non-containerized composes
+
+* Thu Aug 11 2016 walters(a)redhat.com - 2016.6-1
+- New upstream version
+
+* Mon Jul 25 2016 Colin Walters <walters(a)verbum.org> - 2016.5-1
+- New upstream version
+
+* Fri Jul 08 2016 walters(a)verbum.org - 2016.4-2
+- Require bubblewrap
+
+* Fri Jul 08 2016 walters(a)redhat.com - 2016.4-1
+- New upstream version
+
+* Thu Jul 07 2016 Colin Walters <walters(a)verbum.org> - 2016.3.5.g4219a96-1
+- Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes
+
+* Wed Jun 15 2016 Colin Walters <walters(a)verbum.org> - 2016.3.3.g17fb980-2
+- Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes
+
+* Fri May 20 2016 Colin Walters <walters(a)redhat.com> - 2016.3-2
+- New upstream version
+
+* Thu Mar 31 2016 Colin Walters <walters(a)redhat.com> - 2016.1-3
+- Backport patch to fix Fedora composes writing data into source file:/// URIs
+
+* Thu Mar 24 2016 Colin Walters <walters(a)redhat.com> - 2016.1-2
+- New upstream version
+
+* Tue Feb 23 2016 Colin Walters <walters(a)redhat.com> - 2015.11.43.ga2c052b-2
+- New git snapshot, just getting some new code out there
+- We are now bundling a copy of libhif, as otherwise coordinated releases with
+ PackageKit/dnf would be required, and we are not ready for that yet.
+
+* Wed Feb 10 2016 Matthew Barnes <mbarnes(a)redhat.com> - 2015.11-3
+- Fix URL: https://github.com/projectatomic/rpm-ostree
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2015.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Dec 15 2015 Colin Walters <walters(a)redhat.com> - 2015.11-1
+- New upstream version
+
+* Sat Nov 21 2015 Colin Walters <walters(a)redhat.com> - 2015.10-1
+- New upstream version
+
+* Mon Nov 09 2015 Colin Walters <walters(a)redhat.com> - 2015.9-4
+- Fix files list for -devel, which should in turn fix Anaconda
+ builds which pull in rpm-ostree, but should not have devel bits.
+
+* Sat Oct 31 2015 Colin Walters <walters(a)redhat.com> - 2015.9-3
+- Add patch that should fix bodhis use of --workdir-tmpfs
+
+* Sat Sep 05 2015 Kalev Lember <klember(a)redhat.com> - 2015.9-2
+- Rebuilt for librpm soname bump
+
+* Wed Aug 26 2015 Colin Walters <walters(a)redhat.com> - 2015.9-2
+- New upstream version
+
+* Tue Aug 04 2015 Colin Walters <walters(a)redhat.com> - 2015.8-1
+- New upstream version
+
+* Mon Jul 27 2015 Colin Walters <walters(a)redhat.com> - 2015.7-5
+- rebuilt
+
+* Mon Jul 20 2015 Colin Walters <walters(a)redhat.com> - 2015.7-4
+- Rebuild for CentOS update to libhif
+
+* Tue Jun 16 2015 Colin Walters <walters(a)redhat.com> - 2015.7-3
+- Rebuild to pick up hif_source_set_required()
+
+* Mon Jun 15 2015 Colin Walters <walters(a)redhat.com> - 2015.7-2
+- New upstream version
+
+* Tue Jun 09 2015 Colin Walters <walters(a)redhat.com> - 2015.6-2
+- New upstream version
+
+* Tue May 12 2015 Colin Walters <walters(a)redhat.com> - 2015.5-3
+- Add patch to fix rawhide composes
+
+* Mon May 11 2015 Colin Walters <walters(a)redhat.com> - 2015.5-2
+- New upstream release
+ Adds shared library and -devel subpackage
+
+* Fri Apr 10 2015 Colin Walters <walters(a)redhat.com> - 2015.4-2
+- New upstream release
+ Port to libhif, drops dependency on yum.
+
+* Thu Apr 09 2015 Colin Walters <walters(a)redhat.com> - 2015.3-8
+- Cherry pick f21 patch to disable read only /etc with yum which
+ breaks when run inside docker
+
+* Wed Apr 08 2015 Colin Walters <walters(a)redhat.com> - 2015.3-7
+- Add patch to use yum-deprecated
+ Resolves: #1209695
+
+* Fri Feb 27 2015 Colin Walters <walters(a)redhat.com> - 2015.3-5
+- Drop /usr/bin/atomic, now provided by the "atomic" package
+
+* Fri Feb 06 2015 Dennis Gilmore <dennis(a)ausil.us> - 2015.3-4
+- add git to BuildRequires
+
+* Thu Feb 05 2015 Colin Walters <walters(a)redhat.com> - 2015.3-3
+- Adapt to Hawkey 0.5.3 API break
+
+* Thu Feb 05 2015 Dennis Gilmore <dennis(a)ausil.us> - 2015.3-3
+- rebuild for libhawkey soname bump
+
+* Fri Jan 23 2015 Colin Walters <walters(a)redhat.com> - 2015.3-2
+- New upstream release
+
+* Thu Jan 08 2015 Colin Walters <walters(a)redhat.com> - 2015.2-1
+- New upstream release
+
+* Wed Dec 17 2014 Colin Walters <walters(a)redhat.com> - 2014.114-2
+- New upstream release
+
+* Tue Nov 25 2014 Colin Walters <walters(a)redhat.com> - 2014.113-1
+- New upstream release
+
+* Mon Nov 24 2014 Colin Walters <walters(a)redhat.com> - 2014.112-1
+- New upstream release
+
+* Mon Nov 17 2014 Colin Walters <walters(a)redhat.com> - 2014.111-1
+- New upstream release
+
+* Fri Nov 14 2014 Colin Walters <walters(a)redhat.com> - 2014.110-1
+- New upstream release
+
+* Fri Oct 24 2014 Colin Walters <walters(a)redhat.com> - 2014.109-1
+- New upstream release
+
+* Sat Oct 04 2014 Colin Walters <walters(a)redhat.com> - 2014.107-2
+- New upstream release
+
+* Mon Sep 08 2014 Colin Walters <walters(a)redhat.com> - 2014.106-3
+- New upstream release
+- Bump requirement on ostree
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2014.105-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 08 2014 Colin Walters <walters(a)verbum.org> - 2014.105-2
+- New upstream release
+
+* Sun Jul 13 2014 Colin Walters <walters(a)verbum.org>
+- New upstream release
+
+* Sat Jun 21 2014 Colin Walters <walters(a)verbum.org>
+- New upstream release
+- Bump OSTree requirements
+- Enable hawkey package diff, we have new enough versions
+ of libsolv/hawkey
+- Enable /usr/bin/atomic symbolic link
+
+* Tue Jun 10 2014 Colin Walters <walters(a)verbum.org>
+- New upstream git snapshot
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2014.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 30 2014 Colin Walters <walters(a)verbum.org>
+- New upstream release
+
+* Fri May 23 2014 Colin Walters <walters(a)verbum.org>
+- Previous autobuilder code is split off into rpm-ostree-toolbox
+
+* Sun Apr 13 2014 Colin Walters <walters(a)verbum.org>
+- New upstream release
+
+* Tue Apr 08 2014 Colin Walters <walters(a)verbum.org>
+- Drop requires on yum to allow minimal images without it
+
+* Mon Mar 31 2014 Colin Walters <walters(a)verbum.org>
+- New upstream release
+
+* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6.3.g5707fa7-2
+- Bump ostree version requirement
+
+* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6.3.g5707fa7-1
+- New git snapshot, add rpm-ostree-sign to file list
+
+* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6-1
+- New upstream version
+
+* Fri Mar 07 2014 Colin Walters <walters(a)verbum.org> - 2014.5-1
+- Initial package
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index cb456dd..e0f61a7 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -4,7 +4,7 @@
Summary: Hybrid image/package system
Name: rpm-ostree
Version: 2024.1
-Release: 2%{?dist}
+Release: %autorelease
License: LGPL-2.0-or-later
URL: https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -257,800 +257,4 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel
%changelog
-* Tue Jan 02 2024 Colin Walters <walters(a)verbum.org> - 2024.1-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
-
-* Mon Dec 18 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.12-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.12
-
-* Wed Nov 29 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.11-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.11
-
-* Wed Nov 15 2023 Timothée Ravier <tim(a)siosm.fr> - 2023.10-4
-- Setup rpm-ostree-countme.timer according to presets
-
-* Thu Oct 26 2023 Colin Walters <walters(a)verbum.org> - 2023.10-3
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.10
-
-* Wed Oct 04 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.8-3
-- Update python3 macros and dependency.
-
-* Wed Sep 27 2023 Colin Walters <walters(a)verbum.org> - 2023.8-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.8
-
-* Tue Aug 29 2023 Colin Walters <walters(a)verbum.org> - 2023.6-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.7
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2023.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 21 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.5-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.5
-
-* Tue Jun 13 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.4-5
-- Switch License tags to SPDX
-
-* Thu May 25 2023 Adam Williamson <awilliam(a)redhat.com> - 2023.4-4
-- Backport libdnf patches to work with rpm-4.19
-
-* Fri May 19 2023 Petr Pisar <ppisar(a)redhat.com> - 2023.4-3
-- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
-
-* Thu May 18 2023 Colin Walters <walters(a)verbum.org> - 2023.4-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.4
-
-* Mon Apr 24 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.3-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.3
-
-* Tue Mar 07 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.2-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.2
-
-* Thu Feb 16 2023 Colin Walters <walters(a)verbum.org> - 2023.1-4
-- Cherry pick
- https://github.com/coreos/rpm-ostree/pull/4308/commits/476afb1d08513cb74c...
-
-* Sun Feb 05 2023 Fabio Valentini <decathorpe(a)gmail.com> - 2023.1-3
-- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2023.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 16 2023 Jonathan Lebon <jonathan(a)jlebon.com> - 2023.1-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2023.1
-
-* Tue Dec 20 2022 Colin Walters <walters(a)verbum.org> - 2022.19-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
-
-* Tue Dec 13 2022 Colin Walters <walters(a)verbum.org> - 2022.18-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.18
-
-* Mon Dec 12 2022 Colin Walters <walters(a)verbum.org> - 2022.17-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.17
-
-* Mon Nov 28 2022 Colin Walters <walters(a)verbum.org> - 2022.16-2
-- Cherry pick https://github.com/coreos/rpm-ostree/pull/4166
-
-* Fri Nov 18 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.16-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.16
-
-* Wed Nov 02 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.15-3
-- Backport semanage bug workaround
- https://github.com/coreos/rpm-ostree/pull/4122
-
-* Tue Nov 01 2022 Colin Walters <walters(a)verbum.org> - 2022.15-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.15
-
-* Thu Oct 13 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.14-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.14
-
-* Sat Aug 27 2022 Colin Walters <walters(a)verbum.org> - 2022.13-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.13
-
-* Sun Aug 07 2022 Colin Walters <walters(a)verbum.org> - 2022.12-4
-- Cherry pick patch to work around filesystem package
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2022.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Colin Walters <walters(a)verbum.org> - 2022.12-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
-
-* Mon Jul 11 2022 Colin Walters <walters(a)verbum.org> - 2022.11-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.11
-
-* Thu Jun 16 2022 Colin Walters <walters(a)verbum.org> - 2022.10-3
-- Backport https://github.com/coreos/rpm-ostree/pull/3771
-
-* Tue Jun 14 2022 Colin Walters <walters(a)verbum.org> - 2022.10-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.10
-
-* Fri May 13 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.9-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.9
-
-* Wed Apr 20 2022 Colin Walters <walters(a)verbum.org> - 2022.8-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.8
-
-* Mon Apr 11 2022 Colin Walters <walters(a)verbum.org> - 2022.7-2
-- Rebase to 2022.7
-
-* Fri Apr 08 2022 Colin Walters <walters(a)verbum.org> - 2022.6-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.6
-
-* Thu Mar 24 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.5.80.gb7f91619
-- Git snapshot for https://github.com/coreos/rpm-ostree/pull/3535
-
-* Thu Mar 03 2022 Jonathan Lebon <jonathan(a)jlebon.com> - 2022.5-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.5
-
-* Tue Mar 01 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.4-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.4
-
-* Mon Feb 28 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.3-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.3
-
-* Thu Feb 03 2022 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2022.2-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.2
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2022.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 07 2022 Colin Walters <walters(a)verbum.org> - 2022.1-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2022.1
-
-* Wed Nov 17 2021 Colin Walters <walters(a)verbum.org> - 2021.14-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.14
-
-* Wed Nov 03 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.13-2
-- Backport patch to fix F35 rebases through DBus
- https://github.com/coreos/rpm-ostree/pull/3199
-
-* Tue Nov 02 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.13-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.13
-
-* Thu Oct 14 2021 Colin Walters <walters(a)verbum.org> - 2021.12-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.12
-
-* Thu Sep 30 2021 Colin Walters <walters(a)verbum.org> - 2021.11-3
-- Backport patch for openshift/os extensions + multiarch
-
-* Fri Sep 24 2021 Colin Walters <walters(a)verbum.org> - 2021.11-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.11
-
-* Tue Sep 14 2021 Sahana Prasad <sahana(a)redhat.com> - 2021.10-3
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Aug 27 2021 Colin Walters <walters(a)verbum.org> - 2021.10-2
-- Backport
- https://github.com/coreos/rpm-ostree/pull/3095/commits/1d445170b97e8eaad6...
-
-* Thu Aug 26 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.10-1
-- New release v2021.10
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.10
-
-* Thu Aug 19 2021 Colin Walters <walters(a)verbum.org> - 2021.9-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.9
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2021.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.7-1
-- New release v2021.7
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.7
-
-* Sat Jul 10 2021 Björn Esser <besser82(a)fedoraproject.org> - 2021.6-3
-- Rebuild for versioned symbols in json-c
-
-* Tue Jun 22 2021 Colin Walters <walters(a)verbum.org>
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.6
-
-* Thu Jun 17 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.5-2
-- Backport _dbpath fixes, see
- https://github.com/coreos/rpm-ostree/issues/2904
-
-* Wed May 12 2021 Luca BRUNO <lucab(a)lucabruno.net> - 2021.5-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.5
-
-* Sun May 09 2021 Jeff Law <jlaw(a)tachyum.com> - 2021.4-4
-- Re-enable LTO
-
-* Wed Apr 28 2021 Colin Walters <walters(a)verbum.org> - 2021.4-3
-- Backport another patch for https://pagure.io/fedora-infrastructure/issue/9909
-
-* Tue Apr 27 2021 Colin Walters <walters(a)verbum.org> - 2021.4-2
-- Backport patch for https://pagure.io/fedora-infrastructure/issue/9909
-
-* Mon Apr 12 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.4-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.4
-
-* Wed Mar 17 2021 Colin Walters <walters(a)verbum.org> - 2021.3-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.3
-
-* Wed Feb 17 2021 Colin Walters <walters(a)verbum.org> - 2021.2-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.2
-
-* Wed Feb 10 2021 Colin Walters <walters(a)verbum.org> - 2021.1-4
-- Backport patches from https://github.com/coreos/rpm-ostree/pull/2553
-
-* Tue Jan 26 2021 Jonathan Lebon <jonathan(a)jlebon.com> - 2021.1-3
-- Backport https://github.com/coreos/rpm-ostree/pull/2490 for rawhide
-
-* Tue Jan 19 15:08:59 UTC 2021 Colin Walters <walters(a)verbum.org> - 2021.1-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2021.1
-
-* Fri Dec 11 19:13:03 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.10-3
-- https://github.com/coreos/rpm-ostree/releases/tag/v2020.10
-
-* Fri Dec 11 13:42:33 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.9-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2020.9
-
-* Sat Nov 14 14:51:20 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.8-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2020.8
-
-* Mon Nov 02 2020 Luca BRUNO <lucab(a)lucabruno.net> - 2020.7-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
-
-* Mon Nov 02 2020 Jeff Law <law(a)redhat.com> - 2020.6-2
-- Fix invalid use of volatile caught by gcc-11
-
-* Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters(a)verbum.org> - 2020.6-1
-- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
-
-* Wed Oct 28 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> - 2020.5-2
-- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
-
-* Tue Sep 15 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.5-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.5
-
-* Mon Aug 17 2020 Colin Walters <walters(a)verbum.org> - 2020.4.15.g8b0bcd7b-2
-- Update to latest upstream git for
- https://bugzilla.redhat.com/show_bug.cgi?id=1865397
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2020.4-2
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.4-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.4
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2020.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 30 2020 Jeff Law <aw(a)redhat.com> - 2020.3-2
-- Disable LTO
-
-* Fri Jun 19 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.3-1
-- New upstream version
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.3
-
-* Fri May 15 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.2-3
-- Backport https://github.com/coreos/rpm-ostree/pull/2096
- See https://github.com/coreos/fedora-coreos-tracker/issues/481
-
-* Fri May 15 2020 Colin Walters <walters(a)verbum.org> - 2020.2-2
-- https://github.com/coreos/rpm-ostree/releases/tag/v2020.2
-
-* Tue Apr 21 2020 Björn Esser <besser82(a)fedoraproject.org> - 2020.1.80.g3ec5e287-2
-- Rebuild (json-c)
-
-* Mon Apr 20 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1.80.g3ec5e287-1
-- git master snapshot for using strict mode and lockfile-repos in FCOS:
- https://github.com/coreos/rpm-ostree/pull/1858
- https://github.com/coreos/rpm-ostree/pull/2058
- https://github.com/coreos/fedora-coreos-tracker/issues/454
-
-* Fri Mar 13 2020 Colin Walters <walters(a)verbum.org> - 2020.1.21.ge9011530-2
-- Backport https://github.com/coreos/rpm-ostree/pull/2015
- See https://github.com/coreos/fedora-coreos-tracker/issues/343
-
-* Thu Feb 27 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1.21.ge9011530-1
-- git master snapshot for using base initramfs kargs in RHCOS:
- https://github.com/coreos/rpm-ostree/pull/1998
- https://github.com/coreos/rpm-ostree/pull/1997
- https://bugzilla.redhat.com/show_bug.cgi?id=1806588
-
-* Wed Feb 05 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2020.1-1
-- New upstream version
-
-* Tue Feb 04 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7.31.g70c38563-1
-- git master snapshot for Silverblue rawhide compose fixes
- https://pagure.io/releng/failed-composes/issue/717
- https://pagure.io/releng/failed-composes/issue/929
- https://github.com/rpm-software-management/libdnf/pull/885
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2019.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 09 2020 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7-2
-- Backport patch for Silverblue composes:
- https://pagure.io/releng/failed-composes/issue/717
-
-* Thu Dec 19 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.7-1
-- New upstream version
-
-* Sat Dec 14 2019 Jeff Law <law(a)redhat.com> - 2019.6.24.gfec61ce5-2
-- Fix missing #includes for gcc-10
-
-* Thu Oct 31 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6.27.g3b8a1ec6-1
-- git master snapshot for dracut cpio cap_mknod fix:
- https://github.com/coreos/rpm-ostree/pull/1946
-
-* Thu Oct 31 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6.24.gfec61ce5-1
-- git master snapshot for HMAC path fix for FIPS:
- https://github.com/coreos/rpm-ostree/pull/1934
-
-* Wed Sep 25 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.6-1
-- New upstream version
-
-* Thu Aug 22 2019 Colin Walters <walters(a)verbum.org> - 2019.5.7.gcac5aa41-3
-- New upstream git snapshot, mainly for backporting the arch-includes conditionals
- to aid Fedora CoreOS on s390x.
-
-* Wed Jul 31 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 2019.5-2
-- Fix libmodulemd dependencies
-
-* Thu Jul 25 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.5-1
-- New upstream version
-
-* Fri Jul 19 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.39.g8d90d03d-1
-- git master snapshot for --parent and lockfile overrides
- https://github.com/projectatomic/rpm-ostree/pull/1871
- https://github.com/projectatomic/rpm-ostree/pull/1867
-
-* Fri Jul 12 2019 Colin Walters <walters(a)verbum.org> - 2019.4.28.g44395673-3
-- Update rpmostree-rust.h in sources
-
-* Fri Jul 12 2019 Colin Walters <walters(a)verbum.org> - 2019.4.28.g44395673-2
-- Update with git snapshot for zstd support
-
-* Wed Jul 10 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.27.gb381e029-1
-- git master snapshot for add-commit-metadata
- https://github.com/projectatomic/rpm-ostree/pull/1865/
-
-* Fri Jun 14 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.15.gbbc9aa9f-1
-- git master snapshot for OSTree layers
- https://github.com/projectatomic/rpm-ostree/pull/1830/
-
-* Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2019.4.10.gc1cc0827-3
-- Rebuild for RPM 4.15
-
-* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2019.4.10.gc1cc0827-2
-- Rebuild for RPM 4.15
-
-* Thu Jun 06 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4.10.gc1cc0827-1
-- git master snapshot for lockfile
- https://github.com/projectatomic/rpm-ostree/pull/1745/
-
-* Tue May 28 2019 Dusty Mabe <dusty(a)dustymabe.com> - 2019.4-3
-- Add back in ppc64le and ppc64
-
-* Thu May 23 2019 Dusty Mabe <dusty(a)dustymabe.com> - 2019.4-2
-- Backport patch for db diff --format=json
-
-* Tue May 21 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.4-1
-- New upstream version
-
-* Mon May 06 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3.5.g0da9f997-2
-- Add temporary hack to avoid UTF-8 for Bodhi
- https://pagure.io/releng/issue/8330
-
-* Tue Apr 09 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3.5.g0da9f997-1
-- git master snapshot to test coreos-continuous tag
-
-* Wed Mar 27 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.3-1
-- New upstream version
-
-* Thu Feb 14 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.2-1
-- New upstream version
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2019.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 22 2019 Jonathan Lebon <jonathan(a)jlebon.com> - 2019.1-1
-- New upstream version
-
-* Fri Dec 14 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.10-1
-- New upstream version
-
-* Tue Dec 04 2018 Jonathan Lebon <jonathan(a)jlebon.com>
-- Simplify Rust conditionals
-
-* Fri Nov 02 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.9-3
-- Backport patch for https://pagure.io/dusty/failed-composes/issue/956
-
-* Tue Oct 30 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2018.9-2
-- Rebuild for libsolv 0.7
-
-* Sun Oct 28 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.9-1
-- New upstream version
-
-* Tue Sep 11 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.8-1
-- New upstream version
-
-* Thu Aug 09 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.7-1
-- New upstream version
-
-* Wed Aug 01 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6.42.gda27b94b-1
-- git master snapshot for https://bugzilla.redhat.com/show_bug.cgi?id=1565647
-
-* Mon Jul 30 2018 Colin Walters <walters(a)verbum.org> - 2018.6-4
-- Backport patch for https://bugzilla.redhat.com/show_bug.cgi?id=1607223
- from https://github.com/projectatomic/rpm-ostree/pull/1469
-- Also https://github.com/projectatomic/rpm-ostree/pull/1461
-
-* Mon Jul 16 2018 Colin Walters <walters(a)verbum.org> - 2018.6-3
-- Make build python3-only compatible for distributions that want that
-
-* Fri Jun 29 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6-2
-- Rebuild for yummy Rusty bitsy
-
-* Fri Jun 29 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.6-1
-- New upstream version
-
-* Tue May 15 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.5-1
-- New upstream version
-
-* Mon Mar 26 2018 Jonathan Lebon <jonathan(a)jlebon.com> - 2018.4-1
-- New upstream version
-
-* Sun Mar 18 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2018.3-4
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Mar 07 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.3-3
-- Add BR on gcc-c++
-
-* Thu Mar 01 2018 Dusty Mabe <dusty(a)dustymabe.com> - 2018.3-2
-- backport treating FUSE as netfs
-- See https://github.com/projectatomic/rpm-ostree/pull/1285
-
-* Sun Feb 18 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.3-1
-- New upstream version (minor bugfix release)
-
-* Fri Feb 16 2018 Jonathan Lebon <jlebon(a)redhat.com> - 2018.2-1
-- New upstream version
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2018.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 19 2018 Dusty Mabe <dusty(a)dustymabe.com> - 2018.1-2
-- Revert the ostree:// formatting in the output.
-- See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137
-
-* Mon Jan 15 2018 Colin Walters <walters(a)verbum.org> - 2018.1-1
-- https://github.com/projectatomic/rpm-ostree/releases/tag/v2018.1
-
-* Tue Dec 05 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.11-1
-- New upstream version
-
-* Wed Nov 22 2017 Colin Walters <walters(a)verbum.org> - 2017.10-3
-- Backport patch for NFS issues
-- https://pagure.io/atomic-wg/issue/387
-
-* Sun Nov 12 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.10-2
-- Backport fix for --repo handling
- https://github.com/projectatomic/rpm-ostree/pull/1101
-
-* Thu Nov 02 2017 Colin Walters <walters(a)verbum.org> - 2017.10-1
-- https://github.com/projectatomic/rpm-ostree/releases/tag/v2017.10
-
-* Mon Sep 25 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.9-1
-- New upstream version
-
-* Mon Aug 21 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.8-2
-- Patch to allow metadata_expire=0
- https://github.com/projectatomic/rpm-ostree/issues/930
-
-* Fri Aug 18 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.8-1
-- New upstream version
-
-* Thu Aug 10 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 2017.7-7
-- Rebuilt for RPM soname bump
-
-* Thu Aug 10 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 2017.7-6
-- Rebuilt for RPM soname bump
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 21 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.7-3
-- Tweak new pkg name to rpm-ostree-libs to be more consistent with the main
- package name and ostree's ostree-libs.
-
-* Fri Jul 21 2017 Colin Walters <walters(a)verbum.org> - 2017.7-2
-- Enable introspection, rename shared lib to librpmostree
- Due to an oversight, we were not actually building with introspection.
- Fix that. And while we are here, split out a shared library package,
- so that e.g. containers can do `from gi.repository import RpmOstree`
- without dragging in the systemd service, etc. (RHBZ#1473701)
-
-* Mon Jul 10 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.7-1
-- New upstream version
-
-* Sat Jun 24 2017 Colin Walters <walters(a)verbum.org>
-- Update to git snapshot to help debug compose failure
-
-* Wed May 31 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-3
-- Make sure we don't auto-provide libdnf (RHBZ#1457089)
-
-* Fri May 26 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-2
-- Bump libostree dep
-
-* Fri May 26 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.6-1
-- New upstream version
-
-* Fri Apr 28 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.5-2
-- Bump libostree dep and rebuild in override
-
-* Fri Apr 28 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.5-1
-- New upstream version
-
-* Fri Apr 14 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.4-2
-- Backport patch to allow unprivileged `rpm-ostree status`
-
-* Thu Apr 13 2017 Jonathan Lebon <jlebon(a)redhat.com> - 2017.4-1
-- New upstream version.
-
-* Fri Apr 07 2017 Colin Walters <walters(a)verbum.org> - 2017.3-4
-- Backport patch to add API devices for running on CentOS 7
- https://github.com/projectatomic/rpm-ostree/issues/727
-
-* Thu Mar 16 2017 Colin Walters <walters(a)verbum.org> - 2017.3-3
-- Add patch to fix f26 altfiles
-
-* Fri Mar 10 2017 Colin Walters <walters(a)verbum.org> - 2017.3-2
-- Backport patch for running in koji
-
-* Mon Mar 06 2017 Colin Walters <walters(a)verbum.org> - 2017.3-1
-- New upstream version
- Fixes: CVE-2017-2623
- Resolves: #1422157
-
-* Fri Mar 03 2017 Colin Walters <walters(a)verbum.org> - 2017.2-5
-- Add patch to bump requires for ostree
-
-* Mon Feb 27 2017 Colin Walters <walters(a)verbum.org> - 2017.2-4
-- Add requires on ostree
-
-* Sat Feb 18 2017 Colin Walters <walters(a)verbum.org> - 2017.2-3
-- Add patch for gperf 3.1 compatibility
- Resolves: #1424268
-
-* Wed Feb 15 2017 Colin Walters <walters(a)verbum.org> - 2017.2-2
-- New upstream version
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Colin Walters <walters(a)verbum.org> - 2017.1-3
-- Back out netns usage for now for https://pagure.io/releng/issue/6602
-
-* Sun Jan 22 2017 Colin Walters <walters(a)verbum.org> - 2017.1-2
-- New upstream version
-
-* Mon Dec 12 2016 walters(a)redhat.com - 2016.13-1
-- New upstream version
-
-* Sat Nov 26 2016 walters(a)redhat.com - 2016.12-4
-- Backport patch to fix install-langs
-
-* Tue Nov 15 2016 walters(a)redhat.com - 2016.11-2
-- New upstream version
-
-* Mon Oct 24 2016 walters(a)verbum.org - 2016.11-1
-- New upstream version
-
-* Fri Oct 07 2016 walters(a)redhat.com - 2016.10-1
-- New upstream version
-
-* Thu Sep 08 2016 walters(a)redhat.com - 2016.9-1
-- New upstream version
-
-* Thu Sep 08 2016 walters(a)redhat.com - 2016.8-1
-- New upstream version
-
-* Thu Sep 01 2016 walters(a)redhat.com - 2016.7-4
-- Add requires on fuse https://github.com/projectatomic/rpm-ostree/issues/443
-
-* Wed Aug 31 2016 Colin Walters <walters(a)verbum.org> - 2016.7-3
-- Backport patch for running inside mock
-
-* Sat Aug 13 2016 walters(a)redhat.com - 2016.6-3
-- New upstream version
-
-* Sat Aug 13 2016 Colin Walters <walters(a)verbum.org> - 2016.6-2
-- Backport patches from master to fix non-containerized composes
-
-* Thu Aug 11 2016 walters(a)redhat.com - 2016.6-1
-- New upstream version
-
-* Mon Jul 25 2016 Colin Walters <walters(a)verbum.org> - 2016.5-1
-- New upstream version
-
-* Fri Jul 08 2016 walters(a)verbum.org - 2016.4-2
-- Require bubblewrap
-
-* Fri Jul 08 2016 walters(a)redhat.com - 2016.4-1
-- New upstream version
-
-* Thu Jul 07 2016 Colin Walters <walters(a)verbum.org> - 2016.3.5.g4219a96-1
-- Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes
-
-* Wed Jun 15 2016 Colin Walters <walters(a)verbum.org> - 2016.3.3.g17fb980-2
-- Backport fixes from https://github.com/projectatomic/rpm-ostree/commits/2016.3-fixes
-
-* Fri May 20 2016 Colin Walters <walters(a)redhat.com> - 2016.3-2
-- New upstream version
-
-* Thu Mar 31 2016 Colin Walters <walters(a)redhat.com> - 2016.1-3
-- Backport patch to fix Fedora composes writing data into source file:/// URIs
-
-* Thu Mar 24 2016 Colin Walters <walters(a)redhat.com> - 2016.1-2
-- New upstream version
-
-* Tue Feb 23 2016 Colin Walters <walters(a)redhat.com> - 2015.11.43.ga2c052b-2
-- New git snapshot, just getting some new code out there
-- We are now bundling a copy of libhif, as otherwise coordinated releases with
- PackageKit/dnf would be required, and we are not ready for that yet.
-
-* Wed Feb 10 2016 Matthew Barnes <mbarnes(a)redhat.com> - 2015.11-3
-- Fix URL: https://github.com/projectatomic/rpm-ostree
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2015.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Dec 15 2015 Colin Walters <walters(a)redhat.com> - 2015.11-1
-- New upstream version
-
-* Sat Nov 21 2015 Colin Walters <walters(a)redhat.com> - 2015.10-1
-- New upstream version
-
-* Mon Nov 09 2015 Colin Walters <walters(a)redhat.com> - 2015.9-4
-- Fix files list for -devel, which should in turn fix Anaconda
- builds which pull in rpm-ostree, but should not have devel bits.
-
-* Sat Oct 31 2015 Colin Walters <walters(a)redhat.com> - 2015.9-3
-- Add patch that should fix bodhis use of --workdir-tmpfs
-
-* Sat Sep 05 2015 Kalev Lember <klember(a)redhat.com> - 2015.9-2
-- Rebuilt for librpm soname bump
-
-* Wed Aug 26 2015 Colin Walters <walters(a)redhat.com> - 2015.9-2
-- New upstream version
-
-* Tue Aug 04 2015 Colin Walters <walters(a)redhat.com> - 2015.8-1
-- New upstream version
-
-* Mon Jul 27 2015 Colin Walters <walters(a)redhat.com> - 2015.7-5
-- rebuilt
-
-* Mon Jul 20 2015 Colin Walters <walters(a)redhat.com> - 2015.7-4
-- Rebuild for CentOS update to libhif
-
-* Tue Jun 16 2015 Colin Walters <walters(a)redhat.com> - 2015.7-3
-- Rebuild to pick up hif_source_set_required()
-
-* Mon Jun 15 2015 Colin Walters <walters(a)redhat.com> - 2015.7-2
-- New upstream version
-
-* Tue Jun 09 2015 Colin Walters <walters(a)redhat.com> - 2015.6-2
-- New upstream version
-
-* Tue May 12 2015 Colin Walters <walters(a)redhat.com> - 2015.5-3
-- Add patch to fix rawhide composes
-
-* Mon May 11 2015 Colin Walters <walters(a)redhat.com> - 2015.5-2
-- New upstream release
- Adds shared library and -devel subpackage
-
-* Fri Apr 10 2015 Colin Walters <walters(a)redhat.com> - 2015.4-2
-- New upstream release
- Port to libhif, drops dependency on yum.
-
-* Thu Apr 09 2015 Colin Walters <walters(a)redhat.com> - 2015.3-8
-- Cherry pick f21 patch to disable read only /etc with yum which
- breaks when run inside docker
-
-* Wed Apr 08 2015 Colin Walters <walters(a)redhat.com> - 2015.3-7
-- Add patch to use yum-deprecated
- Resolves: #1209695
-
-* Fri Feb 27 2015 Colin Walters <walters(a)redhat.com> - 2015.3-5
-- Drop /usr/bin/atomic, now provided by the "atomic" package
-
-* Fri Feb 06 2015 Dennis Gilmore <dennis(a)ausil.us> - 2015.3-4
-- add git to BuildRequires
-
-* Thu Feb 05 2015 Colin Walters <walters(a)redhat.com> - 2015.3-3
-- Adapt to Hawkey 0.5.3 API break
-
-* Thu Feb 05 2015 Dennis Gilmore <dennis(a)ausil.us> - 2015.3-3
-- rebuild for libhawkey soname bump
-
-* Fri Jan 23 2015 Colin Walters <walters(a)redhat.com> - 2015.3-2
-- New upstream release
-
-* Thu Jan 08 2015 Colin Walters <walters(a)redhat.com> - 2015.2-1
-- New upstream release
-
-* Wed Dec 17 2014 Colin Walters <walters(a)redhat.com> - 2014.114-2
-- New upstream release
-
-* Tue Nov 25 2014 Colin Walters <walters(a)redhat.com> - 2014.113-1
-- New upstream release
-
-* Mon Nov 24 2014 Colin Walters <walters(a)redhat.com> - 2014.112-1
-- New upstream release
-
-* Mon Nov 17 2014 Colin Walters <walters(a)redhat.com> - 2014.111-1
-- New upstream release
-
-* Fri Nov 14 2014 Colin Walters <walters(a)redhat.com> - 2014.110-1
-- New upstream release
-
-* Fri Oct 24 2014 Colin Walters <walters(a)redhat.com> - 2014.109-1
-- New upstream release
-
-* Sat Oct 04 2014 Colin Walters <walters(a)redhat.com> - 2014.107-2
-- New upstream release
-
-* Mon Sep 08 2014 Colin Walters <walters(a)redhat.com> - 2014.106-3
-- New upstream release
-- Bump requirement on ostree
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2014.105-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Aug 08 2014 Colin Walters <walters(a)verbum.org> - 2014.105-2
-- New upstream release
-
-* Sun Jul 13 2014 Colin Walters <walters(a)verbum.org>
-- New upstream release
-
-* Sat Jun 21 2014 Colin Walters <walters(a)verbum.org>
-- New upstream release
-- Bump OSTree requirements
-- Enable hawkey package diff, we have new enough versions
- of libsolv/hawkey
-- Enable /usr/bin/atomic symbolic link
-
-* Tue Jun 10 2014 Colin Walters <walters(a)verbum.org>
-- New upstream git snapshot
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2014.101-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 30 2014 Colin Walters <walters(a)verbum.org>
-- New upstream release
-
-* Fri May 23 2014 Colin Walters <walters(a)verbum.org>
-- Previous autobuilder code is split off into rpm-ostree-toolbox
-
-* Sun Apr 13 2014 Colin Walters <walters(a)verbum.org>
-- New upstream release
-
-* Tue Apr 08 2014 Colin Walters <walters(a)verbum.org>
-- Drop requires on yum to allow minimal images without it
-
-* Mon Mar 31 2014 Colin Walters <walters(a)verbum.org>
-- New upstream release
-
-* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6.3.g5707fa7-2
-- Bump ostree version requirement
-
-* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6.3.g5707fa7-1
-- New git snapshot, add rpm-ostree-sign to file list
-
-* Sat Mar 22 2014 Colin Walters <walters(a)verbum.org> - 2014.6-1
-- New upstream version
-
-* Fri Mar 07 2014 Colin Walters <walters(a)verbum.org> - 2014.5-1
-- Initial package
-
+%autochangelog
commit 2b0651e9004847c38608caf38148bbdea1e90e19
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Tue Dec 19 09:30:12 2023 -0800
ostree not on i686 for RHEL 10
Signed-off-by: Troy Dawson <tdawson(a)redhat.com>
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 1f07575..cb456dd 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -13,6 +13,12 @@ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-
ExclusiveArch: %{rust_arches}
+# ostree not on i686 for RHEL 10
+# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
+%if 0%{?rhel} >= 10
+ExcludeArch: %{ix86}
+%endif
+
BuildRequires: make
%if 0%{?rhel}
BuildRequires: rust-toolset
commit 6770d3ba04741b592524b4901793069b682521ec
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Jan 2 16:56:40 2024 -0500
https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
diff --git a/.gitignore b/.gitignore
index b4b43db..fde1206 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,4 @@
/rpm-ostree-2023.10.tar.xz
/rpm-ostree-2023.11.tar.xz
/rpm-ostree-2023.12.tar.xz
+/rpm-ostree-2024.1.tar.xz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 6258acb..1f07575 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,8 +3,8 @@
Summary: Hybrid image/package system
Name: rpm-ostree
-Version: 2023.12
-Release: 1%{?dist}
+Version: 2024.1
+Release: 2%{?dist}
License: LGPL-2.0-or-later
URL: https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -251,6 +251,9 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel
%changelog
+* Tue Jan 02 2024 Colin Walters <walters(a)verbum.org> - 2024.1-2
+- https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
+
* Mon Dec 18 2023 Joseph Marrero <jmarrero(a)fedoraproject.org> - 2023.12-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.12
diff --git a/sources b/sources
index 8fd3838..9f6c908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2023.12.tar.xz) = 1c9fb813075dd6596d07df3cf6ac4d1c4b160d7c156816f053b8ed5faa56bce131267ed143f31b943afda3a4a78a5669b6cfecdbe4af47d0a97af15646f45094
+SHA512 (rpm-ostree-2024.1.tar.xz) = 766a4f32fc9f86694acac9e87090a574f4eef042144b968a700c03a54f280d0f47710e735af0bd512964793f9d1918daa037377b86031b2084a9aa74fefb482e
4 months, 4 weeks
Architecture specific change in rpms/keepass.git
by githook-noreply@fedoraproject.org
The package rpms/keepass.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/keepass.git/commit/?id=19301fd75b...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=dc09b6e600...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=c9027ed418...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=fbc16b6b45...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=e5129597db....
Change:
+ExcludeArch: armv7hl
-ExcludeArch: armv7hl
+ExcludeArch: armv7hl
+ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit d16f4e22f596e0d179b163b8120a234188fffdc7
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Fri Dec 1 19:20:03 2023 +0100
Fix build error
diff --git a/keepass.spec b/keepass.spec
index 7d8948e..2f02eb3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -86,7 +86,7 @@ install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{build
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
commit a0c346781a4032fdbc5cde1936237282a0eb7404
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Fri Dec 1 17:49:57 2023 +0100
Use upstream source archive directly and verify it during %%prep
diff --git a/keepass.spec b/keepass.spec
index d6d95fe..7d8948e 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -6,10 +6,10 @@ Summary: Password manager
License: GPL-2.0-or-later
URL: https://keepass.info/
-# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
-Source0: %{name}-%version.tar.xz
-Source1: %{name}.appdata.xml
+Source0: https://downloads.sourceforge.net/project/%{name}/KeePass%202.x/%{version...
+Source1: https://keepass.info/integrity/v2/KeePass-%{version}-Source.zip.asc
+Source2: https://keepass.info/integrity/DominikReichl.asc
+Source3: %{name}.appdata.xml
# Upstream does not include a .desktop file, etc..
Patch0: keepass-desktop-integration.patch
@@ -21,6 +21,7 @@ ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
+BuildRequires: gnupg2
BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
@@ -48,7 +49,15 @@ to unlock the whole database.
%prep
-%autosetup -p1
+%{gpgverify} \
+ --keyring='%{SOURCE2}' \
+ --signature='%{SOURCE1}' \
+ --data='%{SOURCE0}'
+
+%autosetup -p1 -c
+
+# Make sure no prebuilt dlls are shipped
+find -name "*dll" -delete
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
commit e2cd32ba3c4737623415c33b22af8d060a079d33
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Tue Nov 21 08:46:52 2023 +0100
Cleanup for upcoming re-review
- Do not own %%docdir
- Flag license file as %%license
- Migrate to SPDX license
diff --git a/keepass.spec b/keepass.spec
index 4a16762..d6d95fe 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -3,7 +3,7 @@ Version: 2.55
Release: %autorelease
Summary: Password manager
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://keepass.info/
# Created with, e.g.:
@@ -89,9 +89,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%files
-%dir %{_docdir}
%doc %{_docdir}/%{name}/History.txt
-%doc %{_docdir}/%{name}/License.txt
+%license %{_docdir}/%{name}/License.txt
%{_bindir}/%{name}
%{_prefix}/lib/%{name}
%{_datadir}/%{name}
commit 6527289293ac07575fbef34d98dcc7c33235c360
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Tue Oct 17 21:28:07 2023 +0200
Update to version 2.55.
diff --git a/keepass.spec b/keepass.spec
index 9cec211..4a16762 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.54
+Version: 2.55
Release: %autorelease
Summary: Password manager
diff --git a/sources b/sources
index d5f32bc..db57dcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
+SHA512 (keepass-2.55.tar.xz) = d2f25146d2618b1edbf8a9623a4155628dda6bd5b0a09b8e14b21ff155a7cb718938d8b00b6e3125812e001552f41962b2eb6b59b017ab3663fd8a74e6dc0565
commit 503b2281cfac5e1b1935e072c2ee5da693f1996c
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sun Jun 4 11:09:59 2023 +0200
Update to version 2.54.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 2ae1979..0ee5138 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe -wa-disable:1530 "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
diff --git a/keepass.spec b/keepass.spec
index 5628eab..9cec211 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.53.1
+Version: 2.54
Release: %autorelease
Summary: Password manager
commit dd50156f2710c69b3636cc5ac3d717bf519283b0
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Mon May 22 18:28:24 2023 +0200
Disable xdotool clipboard workaround to prevent passwords from leaking to systemd journal (CVE-2022-0725)
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 0ee5138..2ae1979 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe -wa-disable:1530 "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
commit 277fd9607d429ce1d69ee901080506e2eb51e683
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Mon May 22 17:37:58 2023 +0200
Update to version 2.53.1.
diff --git a/keepass.spec b/keepass.spec
index 3a3d6b3..5628eab 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.52
+Version: 2.53.1
Release: %autorelease
Summary: Password manager
commit 71addb3f7109403630c9dc9e92b2e044efda5f88
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sun Sep 11 19:57:13 2022 +0200
Update to version 2.52.
diff --git a/keepass.spec b/keepass.spec
index 81bd4f4..3a3d6b3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.51.1
+Version: 2.52
Release: %autorelease
Summary: Password manager
commit 86903b1ea36ece039d55ce37a7c9ba97bdb5f9c1
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Aug 18 21:26:21 2022 +0200
Update to version 2.51.1.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index 424385c..8302c87 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,20 +1,31 @@
-diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
---- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
-+++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
-@@ -33,6 +33,8 @@
+From a5b7847ffa46bd5b541073705304967bfe0b9f6f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 18 Aug 2022 21:16:13 +0200
+Subject: [PATCH] fix XSL search path
+
+---
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
+index 7d67c30..4052244 100644
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
+@@ -33,6 +33,8 @@ namespace KeePass.App
{
public static class AppDefs
{
+ public const string DataDir = "/usr/share/keepass/";
-+
++
public static readonly Color ColorControlNormal = SystemColors.Window;
public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
-Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
-diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
---- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
-+++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
-@@ -133,7 +133,7 @@
+ public static readonly Color ColorEditError = (UIUtil.IsDarkTheme ?
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index d682c48..51aae17 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -133,7 +133,7 @@ namespace KeePass.Forms
m_lvComponents.Columns.Add(strValueColumn, 100);
string strExe = WinUtil.GetExecutable();
@@ -23,5 +34,6 @@ diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Fo
AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
+--
+2.37.2
+
diff --git a/keepass.spec b/keepass.spec
index ea2bf3a..81bd4f4 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.50
+Version: 2.51.1
Release: %autorelease
Summary: Password manager
commit 19301fd75b9dfb0da2a91a8d81341a2454695288
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Aug 18 20:38:46 2022 +0200
Revert "Don't know how to fix CVE-2022-0725."
This reverts commit dc09b6e600c6950d3b485ca3c16eda2dd96252e6.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ed4c5e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/keepass-*.tar.xz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 68cd754..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Don't know how to fix CVE-2022-0725.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
new file mode 100644
index 0000000..0ee5138
--- /dev/null
+++ b/keepass-desktop-integration.patch
@@ -0,0 +1,62 @@
+diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
+--- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
+diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
+--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
+@@ -0,0 +1,23 @@
++.TH KEEPASS 1 "Mar 19, 2011"
++.SH NAME
++keepass \- password manager
++.SH SYNOPSIS
++.B keepass
++.SH DESCRIPTION
++\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
++.SH OPTIONS
++.TP
++\fB\-\-auto-type\fP
++invokes global auto-type
++.TP
++\fB\-\-lock-all\fP
++lock databases of all KeePass instances
++.TP
++\fB\-\-unlock-all\fP
++unlock databases of all KeePass instances
++.TP
++\fB\-\-exit-all\fP
++exit all KeePass instances
++.SH AUTHOR
++This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
++for the Debian project (but may be used by others).
+diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++Name=KeePass
++GenericName=Password manager
++Exec=keepass %u
++Icon=keepass
++Terminal=false
++Type=Application
++StartupWMClass=keepass2
++Categories=Utility;
++MimeType=application/x-keepass2;
++Keywords=passwords;
+diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
+--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
++ <mime-type type="application/x-keepass2">
++ <comment>KeePass 2 database</comment>
++ <comment xml:lang="de">KeePass 2 Datenbank</comment>
++ <glob pattern="*.kdbx"/>
++ <icon name="keepass"/>
++ </mime-type>
++</mime-info>
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
new file mode 100644
index 0000000..424385c
--- /dev/null
+++ b/keepass-fix-XSL-search-path.patch
@@ -0,0 +1,27 @@
+diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
+--- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
++++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
+@@ -33,6 +33,8 @@
+ {
+ public static class AppDefs
+ {
++ public const string DataDir = "/usr/share/keepass/";
++
+ public static readonly Color ColorControlNormal = SystemColors.Window;
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
+diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
+--- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
++++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
+@@ -133,7 +133,7 @@
+ m_lvComponents.Columns.Add(strValueColumn, 100);
+
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = AppDefs.DataDir;
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
new file mode 100644
index 0000000..199c0e1
--- /dev/null
+++ b/keepass.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
+<component type="desktop">
+ <id>keepass.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>KeePass</name>
+ <summary>Password manager</summary>
+ <project_license>GPL-2.0+</project_license>
+ <developer_name>Dominik Reichl</developer_name>
+ <description>
+ <p>
+ KeePass is a free open source password manager, which helps you to
+ remember your passwords securely. You can put all your
+ passwords in one database, which is locked with one master key or a
+ key file. You only have to remember one single master password or
+ select the key file to unlock the whole database.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot height="351" width="624" type="default">
+ <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
+ <caption>KeePass showing the example database</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://keepass.info/</url>
+ <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
+ <url type="translate">http://keepass.info/translations_devinfo.html</url>
+ <url type="donation">http://keepass.info/donate.html</url>
+ <url type="help">http://keepass.info/help/base/index.html</url>
+ <update_contact>appdata(a)mavit.org.uk</update_contact>
+</component>
diff --git a/keepass.spec b/keepass.spec
new file mode 100644
index 0000000..ea2bf3a
--- /dev/null
+++ b/keepass.spec
@@ -0,0 +1,112 @@
+Name: keepass
+Version: 2.50
+Release: %autorelease
+Summary: Password manager
+
+License: GPLv2+
+URL: https://keepass.info/
+
+# Created with, e.g.:
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+Source0: %{name}-%version.tar.xz
+Source1: %{name}.appdata.xml
+
+# Upstream does not include a .desktop file, etc..
+Patch0: keepass-desktop-integration.patch
+
+# Move XSL files to /usr/share/keepass:
+Patch1: keepass-fix-XSL-search-path.patch
+
+ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
+BuildRequires: ImageMagick
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+BuildRequires: libgdiplus-devel
+BuildRequires: mono-devel
+BuildRequires: mono-winforms
+BuildRequires: mono-web
+BuildRequires: xorg-x11-server-Xvfb
+Requires: xdotool xsel hicolor-icon-theme
+Requires: mono-winforms
+Recommends: libargon2
+%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
+Recommends: libgcrypt
+%endif
+
+
+# The debuginfo package would be empty if created.
+%global debug_package %{nil}
+
+
+%description
+KeePass is a free open source password manager, which helps you to
+remember your passwords in a secure way. You can put all your passwords in
+one database, which is locked with one master key or a key file. You
+only have to remember one single master password or select the key file
+to unlock the whole database.
+
+
+%prep
+%autosetup -p1
+
+# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
+find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+
+
+%build
+( cd Build && sh PrepMonoDev.sh )
+find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
+for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
+ xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
+done
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
+
+%install
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
+install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
+install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
+install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
+install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
+install -p dist/%{name} %{buildroot}/%{_bindir}
+sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
+sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+
+%files
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/History.txt
+%doc %{_docdir}/%{name}/License.txt
+%{_bindir}/%{name}
+%{_prefix}/lib/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/appdata/%{name}.appdata.xml
+
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..d5f32bc
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit dc09b6e600c6950d3b485ca3c16eda2dd96252e6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Feb 26 17:27:41 2022 +0000
Don't know how to fix CVE-2022-0725.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ed4c5e7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/keepass-*.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..68cd754
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Don't know how to fix CVE-2022-0725.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
deleted file mode 100644
index 0ee5138..0000000
--- a/keepass-desktop-integration.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
---- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
-diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
---- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
-@@ -0,0 +1,23 @@
-+.TH KEEPASS 1 "Mar 19, 2011"
-+.SH NAME
-+keepass \- password manager
-+.SH SYNOPSIS
-+.B keepass
-+.SH DESCRIPTION
-+\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
-+.SH OPTIONS
-+.TP
-+\fB\-\-auto-type\fP
-+invokes global auto-type
-+.TP
-+\fB\-\-lock-all\fP
-+lock databases of all KeePass instances
-+.TP
-+\fB\-\-unlock-all\fP
-+unlock databases of all KeePass instances
-+.TP
-+\fB\-\-exit-all\fP
-+exit all KeePass instances
-+.SH AUTHOR
-+This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
-+for the Debian project (but may be used by others).
-diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
---- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+Name=KeePass
-+GenericName=Password manager
-+Exec=keepass %u
-+Icon=keepass
-+Terminal=false
-+Type=Application
-+StartupWMClass=keepass2
-+Categories=Utility;
-+MimeType=application/x-keepass2;
-+Keywords=passwords;
-diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
---- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+ <mime-type type="application/x-keepass2">
-+ <comment>KeePass 2 database</comment>
-+ <comment xml:lang="de">KeePass 2 Datenbank</comment>
-+ <glob pattern="*.kdbx"/>
-+ <icon name="keepass"/>
-+ </mime-type>
-+</mime-info>
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
deleted file mode 100644
index 424385c..0000000
--- a/keepass-fix-XSL-search-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
---- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
-+++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
-@@ -33,6 +33,8 @@
- {
- public static class AppDefs
- {
-+ public const string DataDir = "/usr/share/keepass/";
-+
- public static readonly Color ColorControlNormal = SystemColors.Window;
- public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
-Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
-diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
---- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
-+++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
-@@ -133,7 +133,7 @@
- m_lvComponents.Columns.Add(strValueColumn, 100);
-
- string strExe = WinUtil.GetExecutable();
-- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
-+ string strDir = AppDefs.DataDir;
-
- AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
-
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
deleted file mode 100644
index 199c0e1..0000000
--- a/keepass.appdata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
-<component type="desktop">
- <id>keepass.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <name>KeePass</name>
- <summary>Password manager</summary>
- <project_license>GPL-2.0+</project_license>
- <developer_name>Dominik Reichl</developer_name>
- <description>
- <p>
- KeePass is a free open source password manager, which helps you to
- remember your passwords securely. You can put all your
- passwords in one database, which is locked with one master key or a
- key file. You only have to remember one single master password or
- select the key file to unlock the whole database.
- </p>
- </description>
- <screenshots>
- <screenshot height="351" width="624" type="default">
- <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
- <caption>KeePass showing the example database</caption>
- </screenshot>
- </screenshots>
- <url type="homepage">http://keepass.info/</url>
- <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
- <url type="translate">http://keepass.info/translations_devinfo.html</url>
- <url type="donation">http://keepass.info/donate.html</url>
- <url type="help">http://keepass.info/help/base/index.html</url>
- <update_contact>appdata(a)mavit.org.uk</update_contact>
-</component>
diff --git a/keepass.spec b/keepass.spec
deleted file mode 100644
index ea2bf3a..0000000
--- a/keepass.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-Name: keepass
-Version: 2.50
-Release: %autorelease
-Summary: Password manager
-
-License: GPLv2+
-URL: https://keepass.info/
-
-# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
-Source0: %{name}-%version.tar.xz
-Source1: %{name}.appdata.xml
-
-# Upstream does not include a .desktop file, etc..
-Patch0: keepass-desktop-integration.patch
-
-# Move XSL files to /usr/share/keepass:
-Patch1: keepass-fix-XSL-search-path.patch
-
-ExclusiveArch: %{mono_arches}
-ExcludeArch: armv7hl
-BuildRequires: ImageMagick
-BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
-BuildRequires: libgdiplus-devel
-BuildRequires: mono-devel
-BuildRequires: mono-winforms
-BuildRequires: mono-web
-BuildRequires: xorg-x11-server-Xvfb
-Requires: xdotool xsel hicolor-icon-theme
-Requires: mono-winforms
-Recommends: libargon2
-%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
-Recommends: libgcrypt
-%endif
-
-
-# The debuginfo package would be empty if created.
-%global debug_package %{nil}
-
-
-%description
-KeePass is a free open source password manager, which helps you to
-remember your passwords in a secure way. You can put all your passwords in
-one database, which is locked with one master key or a key file. You
-only have to remember one single master password or select the key file
-to unlock the whole database.
-
-
-%prep
-%autosetup -p1
-
-# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
-find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-
-
-%build
-( cd Build && sh PrepMonoDev.sh )
-find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
-for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
- xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
-done
-xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
-
-%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
-install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
-install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
-install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
-install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
-install -p dist/%{name} %{buildroot}/%{_bindir}
-sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
-sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
-
-
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
-
-
-%files
-%dir %{_docdir}
-%doc %{_docdir}/%{name}/History.txt
-%doc %{_docdir}/%{name}/License.txt
-%{_bindir}/%{name}
-%{_prefix}/lib/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_mandir}/man1/%{name}.1*
-%{_datadir}/appdata/%{name}.appdata.xml
-
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index d5f32bc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit 1425aa4b6f1e1f52bb9166aec3886498d57387de
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 22 10:38:50 2022 +0000
Update to version 2.50.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index bcb09cc..424385c 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,23 +1,27 @@
---- a/KeePass/App/AppDefs.cs
-+++ b/KeePass/App/AppDefs.cs
-@@ -32,6 +32,8 @@
+diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
+--- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
++++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
+@@ -33,6 +33,8 @@
{
public static class AppDefs
{
-+ public const string DebianDataDir = "/usr/share/keepass/";
++ public const string DataDir = "/usr/share/keepass/";
+
public static readonly Color ColorControlNormal = SystemColors.Window;
public static readonly Color ColorControlDisabled = SystemColors.Control;
public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -89,8 +89,7 @@ namespace KeePass.Forms
- m_lvComponents.Items.Add(lvi);
+Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
+diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
+--- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
++++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
+@@ -133,7 +133,7 @@
+ m_lvComponents.Columns.Add(strValueColumn, 100);
- lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
-- string strPath = WinUtil.GetExecutable();
-- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+ string strPath = AppDefs.DebianDataDir;
- strPath += AppDefs.XslFilesDir;
- strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = AppDefs.DataDir;
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.spec b/keepass.spec
index 1513163..ea2bf3a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.49
-Release: 2%{?dist}
+Version: 2.50
+Release: %autorelease
Summary: Password manager
License: GPLv2+
@@ -29,6 +29,7 @@ BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
+Recommends: libargon2
%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
Recommends: libgcrypt
%endif
@@ -108,233 +109,4 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.49-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
-- Update to version 2.49.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
-- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
-
-* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
-- Update to version 2.48.1.
-
-* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
-- Update to version 2.48.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
-- Update to version 2.47.
-
-* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
-- Exclude from armv7hl, where this doesn't currently build.
-
-* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
-- Update to version 2.46.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
-- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
-
-* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
-- Update to version 2.45.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
-- Update to version 2.44.
-
-* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
-- Update to version 2.43.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
-- Always build against latest available Mono framework version.
-
-* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
-- Update to version 2.42.1.
-
-* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
-- Update to version 2.42.
-
-* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
-- Build against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
-- Require mono-winforms. Works around #1700892.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
-- Update to version 2.41.
-
-* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
-- Update to version 2.40.
-- Drop keepass-doc subpackage, since we need Python 2 to build it.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
-- Update to version 2.39.1.
-
-* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
-- Update to version 2.39.
-- Suggest documentation.
-
-* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
-- Correct directory owning.
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
-- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
-
-* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
-- Update to version 2.38.
-
-* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
-- Update to version 2.37.
-- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
- respectively).
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
-- Update to version 2.36.
-
-* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
-- Workaround for crash when pressing Super key. Fixes #1424852.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
-- Update to 2.35.
-
-* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
-- Validate appdata.
-
-* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
-- mono rebuild for aarch64 support
-
-* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
-- Update to version 2.34.
-
-* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
-- Update AppStream XML.
-- Remove scriptlets replaced by triggers in Fedora 24.
-- Remove scriptlets replaced by triggers in Fedora 25.
-
-* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
-- Update to version 2.33.
-
-* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
-- Remove now-unneeded workaround for BOM-handling bug in grep.
-
-* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
-- Update to version 2.32.
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
-- Update to version 2.31.
-
-* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
-- Add keyword to .desktop file.
-
-* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
-- Remove workaround for #1251756, which is now fixed.
-
-* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
-- Ensure .png files are repacked into .bin files at build time.
-- Work around missing icons. Fixes #1276843.
-
-* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
-- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
-
-* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
-- Add workaround for #1251756.
-
-* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
-- Update to 2.30. Fixes #1222120.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
-- Update to 2.29
-- Rebuild (mono4)
-
-* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
-- switch to ExclusiveArch, but seems FTBFS even on x86_64
-
-* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
-- update mime scriptlets
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
-- Update to version 2.27.
-
-* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
-- Add missing %%u to Exec line in .desktop.
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
-- Mono crashes on ARM builders, so exclude that architecture.
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
-- Depend on hicolor-icon-theme.
-- The "%%{__python2}" macro requires python-devel.
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
-- Use "*" rather than ".gz" as the man page suffix, in case the
- compression format changes.
-- Use "doc" rather than "-n %%{name}-doc" in subpackages.
-- Use "%%{__python2}" macro.
-
-* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
-- Install .desktop file via desktop-file-install.
-- Don't recreate the build-root.
-- Own documentation directory.
-- Own icon and mime directories.
-- Make the -doc subpackage noarch.
-- Preserve timestamps when installing files.
-
-* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-3
-- Reliable clipboard handling requires xsel.
-
-* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-2
-- Build a documentation subpackage.
-- For auto-type, xdotool is required.
-- Include an AppData file.
-
-* Fri Apr 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-1
-- New package, based in part on the Debian package.
+%autochangelog
diff --git a/sources b/sources
index 37f4500..d5f32bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.49.tar.xz) = 067aa9d089501abaa5f6a2b55e3f96044ef9f6872ea11faa812310bfbe295fa73f283e0b34dc63cc572717dcdd75024f6bf247796b1acb24e2af2af158f7df59
+SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit 70449e5638da5b4c365f24c6b51339fac8f4c77b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 14:24:54 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 6f78d62..1513163 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.49-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
- Update to version 2.49.
commit 6ab63053e9c6e125a0e1604c91662b69b673c6b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Sep 19 19:39:13 2021 +0100
Update to version 2.49.
diff --git a/keepass.spec b/keepass.spec
index 95e81b1..6f78d62 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.48.1
-Release: 3%{?dist}
+Version: 2.49
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
+- Update to version 2.49.
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 057a14c..37f4500 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.48.1.tar.xz) = e11867aa7051784c01965303da6b94abac27876b6d0b1d4cbbea03fbabc44a068efcab15d5e22cc887ca2fb926aab2c466026bfe7aff0fab3037d01fc034d124
+SHA512 (keepass-2.49.tar.xz) = 067aa9d089501abaa5f6a2b55e3f96044ef9f6872ea11faa812310bfbe295fa73f283e0b34dc63cc572717dcdd75024f6bf247796b1acb24e2af2af158f7df59
commit e634826ec0fd5b5726701862e2f9b5456bb68632
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 09:41:14 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 73d9c02..95e81b1 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.48.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
commit 1d05ef3523583d48bb9699631ef0d1a665a6e0cc
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 18 12:13:32 2021 +0100
Create directory /usr/lib/keepass/Languages
Fixes error with View -> Change Language... -> Open Folder.
diff --git a/keepass.spec b/keepass.spec
index 99ae338..73d9c02 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.48.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -63,7 +63,7 @@ done
xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
+- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
+
* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
- Update to version 2.48.1.
commit cb75269a9550486de99ab742ec642d9300401e98
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 11 11:02:59 2021 +0100
Update to version 2.48.1.
diff --git a/keepass.spec b/keepass.spec
index 0ff1286..99ae338 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.48
-Release: 2%{?dist}
+Version: 2.48.1
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
+- Update to version 2.48.1.
+
* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
- Update to version 2.48.
diff --git a/sources b/sources
index 92e937f..057a14c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.48.tar.xz) = 535c922a93a4fed277f03092ed9b26ea4fa42f5c3f3df11b80160b780994a287d7063713d791f5b13ba55dc361df4105c39b31f8df120e872cb3c25466478ee6
+SHA512 (keepass-2.48.1.tar.xz) = e11867aa7051784c01965303da6b94abac27876b6d0b1d4cbbea03fbabc44a068efcab15d5e22cc887ca2fb926aab2c466026bfe7aff0fab3037d01fc034d124
commit 052ffc0ac10cc569c0623b18c69d32c208949f63
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri May 7 17:11:12 2021 +0100
Update to version 2.48.
diff --git a/keepass.spec b/keepass.spec
index 27e6de5..0ff1286 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.47
+Version: 2.48
Release: 2%{?dist}
Summary: Password manager
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
+- Update to version 2.48.
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e579d2f..92e937f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.47.tar.xz) = 328d6c5075422a5f474fce430da3927f8a59040bb1474cc32cfbe9f546a05f1621c35f5389578373375f0a00bbe693f1f56036b08756a42a8e4e0c39397dc838
+SHA512 (keepass-2.48.tar.xz) = 535c922a93a4fed277f03092ed9b26ea4fa42f5c3f3df11b80160b780994a287d7063713d791f5b13ba55dc361df4105c39b31f8df120e872cb3c25466478ee6
commit fcd1eb15524000cd6ec83d47a89e4e3118f5aa33
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 15:26:56 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 283f864..27e6de5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.47
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
- Update to version 2.47.
commit cc1acf9d5a6699686312cb66a367c37e0a9b2996
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 9 20:34:11 2021 +0000
Update to version 2.47.
diff --git a/keepass.spec b/keepass.spec
index 26eb71d..283f864 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.46
-Release: 2%{?dist}
+Version: 2.47
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
+- Update to version 2.47.
+
* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
- Exclude from armv7hl, where this doesn't currently build.
diff --git a/sources b/sources
index 62133ee..e579d2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.46.tar.xz) = 37ce998ff9ae28a2d2db5d069d385cdd1d84ae7383c4e80a1f3c4116ed7419423c04eecb966397ea4e8cd9436ae6be2dd64930a05c4c558165967bc8457f0b90
+SHA512 (keepass-2.47.tar.xz) = 328d6c5075422a5f474fce430da3927f8a59040bb1474cc32cfbe9f546a05f1621c35f5389578373375f0a00bbe693f1f56036b08756a42a8e4e0c39397dc838
commit c9027ed418dbfc9cea660529e6b5d2f208e791a0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Sep 17 13:40:30 2020 +0100
Exclude from armv7hl, where this doesn't currently build.
diff --git a/keepass.spec b/keepass.spec
index 5dc4be6..26eb71d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.46
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -18,6 +18,7 @@ Patch0: keepass-desktop-integration.patch
Patch1: keepass-fix-XSL-search-path.patch
ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -107,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
+- Exclude from armv7hl, where this doesn't currently build.
+
* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
- Update to version 2.46.
commit 830b8288d1f70d228ea7dfbb62c149ca5e86a16b
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Sep 11 16:19:50 2020 +0100
Update to version 2.46.
diff --git a/keepass.spec b/keepass.spec
index 0a991d0..5dc4be6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.45
-Release: 3%{?dist}
+Version: 2.46
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
+- Update to version 2.46.
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 5887e0f..62133ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.45.tar.xz) = f319a90732115fface3f0bd8842ca3524f464f22997d1110f21e34ec061fe290fbd67eb754d0368ee44f88ea32f396bf9f630c985f72a2e37b0bfcfe1b209f11
+SHA512 (keepass-2.46.tar.xz) = 37ce998ff9ae28a2d2db5d069d385cdd1d84ae7383c4e80a1f3c4116ed7419423c04eecb966397ea4e8cd9436ae6be2dd64930a05c4c558165967bc8457f0b90
commit 04accb05346d6bb35f743fb295f78ff83a948bce
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 02:59:29 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 0b73ee3..0a991d0 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.45
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
commit 95fcd76990b0bf06efbf48d8809d5e5a1d8b4536
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Jul 2 17:51:57 2020 +0100
Drop Recommends on gtk2
This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
diff --git a/keepass.spec b/keepass.spec
index c89bf75..0b73ee3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.45
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,7 +29,6 @@ BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
-Recommends: gtk2
Recommends: libgcrypt
%endif
@@ -108,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
+- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
+
* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
- Update to version 2.45.
commit 8d346c080ce35d1c25bf49c474f282dd5f65604b
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 9 10:30:48 2020 +0100
Update to version 2.45.
diff --git a/keepass.spec b/keepass.spec
index 12161fb..c89bf75 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.44
-Release: 2%{?dist}
+Version: 2.45
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
+- Update to version 2.45.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 127ab8d..5887e0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.44.tar.xz) = 46d5ba6f4c42bd570877c5ba4efc69cf0d57499c58ff880d0446f910e67ad379e44d8900cf572f1f2691e8ae39c6d2a9a39109c8fa254ed2dd2b83d6ccb14093
+SHA512 (keepass-2.45.tar.xz) = f319a90732115fface3f0bd8842ca3524f464f22997d1110f21e34ec061fe290fbd67eb754d0368ee44f88ea32f396bf9f630c985f72a2e37b0bfcfe1b209f11
commit 34c9add1b984f2db432188a0b72a3f63e23745b6
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 06:58:48 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 19c6a81..12161fb 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
- Update to version 2.44.
commit d9a156bb89db31343e4dace4d1ca52af50f0439e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 25 12:54:03 2020 +0000
Update to version 2.44.
diff --git a/keepass.spec b/keepass.spec
index 9e3d96b..19c6a81 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.43
+Version: 2.44
Release: 1%{?dist}
Summary: Password manager
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
+- Update to version 2.44.
+
* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
- Update to version 2.43.
diff --git a/sources b/sources
index f0fa783..127ab8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.43.tar.xz) = 12a256d27b6b9f72d73265eee649ce4189018f94bc7457841e6cf82b05976515e03c92210851d71ebd63e1e861506594e786b1ef3d8b174c8fc009b7c1ea749b
+SHA512 (keepass-2.44.tar.xz) = 46d5ba6f4c42bd570877c5ba4efc69cf0d57499c58ff880d0446f910e67ad379e44d8900cf572f1f2691e8ae39c6d2a9a39109c8fa254ed2dd2b83d6ccb14093
commit 91e4117eadafcbb0cd87b2e94a0d1306e4bec65a
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Sep 15 20:27:33 2019 +0100
Update to version 2.43.
diff --git a/keepass.spec b/keepass.spec
index daeb6ad..9e3d96b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.42.1
-Release: 3%{?dist}
+Version: 2.43
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
+- Update to version 2.43.
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index c7d8ccd..f0fa783 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.42.1.tar.xz) = b28966e7fdfa330f47242309b78a6821252288e08dd670d2de10c96fb190169fb00e78c5aa3fe21a4254689dc348d1e384f59b2ff2259807bd2b3559cf4e9903
+SHA512 (keepass-2.43.tar.xz) = 12a256d27b6b9f72d73265eee649ce4189018f94bc7457841e6cf82b05976515e03c92210851d71ebd63e1e861506594e786b1ef3d8b174c8fc009b7c1ea749b
commit 3d51b26566cc045e12307b9d174ffae17933713a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 11:21:43 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 40f5257..daeb6ad 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.42.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
- Always build against latest available Mono framework version.
commit e341b5e353b33b078d7ef94dd79ed1ed34e6b29a
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jun 25 13:30:00 2019 +0100
Use Recommends header only where available.
diff --git a/keepass.spec b/keepass.spec
index a72af89..40f5257 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -28,8 +28,10 @@ BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
+%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
Recommends: gtk2
Recommends: libgcrypt
+%endif
# The debuginfo package would be empty if created.
commit 95a60b22c7e264fd36a821328e75bd013aa811dc
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jun 25 13:07:16 2019 +0100
Drop unused file keepass-enable-local-help.patch.
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
deleted file mode 100644
index 57c7f7a..0000000
--- a/keepass-enable-local-help.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur /tmp/keepass-2.39/KeePass/App/AppHelp.cs ./KeePass/App/AppHelp.cs
---- /tmp/keepass-2.39/KeePass/App/AppHelp.cs 2018-04-13 14:55:18.000000000 +0100
-+++ ./KeePass/App/AppHelp.cs 2018-05-07 09:50:23.881108244 +0100
-@@ -58,7 +58,7 @@
- {
- if(m_strLocalHelpFile == null) return false;
-
-- try { return File.Exists(m_strLocalHelpFile); }
-+ try { return Directory.Exists(@"/usr/share/doc/keepass/Chm/help/"); }
- catch(Exception) { }
- return false;
- }
-@@ -115,13 +115,12 @@
- {
- Debug.Assert(m_strLocalHelpFile != null);
-
-- // Unblock CHM file for proper display of help contents
-- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
--
-- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
-+ string strCmd = "/usr/share/doc/keepass/Chm/help/";
-
- if(strTopic != null)
-- strCmd += "::/help/" + strTopic + ".html";
-+ strCmd += strTopic + ".html";
-+ else
-+ strCmd += "../index.html";
-
- if(strSection != null)
- {
-@@ -129,16 +128,14 @@
- strCmd += "#" + strSection;
- }
-
-- strCmd += "\"";
--
- try
- {
-- Process p = Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd);
-+ Process p = Process.Start(strCmd);
- if(p != null) p.Dispose();
- }
- catch(Exception ex)
- {
-- MessageService.ShowWarning("HH.exe " + strCmd, ex);
-+ MessageService.ShowWarning(strCmd, ex);
- }
- }
-
commit 32c3601cebacab3ca1b6e29f9d22c9fa4ea4ca6d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed May 8 00:10:50 2019 +0100
Always build against latest available Mono framework version.
diff --git a/keepass.spec b/keepass.spec
index a4851f7..a72af89 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.42.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -54,12 +54,11 @@ find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
%build
( cd Build && sh PrepMonoDev.sh )
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
-xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
-
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
%install
install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
@@ -107,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
+- Always build against latest available Mono framework version.
+
* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
- Update to version 2.42.1.
commit f66a7aa4ccb5d1ad38609568f4f2920fce573ab5
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 7 16:47:58 2019 +0100
Update to version 2.42.1.
diff --git a/keepass.spec b/keepass.spec
index fd2cf53..a4851f7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.42
+Version: 2.42.1
Release: 1%{?dist}
Summary: Password manager
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
+- Update to version 2.42.1.
+
* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
- Update to version 2.42.
diff --git a/sources b/sources
index 439ca1f..c7d8ccd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.42.tar.xz) = c085d20c56efd2201aa5e3988a6d1b0f3419fd8b321b59fdf5aef3088b62172a054b374ac719ab450b3db5c83825ab43d8674d83172004a57efc4ae3fec0cd11
+SHA512 (keepass-2.42.1.tar.xz) = b28966e7fdfa330f47242309b78a6821252288e08dd670d2de10c96fb190169fb00e78c5aa3fe21a4254689dc348d1e384f59b2ff2259807bd2b3559cf4e9903
commit 9d6e211743fbee815a8482dc4a0c11e4ac7aed78
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 2 00:30:50 2019 +0100
Update to version 2.42.
diff --git a/keepass.spec b/keepass.spec
index de00d81..fd2cf53 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.41
-Release: 3%{?dist}
+Version: 2.42
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,8 +107,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
+- Update to version 2.42.
+
* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
-- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+- Build against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
- Require mono-winforms. Works around #1700892.
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
diff --git a/sources b/sources
index 515b834..439ca1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.41.tar.xz) = aa4cbc720c3dc05492e3ce1977492b28455bcdc7cd61ed143021544146d9d767e401ed76f045ffbbb28e377b404af123ca9e43be4756f7823b289416bb15eaab
+SHA512 (keepass-2.42.tar.xz) = c085d20c56efd2201aa5e3988a6d1b0f3419fd8b321b59fdf5aef3088b62172a054b374ac719ab450b3db5c83825ab43d8674d83172004a57efc4ae3fec0cd11
commit 3df721047974daa66a00618f4710c75accf2e162
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Apr 29 00:40:00 2019 +0100
Require mono-winforms.
Works around #1700892.
diff --git a/keepass.spec b/keepass.spec
index cab67f2..de00d81 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -27,6 +27,7 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
+Requires: mono-winforms
Recommends: gtk2
Recommends: libgcrypt
@@ -108,6 +109,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+- Require mono-winforms. Works around #1700892.
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 10437aa2ecb9098dd1d3c8c47b7fc16eb0614eb9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Apr 29 00:37:58 2019 +0100
Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
diff --git a/keepass.spec b/keepass.spec
index f072be4..cab67f2 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.41
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -53,12 +53,11 @@ find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
%build
( cd Build && sh PrepMonoDev.sh )
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
-xbuild /target:KeePass /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
-xbuild /target:KeePass /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
%install
@@ -107,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
+- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 185ad448a3826e478e94135a7a9d83547a66e547
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 05:19:13 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 1cc0f53..f072be4 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.41
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
- Update to version 2.41.
commit eb6741be7d30f22766316955534f4b849d533589
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Jan 13 17:23:18 2019 +0000
Update to version 2.41.
diff --git a/keepass.spec b/keepass.spec
index 2db35c9..1cc0f53 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.40
+Version: 2.41
Release: 1%{?dist}
Summary: Password manager
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
+- Update to version 2.41.
+
* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
- Update to version 2.40.
- Drop keepass-doc subpackage, since we need Python 2 to build it.
diff --git a/sources b/sources
index c6e34e6..515b834 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.40.tar.xz) = acd4fa94b668130fc512343632519270446a4bb14aea248ce1608805b4b819476ddddcc525a6769c147348e264963bda331001d7348f854611d08510018d5395
+SHA512 (keepass-2.41.tar.xz) = aa4cbc720c3dc05492e3ce1977492b28455bcdc7cd61ed143021544146d9d767e401ed76f045ffbbb28e377b404af123ca9e43be4756f7823b289416bb15eaab
commit 8835566ff142f50579a78c42385ce42dee0d637c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Sep 22 12:50:26 2018 +0100
Update to version 2.40
Drop keepass-doc subpackage, since we need Python 2 to build it.
diff --git a/keepass.spec b/keepass.spec
index d57039e..2db35c9 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.39.1
-Release: 2%{?dist}
+Version: 2.40
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -17,24 +17,18 @@ Patch0: keepass-desktop-integration.patch
# Move XSL files to /usr/share/keepass:
Patch1: keepass-fix-XSL-search-path.patch
-# Locate locally-installed help files:
-Patch2: keepass-enable-local-help.patch
-
ExclusiveArch: %{mono_arches}
BuildRequires: ImageMagick
-BuildRequires: archmage
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
-BuildRequires: python2-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
Recommends: libgcrypt
-Suggests: keepass-doc
# The debuginfo package would be empty if created.
@@ -65,7 +59,6 @@ for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
xbuild /target:KeePass /property:Configuration=Release
-%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
%install
@@ -86,7 +79,6 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
-cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%check
@@ -114,20 +106,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/%{name}.appdata.xml
-%package doc
-Summary: Documentation for the KeePass password manager
-BuildArch: noarch
-Recommends: keepass
-
-%description doc
-Documentation for KeePass, a free open source password manager.
-
-%files doc
-%dir %{_docdir}
-%doc %{_docdir}/%{name}/Chm/
-
-
%changelog
+* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
+- Update to version 2.40.
+- Drop keepass-doc subpackage, since we need Python 2 to build it.
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index a1bf4a1..c6e34e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.39.1.tar.xz) = 8aef18ace04bc633e565069215801b43eb6ce63eff693eff941d2d7ad8e6b026b8d469fcbbe897bb099ffb86d36197f76b6829a90951090e678754d80fd8d513
+SHA512 (keepass-2.40.tar.xz) = acd4fa94b668130fc512343632519270446a4bb14aea248ce1608805b4b819476ddddcc525a6769c147348e264963bda331001d7348f854611d08510018d5395
commit 6d5d8ed92cfe77550da79a164ad8455d96d883ec
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 06:59:01 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 46e622a..d57039e 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.39.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -128,6 +128,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
- Update to version 2.39.1.
commit 49d72b89654643547cec89f4cbb4d1f262da593c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun May 13 11:30:08 2018 +0100
Update to version 2.39.1.
diff --git a/keepass.spec b/keepass.spec
index 03e1095..46e622a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.39
+Version: 2.39.1
Release: 1%{?dist}
Summary: Password manager
@@ -128,6 +128,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
+- Update to version 2.39.1.
+
* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
- Update to version 2.39.
- Suggest documentation.
diff --git a/sources b/sources
index a407889..a1bf4a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.39.tar.xz) = 9dc7f18fb1a897fb564f7797258f004f001d8bd6249348e9bbd10825a7d7235fc81b13e41294a74da50b9d31641266ec7a78f9a910ff6d0e9163340cc7c7945e
+SHA512 (keepass-2.39.1.tar.xz) = 8aef18ace04bc633e565069215801b43eb6ce63eff693eff941d2d7ad8e6b026b8d469fcbbe897bb099ffb86d36197f76b6829a90951090e678754d80fd8d513
commit 7ab2d3c4c19482d0100ddee26ee8de94e82248c6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 8 23:19:22 2018 +0100
Suggest documentation.
diff --git a/keepass.spec b/keepass.spec
index 85d6ca7..03e1095 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -34,6 +34,7 @@ BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
Recommends: libgcrypt
+Suggests: keepass-doc
# The debuginfo package would be empty if created.
@@ -116,6 +117,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%package doc
Summary: Documentation for the KeePass password manager
BuildArch: noarch
+Recommends: keepass
%description doc
Documentation for KeePass, a free open source password manager.
@@ -128,6 +130,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
- Update to version 2.39.
+- Suggest documentation.
* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
- Correct directory owning.
commit 29db0cae58e0ebef6cbbcc7df25b12c3e4fd25b7
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 8 23:07:52 2018 +0100
Update to version 2.39.
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
index bd6c67f..57c7f7a 100644
--- a/keepass-enable-local-help.patch
+++ b/keepass-enable-local-help.patch
@@ -1,17 +1,7 @@
-From: Julian Taylor <jtaylor.debian(a)googlemail.com>
-Date: Tue, 12 Jul 2011 21:51:43 +0200
-Subject: enable local help
-
-disable windows chm viewer and use x-www-browser to view docs
-located as html files in "/usr/share/doc/keepass2/Chm/help/"
-Forwarded: not-needed
----
- KeePass/App/AppHelp.cs | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
---- a/KeePass/App/AppHelp.cs
-+++ b/KeePass/App/AppHelp.cs
-@@ -58,7 +58,7 @@ namespace KeePass.App
+diff -ur /tmp/keepass-2.39/KeePass/App/AppHelp.cs ./KeePass/App/AppHelp.cs
+--- /tmp/keepass-2.39/KeePass/App/AppHelp.cs 2018-04-13 14:55:18.000000000 +0100
++++ ./KeePass/App/AppHelp.cs 2018-05-07 09:50:23.881108244 +0100
+@@ -58,7 +58,7 @@
{
if(m_strLocalHelpFile == null) return false;
@@ -20,38 +10,40 @@ Forwarded: not-needed
catch(Exception) { }
return false;
}
-@@ -114,14 +114,13 @@ namespace KeePass.App
- private static void ShowHelpLocal(string strTopic, string strSection)
+@@ -115,13 +115,12 @@
{
Debug.Assert(m_strLocalHelpFile != null);
--
+
- // Unblock CHM file for proper display of help contents
- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
-
- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
-+
-+ string strCmd = @"/usr/share/doc/keepass/Chm/help/";
++ string strCmd = "/usr/share/doc/keepass/Chm/help/";
if(strTopic != null)
-- strCmd += @"::/help/" + strTopic + ".html";
+- strCmd += "::/help/" + strTopic + ".html";
+ strCmd += strTopic + ".html";
-+ else
-+ strCmd += @"../index.html";
++ else
++ strCmd += "../index.html";
if(strSection != null)
{
-@@ -129,12 +128,10 @@ namespace KeePass.App
- strCmd += @"#" + strSection;
+@@ -129,16 +128,14 @@
+ strCmd += "#" + strSection;
}
- strCmd += "\"";
-
-- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
-+ try { Process.Start("x-www-browser", strCmd); }
- catch(Exception exStart)
+ try
+ {
+- Process p = Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd);
++ Process p = Process.Start(strCmd);
+ if(p != null) p.Dispose();
+ }
+ catch(Exception ex)
{
-- MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);
-+ MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);
+- MessageService.ShowWarning("HH.exe " + strCmd, ex);
++ MessageService.ShowWarning(strCmd, ex);
}
}
diff --git a/keepass.spec b/keepass.spec
index 7e630a5..85d6ca7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.38
-Release: 6%{?dist}
+Version: 2.39
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
+- Update to version 2.39.
+
* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
- Correct directory owning.
diff --git a/sources b/sources
index a723eef..a407889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.38.tar.xz) = f70c08e3af66c17cea603f1707bbdcc6fee1fd25c9078dfc1aaa5c1ca5de1b146f49169bd15a5e13a9c63b36b3b59069b93f45fc45777eb0b4dd8542ba2e8093
+SHA512 (keepass-2.39.tar.xz) = 9dc7f18fb1a897fb564f7797258f004f001d8bd6249348e9bbd10825a7d7235fc81b13e41294a74da50b9d31641266ec7a78f9a910ff6d0e9163340cc7c7945e
commit 6724e6cfab19db1c705c8e04ea7c83b82be361ad
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Mar 27 17:05:25 2018 +0100
Bump revision.
diff --git a/keepass.spec b/keepass.spec
index d5da034..7e630a5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
+- Correct directory owning.
+
* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
commit 0d0c217927ab0b3a7490c074a4f6fc42f763b07d
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Mon Mar 19 13:34:15 2018 +0000
Correct directory owning
Directory /usr/share/mime should be owned only by shared-mime-info package.
diff --git a/keepass.spec b/keepass.spec
index e707dbd..d5da034 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -101,7 +101,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_prefix}/lib/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime
+%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
commit e91a91ddbe17b9a1b19ae4f66f321c5eed766300
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Thu Mar 15 05:49:58 2018 +0100
Update Python 2 dependency declarations to new packaging standards
diff --git a/keepass.spec b/keepass.spec
index 9e2393a..e707dbd 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,7 +29,7 @@ BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
-BuildRequires: python-devel
+BuildRequires: python2-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
@@ -126,6 +126,10 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
- Escape macros in %%changelog
commit 92a09dd059d0d5f6f4a6c5acc24da87f5c10c115
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 9 09:04:51 2018 +0100
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 908df01..9e2393a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
+- Escape macros in %%changelog
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -226,7 +229,7 @@ Documentation for KeePass, a free open source password manager.
- Update to version 2.27.
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
-- Add missing %u to Exec line in .desktop.
+- Add missing %%u to Exec line in .desktop.
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -236,13 +239,13 @@ Documentation for KeePass, a free open source password manager.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
-- The "%{__python2}" macro requires python-devel.
+- The "%%{__python2}" macro requires python-devel.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
-- Use "doc" rather than "-n %{name}-doc" in subpackages.
-- Use "%{__python2}" macro.
+- Use "doc" rather than "-n %%{name}-doc" in subpackages.
+- Use "%%{__python2}" macro.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit 14743d02c67893f9e027945df4adcfdb5cfd9fdf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 19:52:47 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 34358c3..908df01 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
commit 5a012b29a7c93ff89daaba119acc366e43cc35fe
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 6 17:47:57 2018 +0000
Update URL.
diff --git a/keepass.spec b/keepass.spec
index fd59515..34358c3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -4,7 +4,7 @@ Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
-URL: http://keepass.info/
+URL: https://keepass.info/
# Created with, e.g.:
# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
commit 3250cec73c6e513ddeb10f70d7cf0d4caa039eaf
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed Jan 31 15:19:44 2018 +0000
Remove icon cache scriptlets, to keep up with latest packaging guidelines.
diff --git a/keepass.spec b/keepass.spec
index 0e1b009..fd59515 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -113,21 +113,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/%{name}.appdata.xml
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%package doc
Summary: Documentation for the KeePass password manager
BuildArch: noarch
@@ -141,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
+- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
+
* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
- Update to version 2.38.
commit a80a95760c9d13374afa0c2ce98055cd02627f0d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed Jan 10 13:11:05 2018 +0000
Update to version 2.38.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index a221f2f..bcb09cc 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,14 +1,14 @@
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
-@@ -36,6 +36,8 @@ namespace KeePass.App
- public static readonly Color ColorQualityLow = Color.FromArgb(255, 128, 0);
- public static readonly Color ColorQualityHigh = Color.FromArgb(0, 255, 0);
-
-+ public const string DebianDataDir = "/usr/share/keepass/";
+@@ -32,6 +32,8 @@
+ {
+ public static class AppDefs
+ {
++ public const string DebianDataDir = "/usr/share/keepass/";
+
- public const string XslFilesDir = "XSL";
- public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
- public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
+ public static readonly Color ColorControlNormal = SystemColors.Window;
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -89,8 +89,7 @@ namespace KeePass.Forms
diff --git a/keepass.spec b/keepass.spec
index 44206b5..0e1b009 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.37
+Version: 2.38
Release: 1%{?dist}
Summary: Password manager
@@ -141,6 +141,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
+- Update to version 2.38.
+
* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
- Update to version 2.37.
- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
diff --git a/sources b/sources
index 8e3f1dc..a723eef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.37.tar.xz) = 60d40b6e708e54cc7629402a45c17dae7106b775c8799aca6273612476ce64a234fa692b978e16bc8094dfe93c6b628046dcc0ae2df5d8aeb4181bc6e428aad2
+SHA512 (keepass-2.38.tar.xz) = f70c08e3af66c17cea603f1707bbdcc6fee1fd25c9078dfc1aaa5c1ca5de1b146f49169bd15a5e13a9c63b36b3b59069b93f45fc45777eb0b4dd8542ba2e8093
commit 1e72101f077214f379ad05022bf679cedc5f58db
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Oct 14 23:14:25 2017 +0100
Recommend gtk2 and libgcrypt packages
For theming and key derivation, respectively.
diff --git a/keepass.spec b/keepass.spec
index b4f52ce..44206b5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -32,6 +32,8 @@ BuildRequires: mono-web
BuildRequires: python-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
+Recommends: gtk2
+Recommends: libgcrypt
# The debuginfo package would be empty if created.
@@ -141,6 +143,8 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
- Update to version 2.37.
+- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
+ respectively).
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 92fe5ed6be36e58cdae96550fe1f47a04c178226
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Oct 14 22:59:20 2017 +0100
Update to version 2.37.
diff --git a/keepass.spec b/keepass.spec
index 39b5228..b4f52ce 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,13 +1,13 @@
Name: keepass
-Version: 2.36
-Release: 3%{?dist}
+Version: 2.37
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
Source1: %{name}.appdata.xml
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
+- Update to version 2.37.
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 6c469f4..8e3f1dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.36.tar.xz) = 53921b5ac747da886322f0b869f7f36b10ff098b8ad000be42f6126df6db1e2c391bb875b7c9497f0b7085edb4e597a2ddc1a02764f2836c5155a62fd6b78586
+SHA512 (keepass-2.37.tar.xz) = 60d40b6e708e54cc7629402a45c17dae7106b775c8799aca6273612476ce64a234fa692b978e16bc8094dfe93c6b628046dcc0ae2df5d8aeb4181bc6e428aad2
commit 56cfbaa99637ff54da156bdc67270e99f083d91a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 00:20:02 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index e4403b5..39b5228 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.36
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit c02d0c565a46162a579e0e398d5bc5683e904f7f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 15:07:56 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 3422f4f..e4403b5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.36
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
- Update to version 2.36.
commit 7ec1f54dc66ab59e51b9479464a2f98aea7961b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Jun 12 21:49:53 2017 +0100
Update to version 2.36.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index 949aa5c..a221f2f 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,8 +1,8 @@
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
- public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+ public static readonly Color ColorQualityLow = Color.FromArgb(255, 128, 0);
+ public static readonly Color ColorQualityHigh = Color.FromArgb(0, 255, 0);
+ public const string DebianDataDir = "/usr/share/keepass/";
+
diff --git a/keepass.spec b/keepass.spec
index 84fed0f..3422f4f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.35
-Release: 3%{?dist}
+Version: 2.36
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
+- Update to version 2.36.
+
* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
- Workaround for crash when pressing Super key. Fixes #1424852.
diff --git a/sources b/sources
index 4fc91a1..6c469f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.35.tar.xz) = 50d518bd957009182ac2c9075cb1ea466877193ffc82ec1761c7228d50fd9e3b8162a05608eb199bd9ea7a5ed7b904c761ee53fcb3af638f47249e2988fb6801
+SHA512 (keepass-2.36.tar.xz) = 53921b5ac747da886322f0b869f7f36b10ff098b8ad000be42f6126df6db1e2c391bb875b7c9497f0b7085edb4e597a2ddc1a02764f2836c5155a62fd6b78586
commit cf044982308e827a8c956bca453e5c20bb7c4317
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 21 19:29:04 2017 +0000
Remember to bump release number.
diff --git a/keepass.spec b/keepass.spec
index c901bc0..84fed0f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.35
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,7 +139,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
-* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-2
+* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
- Workaround for crash when pressing Super key. Fixes #1424852.
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
commit 14070dac9bb4d663250acce537a3a480bf83dff8
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 21 19:02:18 2017 +0000
Workaround for crash when pressing Super key. Fixes #1424852.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index d154acd..0ee5138 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono /usr/lib/keepass/KeePass.exe "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
diff --git a/keepass.spec b/keepass.spec
index 9a4607b..c901bc0 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-2
+- Workaround for crash when pressing Super key. Fixes #1424852.
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 9d6e5c869b37c288b55286f0044e88098b52c6d3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 10 17:44:17 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index a47ea2c..9a4607b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.35
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
- Update to 2.35.
commit 529e7ac8d7ed43c1e5ed52701d00753e03278bb9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jan 20 23:47:37 2017 +0000
Update to 2.35.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index eb73bc6..949aa5c 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,15 +1,3 @@
-From: Debian CLI Applications Team <pkg-cli-apps-team(a)lists.alioth.debian.org>
-Date: Tue, 21 Jun 2011 19:43:31 +0200
-Subject: fix XSL search path
-
-search for XSL files in /usr/share/keepass2
-
-Forwarded: not-needed
----
- KeePass/App/AppDefs.cs | 2 ++
- KeePass/Forms/AboutForm.cs | 3 +--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -19,8 +7,8 @@ Forwarded: not-needed
+ public const string DebianDataDir = "/usr/share/keepass/";
+
public const string XslFilesDir = "XSL";
- public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
- public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
+ public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
+ public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -89,8 +89,7 @@ namespace KeePass.Forms
@@ -32,4 +20,4 @@ Forwarded: not-needed
+ string strPath = AppDefs.DebianDataDir;
strPath += AppDefs.XslFilesDir;
strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
+ bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/keepass.spec b/keepass.spec
index d2d69a6..a47ea2c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.34
-Release: 3%{?dist}
+Version: 2.35
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -68,7 +68,7 @@ xbuild /target:KeePass /property:Configuration=Release
%install
install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
-install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
+- Update to 2.35.
+
* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
- Validate appdata.
diff --git a/sources b/sources
index 456c5b4..4fc91a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d939f55fa09e1d973dce43b35dd1373 keepass-2.34.tar.xz
+SHA512 (keepass-2.35.tar.xz) = 50d518bd957009182ac2c9075cb1ea466877193ffc82ec1761c7228d50fd9e3b8162a05608eb199bd9ea7a5ed7b904c761ee53fcb3af638f47249e2988fb6801
commit 6729cc6f1d17df3ab26f4f52e39302c41c43ca94
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jan 20 21:53:18 2017 +0000
Validate appdata.
diff --git a/keepass.spec b/keepass.spec
index 266e8dc..d2d69a6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.34
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -24,6 +24,7 @@ ExclusiveArch: %{mono_arches}
BuildRequires: ImageMagick
BuildRequires: archmage
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
@@ -85,6 +86,11 @@ sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+
%files
%dir %{_docdir}
%doc %{_docdir}/%{name}/History.txt
@@ -133,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
+- Validate appdata.
+
* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
- mono rebuild for aarch64 support
commit 990649cf0ca6e9c53f09cee0cd49e38f959b9c7c
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Thu Oct 13 15:46:47 2016 +0100
- mono rebuild for aarch64 support
diff --git a/keepass.spec b/keepass.spec
index e087046..266e8dc 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.34
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -133,6 +133,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
+- mono rebuild for aarch64 support
+
* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
- Update to version 2.34.
commit e19c756188e33c09bbaba6d8a258a0c560f98875
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 28 22:33:44 2016 +0100
Fix bad rebase.
diff --git a/keepass.spec b/keepass.spec
index 3005953..e087046 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,14 +1,6 @@
Name: keepass
-<<<<<<< variant A
-Version: 2.33
-Release: 2%{?dist}
->>>>>>> variant B
Version: 2.34
Release: 1%{?dist}
-####### Ancestor
-Version: 2.33
-Release: 1%{?dist}
-======= end
Summary: Password manager
License: GPLv2+
commit 64146d54766352b5b0f0d8612e9bd1b4a1274cc2
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 28 22:25:56 2016 +0100
Update to version 2.34.
diff --git a/keepass.spec b/keepass.spec
index fa1e575..3005953 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,14 @@
Name: keepass
+<<<<<<< variant A
Version: 2.33
Release: 2%{?dist}
+>>>>>>> variant B
+Version: 2.34
+Release: 1%{?dist}
+####### Ancestor
+Version: 2.33
+Release: 1%{?dist}
+======= end
Summary: Password manager
License: GPLv2+
@@ -133,6 +141,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
+- Update to version 2.34.
+
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
- Remove scriptlets replaced by triggers in Fedora 24.
diff --git a/sources b/sources
index b649b49..456c5b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e15c3b516d12181b73c3053c3e40323 keepass-2.33.tar.xz
+8d939f55fa09e1d973dce43b35dd1373 keepass-2.34.tar.xz
commit 17d5f8e3a86f11452c24b41c126ec78da2726f1f
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:30:59 2016 +0100
Remove scriptlets replaced by triggers in Fedora 25.
diff --git a/keepass.spec b/keepass.spec
index 31a2db5..fa1e575 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -106,16 +106,13 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
-/usr/bin/update-desktop-database &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
fi
@@ -139,6 +136,7 @@ Documentation for KeePass, a free open source password manager.
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
- Remove scriptlets replaced by triggers in Fedora 24.
+- Remove scriptlets replaced by triggers in Fedora 25.
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit 69d06edd149fa1cd7bb9678744ff3873ea0407f0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:28:46 2016 +0100
Remove scriptlets replaced by triggers in Fedora 24.
diff --git a/keepass.spec b/keepass.spec
index 56e21e7..31a2db5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -107,7 +107,6 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -117,13 +116,11 @@ if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
- /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%package doc
@@ -141,6 +138,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
+- Remove scriptlets replaced by triggers in Fedora 24.
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit 54c70b9bee532947667e3561c3a7265300a4691c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:20:01 2016 +0100
Update AppStream XML.
diff --git a/keepass-appdata.patch b/keepass-appdata.patch
deleted file mode 100644
index 5837028..0000000
--- a/keepass-appdata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- keepass-2.26/dist/keepass.appdata.xml 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.appdata.xml 2014-04-20 15:24:36.025952830 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright 2014 Peter Oliver <appdata(a)mavit.org.uk> -->
-+<application>
-+ <id type="desktop">keepass.desktop</id>
-+ <metadata_license>CC0</metadata_license>
-+ <name>KeePass</name>
-+ <summary>Password manager</summary>
-+ <description>
-+ <p>
-+ KeePass is a free open source password manager, which helps you to
-+ remember your passwords securely. You can put all your
-+ passwords in one database, which is locked with one master key or a
-+ key file. You only have to remember one single master password or
-+ select the key file to unlock the whole database.
-+ </p>
-+ </description>
-+ <screenshots>
-+ <screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/keepass-main-window.png</screenshot>
-+ </screenshots>
-+ <url type="homepage">http://keepass.info/</url>
-+ <updatecontact>appdata(a)mavit.org.uk</updatecontact>
-+</application>
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
new file mode 100644
index 0000000..199c0e1
--- /dev/null
+++ b/keepass.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
+<component type="desktop">
+ <id>keepass.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>KeePass</name>
+ <summary>Password manager</summary>
+ <project_license>GPL-2.0+</project_license>
+ <developer_name>Dominik Reichl</developer_name>
+ <description>
+ <p>
+ KeePass is a free open source password manager, which helps you to
+ remember your passwords securely. You can put all your
+ passwords in one database, which is locked with one master key or a
+ key file. You only have to remember one single master password or
+ select the key file to unlock the whole database.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot height="351" width="624" type="default">
+ <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
+ <caption>KeePass showing the example database</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://keepass.info/</url>
+ <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
+ <url type="translate">http://keepass.info/translations_devinfo.html</url>
+ <url type="donation">http://keepass.info/donate.html</url>
+ <url type="help">http://keepass.info/help/base/index.html</url>
+ <update_contact>appdata(a)mavit.org.uk</update_contact>
+</component>
diff --git a/keepass.spec b/keepass.spec
index 051e47d..56e21e7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -9,10 +9,10 @@ URL: http://keepass.info/
# Created with, e.g.:
# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
+Source1: %{name}.appdata.xml
# Upstream does not include a .desktop file, etc..
Patch0: keepass-desktop-integration.patch
-Patch3: keepass-appdata.patch
# Move XSL files to /usr/share/keepass:
Patch1: keepass-fix-XSL-search-path.patch
@@ -78,7 +78,7 @@ install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{build
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 dist/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
+- Update AppStream XML.
+
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit e0d383aee24f3129abc4c19e25508065cb9fffd9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 21 14:54:04 2016 +0100
Update to version 2.33.
diff --git a/keepass.spec b/keepass.spec
index b9e9da6..051e47d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,13 +1,13 @@
Name: keepass
-Version: 2.32
-Release: 3%{?dist}
+Version: 2.33
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-2.32-Source.zip.asc KeePass-2.32-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
# Upstream does not include a .desktop file, etc..
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
+- Update to version 2.33.
+
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
- Remove now-unneeded workaround for BOM-handling bug in grep.
diff --git a/sources b/sources
index 33e21b1..b649b49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2485dde5dfe48370dc34481ec8f2533c keepass-2.32.tar.xz
+6e15c3b516d12181b73c3053c3e40323 keepass-2.33.tar.xz
commit dd4685b28efdceef6fd524670e3381a01d596215
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 21 13:17:30 2016 +0100
Remove now-unneeded workaround for BOM-handling bug in grep.
diff --git a/keepass.spec b/keepass.spec
index a493a67..b9e9da6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.32
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -51,10 +51,6 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-# Work around BOM-handling bug
-# (https://bugzilla.redhat.com/show_bug.cgi?id=1317084):
-sed -i '1s/^//' KeePass/KeePass.csproj
-
%build
( cd Build && sh PrepMonoDev.sh )
@@ -143,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
+- Remove now-unneeded workaround for BOM-handling bug in grep.
+
* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
- Update to version 2.32.
commit 6a32084a6f7a4aa2d2e11c47ee2ef259984ab9a6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Mar 11 22:59:17 2016 +0000
Add link to BOM-handling bug.
diff --git a/keepass.spec b/keepass.spec
index 676145b..a493a67 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -51,7 +51,8 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-# Work around BOM:
+# Work around BOM-handling bug
+# (https://bugzilla.redhat.com/show_bug.cgi?id=1317084):
sed -i '1s/^//' KeePass/KeePass.csproj
commit e4eee07b45f1eafc132bac47d354986b8d088157
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Mar 10 22:13:36 2016 +0000
Update to version 2.32.
diff --git a/keepass.spec b/keepass.spec
index b93907d..676145b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.31
+Version: 2.32
Release: 2%{?dist}
Summary: Password manager
@@ -7,7 +7,7 @@ License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.25 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO http://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/K... && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-2.32-Source.zip.asc KeePass-2.32-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
# Upstream does not include a .desktop file, etc..
@@ -51,6 +51,9 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+# Work around BOM:
+sed -i '1s/^//' KeePass/KeePass.csproj
+
%build
( cd Build && sh PrepMonoDev.sh )
@@ -139,6 +142,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
+- Update to version 2.32.
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index fc30a8e..33e21b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30d34d65f6be2a496d6ea8e43837e1c6 keepass-2.31.tar.xz
+2485dde5dfe48370dc34481ec8f2533c keepass-2.32.tar.xz
commit d8681f3eebbef3ef8501ae30e4dfe503f7c8e727
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Feb 4 01:55:23 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 24fe42d..b93907d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.31
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
- Update to version 2.31.
commit fb6959412351353dae0cdbb20e88b769b1a69d46
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Jan 11 20:53:04 2016 +0000
Update to version 2.31.
diff --git a/keepass.spec b/keepass.spec
index 0ba9627..24fe42d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.30
-Release: 6%{?dist}
+Version: 2.31
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -65,10 +65,16 @@ xbuild /target:KeePass /property:Configuration=Release
%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
-install -p -m 0644 -T Ext/Icons/Finals/plockb.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
@@ -88,7 +94,13 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
-%{_datadir}/icons/hicolor/256x256/apps/keepass.png
+%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -127,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
+- Update to version 2.31.
+
* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
- Add keyword to .desktop file.
diff --git a/sources b/sources
index cdd3fdf..fc30a8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76b8ad9df4256317a1753572560ce172 keepass-2.30.tar.xz
+30d34d65f6be2a496d6ea8e43837e1c6 keepass-2.31.tar.xz
commit fdf3acba2be61ef150d65d0e3822f0125ec48e2e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Jan 10 14:02:52 2016 +0000
Add keyword to .desktop file.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 8a48f3c..d154acd 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -35,7 +35,7 @@ diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=KeePass
+GenericName=Password manager
@@ -46,6 +46,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+StartupWMClass=keepass2
+Categories=Utility;
+MimeType=application/x-keepass2;
++Keywords=passwords;
diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
diff --git a/keepass.spec b/keepass.spec
index 35f4ce2..0ba9627 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -127,6 +127,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
+- Add keyword to .desktop file.
+
* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
- Remove workaround for #1251756, which is now fixed.
commit 452b6aa8f08da23834036dd4b09d5c29c4c853a5
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jan 5 22:58:18 2016 +0000
Remove workaround for #1251756, which is now fixed.
diff --git a/keepass.spec b/keepass.spec
index 6225a4f..35f4ce2 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -32,9 +32,6 @@ BuildRequires: python-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
-# Workaround for 1251756:
-Requires: libgdiplus-devel
-
# The debuginfo package would be empty if created.
%global debug_package %{nil}
@@ -130,6 +127,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
+- Remove workaround for #1251756, which is now fixed.
+
* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
- Ensure .png files are repacked into .bin files at build time.
- Work around missing icons. Fixes #1276843.
commit 181e61806bf4015927a108cbd7f8cd3df33f6487
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Nov 22 21:09:22 2015 +0000
Work around some icons not appearing in 2.30. Fixes #1276843.
diff --git a/keepass.spec b/keepass.spec
index 0f82f6b..6225a4f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -21,6 +21,7 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
ExclusiveArch: %{mono_arches}
+BuildRequires: ImageMagick
BuildRequires: archmage
BuildRequires: desktop-file-utils
BuildRequires: libgdiplus-devel
@@ -50,6 +51,9 @@ to unlock the whole database.
%prep
%autosetup -p1
+# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
+find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+
%build
( cd Build && sh PrepMonoDev.sh )
@@ -128,6 +132,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
- Ensure .png files are repacked into .bin files at build time.
+- Work around missing icons. Fixes #1276843.
* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
commit 8076144e113e695452f39416b4c4af042cc0d51f
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Nov 22 21:08:12 2015 +0000
Ensure .png files are repacked into .bin files at build time.
Conflicts:
keepass.spec
diff --git a/keepass.spec b/keepass.spec
index 43d7a5c..0f82f6b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -28,6 +28,7 @@ BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
+BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
# Workaround for 1251756:
@@ -55,6 +56,10 @@ to unlock the whole database.
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
xbuild /target:KeePass /property:Configuration=Release
+for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
+ xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
+done
+xbuild /target:KeePass /property:Configuration=Release
%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
@@ -121,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
+- Ensure .png files are repacked into .bin files at build time.
+
* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
commit f380e22bb031e38966ab0fbe33b59e3c8ff6c614
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Oct 23 21:40:56 2015 +0100
Set StartupWMClass. Fixes #1266312.
This is so that desktops can match the .desktop file with the windows mapped by the application.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index ca99a8c..8a48f3c 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -43,7 +43,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+Icon=keepass
+Terminal=false
+Type=Application
-+StartupNotify=false
++StartupWMClass=keepass2
+Categories=Utility;
+MimeType=application/x-keepass2;
diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
diff --git a/keepass.spec b/keepass.spec
index 44dee7c..43d7a5c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -121,6 +121,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
+- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
+
* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
- Add workaround for #1251756.
commit a7c5b39b76adce7050d03c70f80a03f7e8f8ba58
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 17:50:36 2015 +0100
Inline comments not possible.
diff --git a/keepass.spec b/keepass.spec
index 259fd24..44dee7c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -29,7 +29,9 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
-Requires: libgdiplus-devel # Workaround for 1251756
+
+# Workaround for 1251756:
+Requires: libgdiplus-devel
# The debuginfo package would be empty if created.
commit d0c7df367081639609317d8c21c006550f32acc0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 17:48:36 2015 +0100
Add workaround for #1251756.
diff --git a/keepass.spec b/keepass.spec
index cc35222..259fd24 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,6 +29,7 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
+Requires: libgdiplus-devel # Workaround for 1251756
# The debuginfo package would be empty if created.
@@ -118,6 +119,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
+- Add workaround for #1251756.
+
* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
- Update to 2.30. Fixes #1222120.
commit d92043d28d80653a93088a4b00d6e0e37f0a33ad
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 15:02:06 2015 +0100
Update to 2.30. Fixes #1222120.
diff --git a/keepass.spec b/keepass.spec
index b51b2e1..cc35222 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.29
-Release: 2%{?dist}
+Version: 2.30
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -118,6 +118,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
+- Update to 2.30. Fixes #1222120.
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index 41c584a..cdd3fdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d25a343d95d486cf338446203418bce0 keepass-2.29.tar.xz
+76b8ad9df4256317a1753572560ce172 keepass-2.30.tar.xz
commit 258ab3ea7529886d69a26afd5e5d59e1e3beb1e3
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jun 17 13:07:11 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 934c881..b51b2e1 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.29
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -118,6 +118,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
- Update to 2.29
- Rebuild (mono4)
commit 75b16329d8ad2eab246008a5820a0d1fde4dd5c6
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue May 19 14:16:12 2015 +0100
2.29 plus mono 4 build fixes
diff --git a/.gitignore b/.gitignore
index 07c6bbb..ed4c5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/keepass-2.26.tar.xz
-/keepass-2.27.tar.xz
+/keepass-*.tar.xz
diff --git a/keepass.spec b/keepass.spec
index 7053760..934c881 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.27
-Release: 5%{?dist}
+Version: 2.29
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -21,7 +21,13 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
ExclusiveArch: %{mono_arches}
-BuildRequires: mono-devel archmage desktop-file-utils python-devel
+BuildRequires: archmage
+BuildRequires: desktop-file-utils
+BuildRequires: libgdiplus-devel
+BuildRequires: mono-devel
+BuildRequires: mono-winforms
+BuildRequires: mono-web
+BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -43,6 +49,8 @@ to unlock the whole database.
%build
( cd Build && sh PrepMonoDev.sh )
+find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
xbuild /target:KeePass /property:Configuration=Release
%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
@@ -78,8 +86,8 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
@@ -110,7 +118,8 @@ Documentation for KeePass, a free open source password manager.
%changelog
-* Mon May 18 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.27-5
+* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
+- Update to 2.29
- Rebuild (mono4)
* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
diff --git a/sources b/sources
index c4ba8d3..41c584a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4e243b7f3784db99a3f5e3ede2493b keepass-2.27.tar.xz
+d25a343d95d486cf338446203418bce0 keepass-2.29.tar.xz
commit 1103118c3e40e833b67e4e6fa8b205ef00300609
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon May 18 22:09:42 2015 +0100
Rebuild (mono4)
diff --git a/keepass.spec b/keepass.spec
index d14dcfd..7053760 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -110,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon May 18 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.27-5
+- Rebuild (mono4)
+
* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
- switch to ExclusiveArch, but seems FTBFS even on x86_64
commit fbc16b6b4553eab69daf0054d6ac06fbad0b70fa
Author: Dan Horák <dan(a)danny.cz>
Date: Sat Oct 4 16:37:58 2014 +0200
- switch to ExclusiveArch, but seems FTBFS even on x86_64
diff --git a/keepass.spec b/keepass.spec
index dc89afe..d14dcfd 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -20,7 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
-ExcludeArch: armv7hl
+ExclusiveArch: %{mono_arches}
BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -110,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
+- switch to ExclusiveArch, but seems FTBFS even on x86_64
+
* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
- update mime scriptlets
commit 44e4c7d34e42f7ce9acec99dbbd9c7db0cfe1399
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Aug 18 12:05:14 2014 -0500
update mime scriptlets
diff --git a/keepass.spec b/keepass.spec
index 91a5f2b..dc89afe 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -78,21 +78,23 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+ /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%package doc
@@ -108,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
+- update mime scriptlets
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit d9da45871cec1a75d1fb5224100c9f433681e4cd
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Sat Aug 16 23:34:08 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index df670e6..91a5f2b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
- Update to version 2.27.
commit 6f87ecdd7819060d6b3f373ad4b1cdd40429e0b0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jul 18 22:43:18 2014 +0100
Update to version 2.27.
diff --git a/.gitignore b/.gitignore
index 6856ffb..07c6bbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/keepass-2.26.tar.xz
+/keepass-2.27.tar.xz
diff --git a/keepass.spec b/keepass.spec
index 8b77771..df670e6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.26
-Release: 10%{?dist}
+Version: 2.27
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
+- Update to version 2.27.
+
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
- Add missing %u to Exec line in .desktop.
diff --git a/sources b/sources
index aa134f8..c4ba8d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aec8893be3fa27f94491a0b1a619bf7 keepass-2.26.tar.xz
+5a4e243b7f3784db99a3f5e3ede2493b keepass-2.27.tar.xz
commit bb91a54e6978e282b3e6f9c375c850f89ba38baa
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jul 18 22:12:40 2014 +0100
Add missing %u to Exec line in .desktop.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 6894a41..ca99a8c 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -39,7 +39,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+[Desktop Entry]
+Name=KeePass
+GenericName=Password manager
-+Exec=keepass
++Exec=keepass %u
+Icon=keepass
+Terminal=false
+Type=Application
diff --git a/keepass.spec b/keepass.spec
index 74c1ac3..8b77771 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
+- Add missing %u to Exec line in .desktop.
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 60527416461169d46b4f96ef018569804ef3d88c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 21:15:22 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index dd21fc9..74c1ac3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
- Mono crashes on ARM builders, so exclude that architecture.
commit 8a13b18142f2acf423996e2c4b5535b0e0af9baa
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri May 23 20:22:10 2014 +0100
Bump version number.
diff --git a/keepass.spec b/keepass.spec
index c0efef6..dd21fc9 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Password manager
License: GPLv2+
commit e5129597db37a7f7782285297941112d380fa9b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 20:36:59 2014 +0100
Mono crashes on ARM builders, so exclude that architecture.
diff --git a/keepass.spec b/keepass.spec
index 2024a67..c0efef6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Password manager
License: GPLv2+
@@ -20,6 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
+ExcludeArch: armv7hl
BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -107,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
+- Mono crashes on ARM builders, so exclude that architecture.
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
- The "%{__python2}" macro requires python-devel.
commit 9a37729e759c4fcf30f03d5912fc7d505979064e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 20:03:41 2014 +0100
The "%{__python2}" macro requires python-devel.
diff --git a/keepass.spec b/keepass.spec
index d285427..2024a67 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -20,7 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
-BuildRequires: mono-devel archmage desktop-file-utils
+BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -109,6 +109,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
+- The "%{__python2}" macro requires python-devel.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
commit 63fd17e2acbf9d5f1b68192cf943a3051a2351ca
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:37:36 2014 +0100
Depend on hicolor-icon-theme.
diff --git a/keepass.spec b/keepass.spec
index 290255b..d285427 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -21,7 +21,7 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
BuildRequires: mono-devel archmage desktop-file-utils
-Requires: xdotool xsel
+Requires: xdotool xsel hicolor-icon-theme
# The debuginfo package would be empty if created.
@@ -70,7 +70,7 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
-%{_datadir}/icons/hicolor
+%{_datadir}/icons/hicolor/256x256/apps/keepass.png
%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -107,6 +107,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
+- Depend on hicolor-icon-theme.
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
commit d79fc885457187cc772a622205b5512e1848c19d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:14:14 2014 +0100
Use "%{__python2}" macro.
diff --git a/keepass.spec b/keepass.spec
index 2d3ed27..290255b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -43,7 +43,7 @@ to unlock the whole database.
%build
( cd Build && sh PrepMonoDev.sh )
xbuild /target:KeePass /property:Configuration=Release
-python -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
+%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
%install
@@ -111,6 +111,7 @@ Documentation for KeePass, a free open source password manager.
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
- Use "doc" rather than "-n %{name}-doc" in subpackages.
+- Use "%{__python2}" macro.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit 6a9327078220aa4c6f43d2e23e3c7381c291e869
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:10:37 2014 +0100
Use "doc" rather than "-n %{name}-doc" in subpackages.
diff --git a/keepass.spec b/keepass.spec
index 30d05ed..2d3ed27 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -98,10 +98,10 @@ fi
Summary: Documentation for the KeePass password manager
BuildArch: noarch
-%description -n %{name}-doc
+%description doc
Documentation for KeePass, a free open source password manager.
-%files -n %{name}-doc
+%files doc
%dir %{_docdir}
%doc %{_docdir}/%{name}/Chm/
@@ -110,6 +110,7 @@ Documentation for KeePass, a free open source password manager.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
+- Use "doc" rather than "-n %{name}-doc" in subpackages.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit d4596a30f1ea13bbce141481171f5c9d79eb88c9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:06:24 2014 +0100
Use "*" rather than ".gz" as the man page suffix, in case the compression format changes.
diff --git a/keepass.spec b/keepass.spec
index c814205..30d05ed 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -71,7 +71,7 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
%{_datadir}/icons/hicolor
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -107,6 +107,10 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
+- Use "*" rather than ".gz" as the man page suffix, in case the
+ compression format changes.
+
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
- Don't recreate the build-root.
commit 502495f19236db24216945dd9452c0fd8c0c42d4
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:00:38 2014 +0100
Initial import. Bug 1089425.
diff --git a/.gitignore b/.gitignore
index e69de29..6856ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/keepass-2.26.tar.xz
diff --git a/keepass-appdata.patch b/keepass-appdata.patch
new file mode 100644
index 0000000..5837028
--- /dev/null
+++ b/keepass-appdata.patch
@@ -0,0 +1,25 @@
+--- keepass-2.26/dist/keepass.appdata.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.appdata.xml 2014-04-20 15:24:36.025952830 +0100
+@@ -0,0 +1,22 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2014 Peter Oliver <appdata(a)mavit.org.uk> -->
++<application>
++ <id type="desktop">keepass.desktop</id>
++ <metadata_license>CC0</metadata_license>
++ <name>KeePass</name>
++ <summary>Password manager</summary>
++ <description>
++ <p>
++ KeePass is a free open source password manager, which helps you to
++ remember your passwords securely. You can put all your
++ passwords in one database, which is locked with one master key or a
++ key file. You only have to remember one single master password or
++ select the key file to unlock the whole database.
++ </p>
++ </description>
++ <screenshots>
++ <screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/keepass-main-window.png</screenshot>
++ </screenshots>
++ <url type="homepage">http://keepass.info/</url>
++ <updatecontact>appdata(a)mavit.org.uk</updatecontact>
++</application>
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
new file mode 100644
index 0000000..6894a41
--- /dev/null
+++ b/keepass-desktop-integration.patch
@@ -0,0 +1,61 @@
+diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
+--- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec /usr/bin/mono /usr/lib/keepass/KeePass.exe "$@"
+diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
+--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
+@@ -0,0 +1,23 @@
++.TH KEEPASS 1 "Mar 19, 2011"
++.SH NAME
++keepass \- password manager
++.SH SYNOPSIS
++.B keepass
++.SH DESCRIPTION
++\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
++.SH OPTIONS
++.TP
++\fB\-\-auto-type\fP
++invokes global auto-type
++.TP
++\fB\-\-lock-all\fP
++lock databases of all KeePass instances
++.TP
++\fB\-\-unlock-all\fP
++unlock databases of all KeePass instances
++.TP
++\fB\-\-exit-all\fP
++exit all KeePass instances
++.SH AUTHOR
++This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
++for the Debian project (but may be used by others).
+diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Name=KeePass
++GenericName=Password manager
++Exec=keepass
++Icon=keepass
++Terminal=false
++Type=Application
++StartupNotify=false
++Categories=Utility;
++MimeType=application/x-keepass2;
+diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
+--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
++ <mime-type type="application/x-keepass2">
++ <comment>KeePass 2 database</comment>
++ <comment xml:lang="de">KeePass 2 Datenbank</comment>
++ <glob pattern="*.kdbx"/>
++ <icon name="keepass"/>
++ </mime-type>
++</mime-info>
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
new file mode 100644
index 0000000..bd6c67f
--- /dev/null
+++ b/keepass-enable-local-help.patch
@@ -0,0 +1,57 @@
+From: Julian Taylor <jtaylor.debian(a)googlemail.com>
+Date: Tue, 12 Jul 2011 21:51:43 +0200
+Subject: enable local help
+
+disable windows chm viewer and use x-www-browser to view docs
+located as html files in "/usr/share/doc/keepass2/Chm/help/"
+Forwarded: not-needed
+---
+ KeePass/App/AppHelp.cs | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+--- a/KeePass/App/AppHelp.cs
++++ b/KeePass/App/AppHelp.cs
+@@ -58,7 +58,7 @@ namespace KeePass.App
+ {
+ if(m_strLocalHelpFile == null) return false;
+
+- try { return File.Exists(m_strLocalHelpFile); }
++ try { return Directory.Exists(@"/usr/share/doc/keepass/Chm/help/"); }
+ catch(Exception) { }
+ return false;
+ }
+@@ -114,14 +114,13 @@ namespace KeePass.App
+ private static void ShowHelpLocal(string strTopic, string strSection)
+ {
+ Debug.Assert(m_strLocalHelpFile != null);
+-
+- // Unblock CHM file for proper display of help contents
+- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
+-
+- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
++
++ string strCmd = @"/usr/share/doc/keepass/Chm/help/";
+
+ if(strTopic != null)
+- strCmd += @"::/help/" + strTopic + ".html";
++ strCmd += strTopic + ".html";
++ else
++ strCmd += @"../index.html";
+
+ if(strSection != null)
+ {
+@@ -129,12 +128,10 @@ namespace KeePass.App
+ strCmd += @"#" + strSection;
+ }
+
+- strCmd += "\"";
+-
+- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
++ try { Process.Start("x-www-browser", strCmd); }
+ catch(Exception exStart)
+ {
+- MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);
++ MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);
+ }
+ }
+
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
new file mode 100644
index 0000000..eb73bc6
--- /dev/null
+++ b/keepass-fix-XSL-search-path.patch
@@ -0,0 +1,35 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team(a)lists.alioth.debian.org>
+Date: Tue, 21 Jun 2011 19:43:31 +0200
+Subject: fix XSL search path
+
+search for XSL files in /usr/share/keepass2
+
+Forwarded: not-needed
+---
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 3 +--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
+@@ -36,6 +36,8 @@ namespace KeePass.App
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+
++ public const string DebianDataDir = "/usr/share/keepass/";
++
+ public const string XslFilesDir = "XSL";
+ public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
+ public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -89,8 +89,7 @@ namespace KeePass.Forms
+ m_lvComponents.Items.Add(lvi);
+
+ lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
+- string strPath = WinUtil.GetExecutable();
+- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
++ string strPath = AppDefs.DebianDataDir;
+ strPath += AppDefs.XslFilesDir;
+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+ bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
diff --git a/keepass.spec b/keepass.spec
new file mode 100644
index 0000000..c814205
--- /dev/null
+++ b/keepass.spec
@@ -0,0 +1,127 @@
+Name: keepass
+Version: 2.26
+Release: 4%{?dist}
+Summary: Password manager
+
+License: GPLv2+
+URL: http://keepass.info/
+
+# Created with, e.g.:
+# version=2.25 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO http://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/K... && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+Source0: %{name}-%version.tar.xz
+
+# Upstream does not include a .desktop file, etc..
+Patch0: keepass-desktop-integration.patch
+Patch3: keepass-appdata.patch
+
+# Move XSL files to /usr/share/keepass:
+Patch1: keepass-fix-XSL-search-path.patch
+
+# Locate locally-installed help files:
+Patch2: keepass-enable-local-help.patch
+
+BuildRequires: mono-devel archmage desktop-file-utils
+Requires: xdotool xsel
+
+
+# The debuginfo package would be empty if created.
+%global debug_package %{nil}
+
+
+%description
+KeePass is a free open source password manager, which helps you to
+remember your passwords in a secure way. You can put all your passwords in
+one database, which is locked with one master key or a key file. You
+only have to remember one single master password or select the key file
+to unlock the whole database.
+
+
+%prep
+%autosetup -p1
+
+
+%build
+( cd Build && sh PrepMonoDev.sh )
+xbuild /target:KeePass /property:Configuration=Release
+python -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
+
+
+%install
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
+install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 -T Ext/Icons/Finals/plockb.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
+install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
+install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
+install -p -m 0644 dist/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata
+install -p dist/%{name} %{buildroot}/%{_bindir}
+sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
+sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
+cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
+
+
+%files
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/History.txt
+%doc %{_docdir}/%{name}/License.txt
+%{_bindir}/%{name}
+%{_prefix}/lib/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime
+%{_datadir}/icons/hicolor
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/appdata/%{name}.appdata.xml
+
+
+%post
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%package doc
+Summary: Documentation for the KeePass password manager
+BuildArch: noarch
+
+%description -n %{name}-doc
+Documentation for KeePass, a free open source password manager.
+
+%files -n %{name}-doc
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/Chm/
+
+
+%changelog
+* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
+- Install .desktop file via desktop-file-install.
+- Don't recreate the build-root.
+- Own documentation directory.
+- Own icon and mime directories.
+- Make the -doc subpackage noarch.
+- Preserve timestamps when installing files.
+
+* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-3
+- Reliable clipboard handling requires xsel.
+
+* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-2
+- Build a documentation subpackage.
+- For auto-type, xdotool is required.
+- Include an AppData file.
+
+* Fri Apr 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-1
+- New package, based in part on the Debian package.
diff --git a/sources b/sources
index e69de29..aa134f8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2aec8893be3fa27f94491a0b1a619bf7 keepass-2.26.tar.xz
4 months, 4 weeks
Architecture specific change in rpms/keepass.git
by githook-noreply@fedoraproject.org
The package rpms/keepass.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/keepass.git/commit/?id=19301fd75b...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=dc09b6e600...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=c9027ed418...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=fbc16b6b45...
https://src.fedoraproject.org/cgit/rpms/keepass.git/commit/?id=e5129597db....
Change:
+ExcludeArch: armv7hl
-ExcludeArch: armv7hl
+ExcludeArch: armv7hl
+ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit d16f4e22f596e0d179b163b8120a234188fffdc7
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Fri Dec 1 19:20:03 2023 +0100
Fix build error
diff --git a/keepass.spec b/keepass.spec
index 7d8948e..2f02eb3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -86,7 +86,7 @@ install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{build
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
commit a0c346781a4032fdbc5cde1936237282a0eb7404
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Fri Dec 1 17:49:57 2023 +0100
Use upstream source archive directly and verify it during %%prep
diff --git a/keepass.spec b/keepass.spec
index d6d95fe..7d8948e 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -6,10 +6,10 @@ Summary: Password manager
License: GPL-2.0-or-later
URL: https://keepass.info/
-# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
-Source0: %{name}-%version.tar.xz
-Source1: %{name}.appdata.xml
+Source0: https://downloads.sourceforge.net/project/%{name}/KeePass%202.x/%{version...
+Source1: https://keepass.info/integrity/v2/KeePass-%{version}-Source.zip.asc
+Source2: https://keepass.info/integrity/DominikReichl.asc
+Source3: %{name}.appdata.xml
# Upstream does not include a .desktop file, etc..
Patch0: keepass-desktop-integration.patch
@@ -21,6 +21,7 @@ ExclusiveArch: %{mono_arches}
ExcludeArch: armv7hl
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
+BuildRequires: gnupg2
BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
@@ -48,7 +49,15 @@ to unlock the whole database.
%prep
-%autosetup -p1
+%{gpgverify} \
+ --keyring='%{SOURCE2}' \
+ --signature='%{SOURCE1}' \
+ --data='%{SOURCE0}'
+
+%autosetup -p1 -c
+
+# Make sure no prebuilt dlls are shipped
+find -name "*dll" -delete
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
commit e2cd32ba3c4737623415c33b22af8d060a079d33
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Tue Nov 21 08:46:52 2023 +0100
Cleanup for upcoming re-review
- Do not own %%docdir
- Flag license file as %%license
- Migrate to SPDX license
diff --git a/keepass.spec b/keepass.spec
index 4a16762..d6d95fe 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -3,7 +3,7 @@ Version: 2.55
Release: %autorelease
Summary: Password manager
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://keepass.info/
# Created with, e.g.:
@@ -89,9 +89,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%files
-%dir %{_docdir}
%doc %{_docdir}/%{name}/History.txt
-%doc %{_docdir}/%{name}/License.txt
+%license %{_docdir}/%{name}/License.txt
%{_bindir}/%{name}
%{_prefix}/lib/%{name}
%{_datadir}/%{name}
commit 6527289293ac07575fbef34d98dcc7c33235c360
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Tue Oct 17 21:28:07 2023 +0200
Update to version 2.55.
diff --git a/keepass.spec b/keepass.spec
index 9cec211..4a16762 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.54
+Version: 2.55
Release: %autorelease
Summary: Password manager
diff --git a/sources b/sources
index d5f32bc..db57dcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
+SHA512 (keepass-2.55.tar.xz) = d2f25146d2618b1edbf8a9623a4155628dda6bd5b0a09b8e14b21ff155a7cb718938d8b00b6e3125812e001552f41962b2eb6b59b017ab3663fd8a74e6dc0565
commit 503b2281cfac5e1b1935e072c2ee5da693f1996c
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sun Jun 4 11:09:59 2023 +0200
Update to version 2.54.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 2ae1979..0ee5138 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe -wa-disable:1530 "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
diff --git a/keepass.spec b/keepass.spec
index 5628eab..9cec211 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.53.1
+Version: 2.54
Release: %autorelease
Summary: Password manager
commit dd50156f2710c69b3636cc5ac3d717bf519283b0
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Mon May 22 18:28:24 2023 +0200
Disable xdotool clipboard workaround to prevent passwords from leaking to systemd journal (CVE-2022-0725)
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 0ee5138..2ae1979 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe -wa-disable:1530 "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
commit 277fd9607d429ce1d69ee901080506e2eb51e683
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Mon May 22 17:37:58 2023 +0200
Update to version 2.53.1.
diff --git a/keepass.spec b/keepass.spec
index 3a3d6b3..5628eab 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.52
+Version: 2.53.1
Release: %autorelease
Summary: Password manager
commit 71addb3f7109403630c9dc9e92b2e044efda5f88
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Sun Sep 11 19:57:13 2022 +0200
Update to version 2.52.
diff --git a/keepass.spec b/keepass.spec
index 81bd4f4..3a3d6b3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.51.1
+Version: 2.52
Release: %autorelease
Summary: Password manager
commit 86903b1ea36ece039d55ce37a7c9ba97bdb5f9c1
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Aug 18 21:26:21 2022 +0200
Update to version 2.51.1.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index 424385c..8302c87 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,20 +1,31 @@
-diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
---- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
-+++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
-@@ -33,6 +33,8 @@
+From a5b7847ffa46bd5b541073705304967bfe0b9f6f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 18 Aug 2022 21:16:13 +0200
+Subject: [PATCH] fix XSL search path
+
+---
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
+index 7d67c30..4052244 100644
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
+@@ -33,6 +33,8 @@ namespace KeePass.App
{
public static class AppDefs
{
+ public const string DataDir = "/usr/share/keepass/";
-+
++
public static readonly Color ColorControlNormal = SystemColors.Window;
public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
-Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
-diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
---- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
-+++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
-@@ -133,7 +133,7 @@
+ public static readonly Color ColorEditError = (UIUtil.IsDarkTheme ?
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index d682c48..51aae17 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -133,7 +133,7 @@ namespace KeePass.Forms
m_lvComponents.Columns.Add(strValueColumn, 100);
string strExe = WinUtil.GetExecutable();
@@ -23,5 +34,6 @@ diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Fo
AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
+--
+2.37.2
+
diff --git a/keepass.spec b/keepass.spec
index ea2bf3a..81bd4f4 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.50
+Version: 2.51.1
Release: %autorelease
Summary: Password manager
commit 19301fd75b9dfb0da2a91a8d81341a2454695288
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Aug 18 20:38:46 2022 +0200
Revert "Don't know how to fix CVE-2022-0725."
This reverts commit dc09b6e600c6950d3b485ca3c16eda2dd96252e6.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ed4c5e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/keepass-*.tar.xz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 68cd754..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Don't know how to fix CVE-2022-0725.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
new file mode 100644
index 0000000..0ee5138
--- /dev/null
+++ b/keepass-desktop-integration.patch
@@ -0,0 +1,62 @@
+diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
+--- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
+diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
+--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
+@@ -0,0 +1,23 @@
++.TH KEEPASS 1 "Mar 19, 2011"
++.SH NAME
++keepass \- password manager
++.SH SYNOPSIS
++.B keepass
++.SH DESCRIPTION
++\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
++.SH OPTIONS
++.TP
++\fB\-\-auto-type\fP
++invokes global auto-type
++.TP
++\fB\-\-lock-all\fP
++lock databases of all KeePass instances
++.TP
++\fB\-\-unlock-all\fP
++unlock databases of all KeePass instances
++.TP
++\fB\-\-exit-all\fP
++exit all KeePass instances
++.SH AUTHOR
++This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
++for the Debian project (but may be used by others).
+diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++Name=KeePass
++GenericName=Password manager
++Exec=keepass %u
++Icon=keepass
++Terminal=false
++Type=Application
++StartupWMClass=keepass2
++Categories=Utility;
++MimeType=application/x-keepass2;
++Keywords=passwords;
+diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
+--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
++ <mime-type type="application/x-keepass2">
++ <comment>KeePass 2 database</comment>
++ <comment xml:lang="de">KeePass 2 Datenbank</comment>
++ <glob pattern="*.kdbx"/>
++ <icon name="keepass"/>
++ </mime-type>
++</mime-info>
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
new file mode 100644
index 0000000..424385c
--- /dev/null
+++ b/keepass-fix-XSL-search-path.patch
@@ -0,0 +1,27 @@
+diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
+--- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
++++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
+@@ -33,6 +33,8 @@
+ {
+ public static class AppDefs
+ {
++ public const string DataDir = "/usr/share/keepass/";
++
+ public static readonly Color ColorControlNormal = SystemColors.Window;
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
+diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
+--- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
++++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
+@@ -133,7 +133,7 @@
+ m_lvComponents.Columns.Add(strValueColumn, 100);
+
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = AppDefs.DataDir;
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
new file mode 100644
index 0000000..199c0e1
--- /dev/null
+++ b/keepass.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
+<component type="desktop">
+ <id>keepass.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>KeePass</name>
+ <summary>Password manager</summary>
+ <project_license>GPL-2.0+</project_license>
+ <developer_name>Dominik Reichl</developer_name>
+ <description>
+ <p>
+ KeePass is a free open source password manager, which helps you to
+ remember your passwords securely. You can put all your
+ passwords in one database, which is locked with one master key or a
+ key file. You only have to remember one single master password or
+ select the key file to unlock the whole database.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot height="351" width="624" type="default">
+ <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
+ <caption>KeePass showing the example database</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://keepass.info/</url>
+ <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
+ <url type="translate">http://keepass.info/translations_devinfo.html</url>
+ <url type="donation">http://keepass.info/donate.html</url>
+ <url type="help">http://keepass.info/help/base/index.html</url>
+ <update_contact>appdata(a)mavit.org.uk</update_contact>
+</component>
diff --git a/keepass.spec b/keepass.spec
new file mode 100644
index 0000000..ea2bf3a
--- /dev/null
+++ b/keepass.spec
@@ -0,0 +1,112 @@
+Name: keepass
+Version: 2.50
+Release: %autorelease
+Summary: Password manager
+
+License: GPLv2+
+URL: https://keepass.info/
+
+# Created with, e.g.:
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+Source0: %{name}-%version.tar.xz
+Source1: %{name}.appdata.xml
+
+# Upstream does not include a .desktop file, etc..
+Patch0: keepass-desktop-integration.patch
+
+# Move XSL files to /usr/share/keepass:
+Patch1: keepass-fix-XSL-search-path.patch
+
+ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
+BuildRequires: ImageMagick
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+BuildRequires: libgdiplus-devel
+BuildRequires: mono-devel
+BuildRequires: mono-winforms
+BuildRequires: mono-web
+BuildRequires: xorg-x11-server-Xvfb
+Requires: xdotool xsel hicolor-icon-theme
+Requires: mono-winforms
+Recommends: libargon2
+%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
+Recommends: libgcrypt
+%endif
+
+
+# The debuginfo package would be empty if created.
+%global debug_package %{nil}
+
+
+%description
+KeePass is a free open source password manager, which helps you to
+remember your passwords in a secure way. You can put all your passwords in
+one database, which is locked with one master key or a key file. You
+only have to remember one single master password or select the key file
+to unlock the whole database.
+
+
+%prep
+%autosetup -p1
+
+# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
+find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+
+
+%build
+( cd Build && sh PrepMonoDev.sh )
+find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
+for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
+ xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
+done
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
+
+%install
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
+install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
+install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
+install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
+install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
+install -p dist/%{name} %{buildroot}/%{_bindir}
+sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
+sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+
+%files
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/History.txt
+%doc %{_docdir}/%{name}/License.txt
+%{_bindir}/%{name}
+%{_prefix}/lib/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/appdata/%{name}.appdata.xml
+
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..d5f32bc
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit dc09b6e600c6950d3b485ca3c16eda2dd96252e6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Feb 26 17:27:41 2022 +0000
Don't know how to fix CVE-2022-0725.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ed4c5e7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/keepass-*.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..68cd754
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Don't know how to fix CVE-2022-0725.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
deleted file mode 100644
index 0ee5138..0000000
--- a/keepass-desktop-integration.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
---- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
-diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
---- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
-@@ -0,0 +1,23 @@
-+.TH KEEPASS 1 "Mar 19, 2011"
-+.SH NAME
-+keepass \- password manager
-+.SH SYNOPSIS
-+.B keepass
-+.SH DESCRIPTION
-+\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
-+.SH OPTIONS
-+.TP
-+\fB\-\-auto-type\fP
-+invokes global auto-type
-+.TP
-+\fB\-\-lock-all\fP
-+lock databases of all KeePass instances
-+.TP
-+\fB\-\-unlock-all\fP
-+unlock databases of all KeePass instances
-+.TP
-+\fB\-\-exit-all\fP
-+exit all KeePass instances
-+.SH AUTHOR
-+This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
-+for the Debian project (but may be used by others).
-diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
---- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+Name=KeePass
-+GenericName=Password manager
-+Exec=keepass %u
-+Icon=keepass
-+Terminal=false
-+Type=Application
-+StartupWMClass=keepass2
-+Categories=Utility;
-+MimeType=application/x-keepass2;
-+Keywords=passwords;
-diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
---- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+ <mime-type type="application/x-keepass2">
-+ <comment>KeePass 2 database</comment>
-+ <comment xml:lang="de">KeePass 2 Datenbank</comment>
-+ <glob pattern="*.kdbx"/>
-+ <icon name="keepass"/>
-+ </mime-type>
-+</mime-info>
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
deleted file mode 100644
index 424385c..0000000
--- a/keepass-fix-XSL-search-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
---- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
-+++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
-@@ -33,6 +33,8 @@
- {
- public static class AppDefs
- {
-+ public const string DataDir = "/usr/share/keepass/";
-+
- public static readonly Color ColorControlNormal = SystemColors.Window;
- public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
-Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
-diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
---- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
-+++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
-@@ -133,7 +133,7 @@
- m_lvComponents.Columns.Add(strValueColumn, 100);
-
- string strExe = WinUtil.GetExecutable();
-- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
-+ string strDir = AppDefs.DataDir;
-
- AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
-
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
-Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
deleted file mode 100644
index 199c0e1..0000000
--- a/keepass.appdata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
-<component type="desktop">
- <id>keepass.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <name>KeePass</name>
- <summary>Password manager</summary>
- <project_license>GPL-2.0+</project_license>
- <developer_name>Dominik Reichl</developer_name>
- <description>
- <p>
- KeePass is a free open source password manager, which helps you to
- remember your passwords securely. You can put all your
- passwords in one database, which is locked with one master key or a
- key file. You only have to remember one single master password or
- select the key file to unlock the whole database.
- </p>
- </description>
- <screenshots>
- <screenshot height="351" width="624" type="default">
- <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
- <caption>KeePass showing the example database</caption>
- </screenshot>
- </screenshots>
- <url type="homepage">http://keepass.info/</url>
- <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
- <url type="translate">http://keepass.info/translations_devinfo.html</url>
- <url type="donation">http://keepass.info/donate.html</url>
- <url type="help">http://keepass.info/help/base/index.html</url>
- <update_contact>appdata(a)mavit.org.uk</update_contact>
-</component>
diff --git a/keepass.spec b/keepass.spec
deleted file mode 100644
index ea2bf3a..0000000
--- a/keepass.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-Name: keepass
-Version: 2.50
-Release: %autorelease
-Summary: Password manager
-
-License: GPLv2+
-URL: https://keepass.info/
-
-# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
-Source0: %{name}-%version.tar.xz
-Source1: %{name}.appdata.xml
-
-# Upstream does not include a .desktop file, etc..
-Patch0: keepass-desktop-integration.patch
-
-# Move XSL files to /usr/share/keepass:
-Patch1: keepass-fix-XSL-search-path.patch
-
-ExclusiveArch: %{mono_arches}
-ExcludeArch: armv7hl
-BuildRequires: ImageMagick
-BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
-BuildRequires: libgdiplus-devel
-BuildRequires: mono-devel
-BuildRequires: mono-winforms
-BuildRequires: mono-web
-BuildRequires: xorg-x11-server-Xvfb
-Requires: xdotool xsel hicolor-icon-theme
-Requires: mono-winforms
-Recommends: libargon2
-%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
-Recommends: libgcrypt
-%endif
-
-
-# The debuginfo package would be empty if created.
-%global debug_package %{nil}
-
-
-%description
-KeePass is a free open source password manager, which helps you to
-remember your passwords in a secure way. You can put all your passwords in
-one database, which is locked with one master key or a key file. You
-only have to remember one single master password or select the key file
-to unlock the whole database.
-
-
-%prep
-%autosetup -p1
-
-# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
-find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-
-
-%build
-( cd Build && sh PrepMonoDev.sh )
-find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
-for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
- xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
-done
-xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
-
-%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
-install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
-install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
-install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
-install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
-install -p dist/%{name} %{buildroot}/%{_bindir}
-sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
-sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
-
-
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
-
-
-%files
-%dir %{_docdir}
-%doc %{_docdir}/%{name}/History.txt
-%doc %{_docdir}/%{name}/License.txt
-%{_bindir}/%{name}
-%{_prefix}/lib/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_mandir}/man1/%{name}.1*
-%{_datadir}/appdata/%{name}.appdata.xml
-
-
-%changelog
-%autochangelog
diff --git a/sources b/sources
deleted file mode 100644
index d5f32bc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit 1425aa4b6f1e1f52bb9166aec3886498d57387de
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 22 10:38:50 2022 +0000
Update to version 2.50.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index bcb09cc..424385c 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,23 +1,27 @@
---- a/KeePass/App/AppDefs.cs
-+++ b/KeePass/App/AppDefs.cs
-@@ -32,6 +32,8 @@
+diff -ur keepass-2.50/KeePass/App/AppDefs.cs keepass-2.50-patched/KeePass/App/AppDefs.cs
+--- keepass-2.50/KeePass/App/AppDefs.cs 2022-01-01 17:06:08.000000000 +0000
++++ keepass-2.50-patched/KeePass/App/AppDefs.cs 2022-01-22 10:19:43.552223959 +0000
+@@ -33,6 +33,8 @@
{
public static class AppDefs
{
-+ public const string DebianDataDir = "/usr/share/keepass/";
++ public const string DataDir = "/usr/share/keepass/";
+
public static readonly Color ColorControlNormal = SystemColors.Window;
public static readonly Color ColorControlDisabled = SystemColors.Control;
public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -89,8 +89,7 @@ namespace KeePass.Forms
- m_lvComponents.Items.Add(lvi);
+Only in keepass-2.50-patched/KeePass/App: AppDefs.cs.orig
+diff -ur keepass-2.50/KeePass/Forms/AboutForm.cs keepass-2.50-patched/KeePass/Forms/AboutForm.cs
+--- keepass-2.50/KeePass/Forms/AboutForm.cs 2022-01-01 17:06:12.000000000 +0000
++++ keepass-2.50-patched/KeePass/Forms/AboutForm.cs 2022-01-22 10:27:13.049330394 +0000
+@@ -133,7 +133,7 @@
+ m_lvComponents.Columns.Add(strValueColumn, 100);
- lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
-- string strPath = WinUtil.GetExecutable();
-- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+ string strPath = AppDefs.DebianDataDir;
- strPath += AppDefs.XslFilesDir;
- strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = AppDefs.DataDir;
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.orig
+Only in keepass-2.50-patched/KeePass/Forms: AboutForm.cs.rej
diff --git a/keepass.spec b/keepass.spec
index 1513163..ea2bf3a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.49
-Release: 2%{?dist}
+Version: 2.50
+Release: %autorelease
Summary: Password manager
License: GPLv2+
@@ -29,6 +29,7 @@ BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
+Recommends: libargon2
%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
Recommends: libgcrypt
%endif
@@ -108,233 +109,4 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.49-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
-- Update to version 2.49.
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
-- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
-
-* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
-- Update to version 2.48.1.
-
-* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
-- Update to version 2.48.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
-- Update to version 2.47.
-
-* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
-- Exclude from armv7hl, where this doesn't currently build.
-
-* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
-- Update to version 2.46.
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
-- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
-
-* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
-- Update to version 2.45.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
-- Update to version 2.44.
-
-* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
-- Update to version 2.43.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
-- Always build against latest available Mono framework version.
-
-* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
-- Update to version 2.42.1.
-
-* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
-- Update to version 2.42.
-
-* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
-- Build against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
-- Require mono-winforms. Works around #1700892.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
-- Update to version 2.41.
-
-* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
-- Update to version 2.40.
-- Drop keepass-doc subpackage, since we need Python 2 to build it.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
-- Update to version 2.39.1.
-
-* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
-- Update to version 2.39.
-- Suggest documentation.
-
-* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
-- Correct directory owning.
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
-- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
-
-* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
-- Update to version 2.38.
-
-* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
-- Update to version 2.37.
-- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
- respectively).
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
-- Update to version 2.36.
-
-* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
-- Workaround for crash when pressing Super key. Fixes #1424852.
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
-- Update to 2.35.
-
-* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
-- Validate appdata.
-
-* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
-- mono rebuild for aarch64 support
-
-* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
-- Update to version 2.34.
-
-* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
-- Update AppStream XML.
-- Remove scriptlets replaced by triggers in Fedora 24.
-- Remove scriptlets replaced by triggers in Fedora 25.
-
-* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
-- Update to version 2.33.
-
-* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
-- Remove now-unneeded workaround for BOM-handling bug in grep.
-
-* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
-- Update to version 2.32.
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
-- Update to version 2.31.
-
-* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
-- Add keyword to .desktop file.
-
-* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
-- Remove workaround for #1251756, which is now fixed.
-
-* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
-- Ensure .png files are repacked into .bin files at build time.
-- Work around missing icons. Fixes #1276843.
-
-* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
-- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
-
-* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
-- Add workaround for #1251756.
-
-* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
-- Update to 2.30. Fixes #1222120.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
-- Update to 2.29
-- Rebuild (mono4)
-
-* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
-- switch to ExclusiveArch, but seems FTBFS even on x86_64
-
-* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
-- update mime scriptlets
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
-- Update to version 2.27.
-
-* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
-- Add missing %%u to Exec line in .desktop.
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
-- Mono crashes on ARM builders, so exclude that architecture.
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
-- Depend on hicolor-icon-theme.
-- The "%%{__python2}" macro requires python-devel.
-
-* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
-- Use "*" rather than ".gz" as the man page suffix, in case the
- compression format changes.
-- Use "doc" rather than "-n %%{name}-doc" in subpackages.
-- Use "%%{__python2}" macro.
-
-* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
-- Install .desktop file via desktop-file-install.
-- Don't recreate the build-root.
-- Own documentation directory.
-- Own icon and mime directories.
-- Make the -doc subpackage noarch.
-- Preserve timestamps when installing files.
-
-* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-3
-- Reliable clipboard handling requires xsel.
-
-* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-2
-- Build a documentation subpackage.
-- For auto-type, xdotool is required.
-- Include an AppData file.
-
-* Fri Apr 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-1
-- New package, based in part on the Debian package.
+%autochangelog
diff --git a/sources b/sources
index 37f4500..d5f32bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.49.tar.xz) = 067aa9d089501abaa5f6a2b55e3f96044ef9f6872ea11faa812310bfbe295fa73f283e0b34dc63cc572717dcdd75024f6bf247796b1acb24e2af2af158f7df59
+SHA512 (keepass-2.50.tar.xz) = af8e1309261ac5721f641d0ed3afe5fea770a56394b4eb752a52e9d321ca1fc308049b8f7d9fdc0f509d2aa2dbfdce1ba2b726483effcc62c03528847532ad20
commit 70449e5638da5b4c365f24c6b51339fac8f4c77b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 14:24:54 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 6f78d62..1513163 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.49-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
- Update to version 2.49.
commit 6ab63053e9c6e125a0e1604c91662b69b673c6b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Sep 19 19:39:13 2021 +0100
Update to version 2.49.
diff --git a/keepass.spec b/keepass.spec
index 95e81b1..6f78d62 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.48.1
-Release: 3%{?dist}
+Version: 2.49
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Sep 19 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.49-1
+- Update to version 2.49.
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 057a14c..37f4500 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.48.1.tar.xz) = e11867aa7051784c01965303da6b94abac27876b6d0b1d4cbbea03fbabc44a068efcab15d5e22cc887ca2fb926aab2c466026bfe7aff0fab3037d01fc034d124
+SHA512 (keepass-2.49.tar.xz) = 067aa9d089501abaa5f6a2b55e3f96044ef9f6872ea11faa812310bfbe295fa73f283e0b34dc63cc572717dcdd75024f6bf247796b1acb24e2af2af158f7df59
commit e634826ec0fd5b5726701862e2f9b5456bb68632
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 09:41:14 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 73d9c02..95e81b1 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.48.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.48.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
commit 1d05ef3523583d48bb9699631ef0d1a665a6e0cc
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 18 12:13:32 2021 +0100
Create directory /usr/lib/keepass/Languages
Fixes error with View -> Change Language... -> Open Folder.
diff --git a/keepass.spec b/keepass.spec
index 99ae338..73d9c02 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.48.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -63,7 +63,7 @@ done
xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_prefix}/lib/%{name}/Languages %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 18 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-2
+- Create directory /usr/lib/keepass/Languages. Fixes error with View -> Change Language... -> Open Folder.
+
* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
- Update to version 2.48.1.
commit cb75269a9550486de99ab742ec642d9300401e98
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 11 11:02:59 2021 +0100
Update to version 2.48.1.
diff --git a/keepass.spec b/keepass.spec
index 0ff1286..99ae338 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.48
-Release: 2%{?dist}
+Version: 2.48.1
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 11 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48.1-1
+- Update to version 2.48.1.
+
* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
- Update to version 2.48.
diff --git a/sources b/sources
index 92e937f..057a14c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.48.tar.xz) = 535c922a93a4fed277f03092ed9b26ea4fa42f5c3f3df11b80160b780994a287d7063713d791f5b13ba55dc361df4105c39b31f8df120e872cb3c25466478ee6
+SHA512 (keepass-2.48.1.tar.xz) = e11867aa7051784c01965303da6b94abac27876b6d0b1d4cbbea03fbabc44a068efcab15d5e22cc887ca2fb926aab2c466026bfe7aff0fab3037d01fc034d124
commit 052ffc0ac10cc569c0623b18c69d32c208949f63
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri May 7 17:11:12 2021 +0100
Update to version 2.48.
diff --git a/keepass.spec b/keepass.spec
index 27e6de5..0ff1286 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.47
+Version: 2.48
Release: 2%{?dist}
Summary: Password manager
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri May 7 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.48-2
+- Update to version 2.48.
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e579d2f..92e937f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.47.tar.xz) = 328d6c5075422a5f474fce430da3927f8a59040bb1474cc32cfbe9f546a05f1621c35f5389578373375f0a00bbe693f1f56036b08756a42a8e4e0c39397dc838
+SHA512 (keepass-2.48.tar.xz) = 535c922a93a4fed277f03092ed9b26ea4fa42f5c3f3df11b80160b780994a287d7063713d791f5b13ba55dc361df4105c39b31f8df120e872cb3c25466478ee6
commit fcd1eb15524000cd6ec83d47a89e4e3118f5aa33
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 15:26:56 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 283f864..27e6de5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.47
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.47-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
- Update to version 2.47.
commit cc1acf9d5a6699686312cb66a367c37e0a9b2996
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 9 20:34:11 2021 +0000
Update to version 2.47.
diff --git a/keepass.spec b/keepass.spec
index 26eb71d..283f864 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.46
-Release: 2%{?dist}
+Version: 2.47
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat Jan 9 2021 Peter Oliver <rpm(a)mavit.org.uk> - 2.47-1
+- Update to version 2.47.
+
* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
- Exclude from armv7hl, where this doesn't currently build.
diff --git a/sources b/sources
index 62133ee..e579d2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.46.tar.xz) = 37ce998ff9ae28a2d2db5d069d385cdd1d84ae7383c4e80a1f3c4116ed7419423c04eecb966397ea4e8cd9436ae6be2dd64930a05c4c558165967bc8457f0b90
+SHA512 (keepass-2.47.tar.xz) = 328d6c5075422a5f474fce430da3927f8a59040bb1474cc32cfbe9f546a05f1621c35f5389578373375f0a00bbe693f1f56036b08756a42a8e4e0c39397dc838
commit c9027ed418dbfc9cea660529e6b5d2f208e791a0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Sep 17 13:40:30 2020 +0100
Exclude from armv7hl, where this doesn't currently build.
diff --git a/keepass.spec b/keepass.spec
index 5dc4be6..26eb71d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.46
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -18,6 +18,7 @@ Patch0: keepass-desktop-integration.patch
Patch1: keepass-fix-XSL-search-path.patch
ExclusiveArch: %{mono_arches}
+ExcludeArch: armv7hl
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -107,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Sep 17 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-2
+- Exclude from armv7hl, where this doesn't currently build.
+
* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
- Update to version 2.46.
commit 830b8288d1f70d228ea7dfbb62c149ca5e86a16b
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Sep 11 16:19:50 2020 +0100
Update to version 2.46.
diff --git a/keepass.spec b/keepass.spec
index 0a991d0..5dc4be6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.45
-Release: 3%{?dist}
+Version: 2.46
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri Sep 11 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.46-1
+- Update to version 2.46.
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 5887e0f..62133ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.45.tar.xz) = f319a90732115fface3f0bd8842ca3524f464f22997d1110f21e34ec061fe290fbd67eb754d0368ee44f88ea32f396bf9f630c985f72a2e37b0bfcfe1b209f11
+SHA512 (keepass-2.46.tar.xz) = 37ce998ff9ae28a2d2db5d069d385cdd1d84ae7383c4e80a1f3c4116ed7419423c04eecb966397ea4e8cd9436ae6be2dd64930a05c4c558165967bc8457f0b90
commit 04accb05346d6bb35f743fb295f78ff83a948bce
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 02:59:29 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 0b73ee3..0a991d0 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.45
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.45-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
commit 95fcd76990b0bf06efbf48d8809d5e5a1d8b4536
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Jul 2 17:51:57 2020 +0100
Drop Recommends on gtk2
This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
diff --git a/keepass.spec b/keepass.spec
index c89bf75..0b73ee3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.45
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,7 +29,6 @@ BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
-Recommends: gtk2
Recommends: libgcrypt
%endif
@@ -108,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 2 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-2
+- Drop Recommends on gtk2. This no-longer seems to help nor hinder theming on Fedora 31 (where theming works for me) nor Fedora 32 (where it does not).
+
* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
- Update to version 2.45.
commit 8d346c080ce35d1c25bf49c474f282dd5f65604b
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 9 10:30:48 2020 +0100
Update to version 2.45.
diff --git a/keepass.spec b/keepass.spec
index 12161fb..c89bf75 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.44
-Release: 2%{?dist}
+Version: 2.45
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat May 9 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.45-1
+- Update to version 2.45.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 127ab8d..5887e0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.44.tar.xz) = 46d5ba6f4c42bd570877c5ba4efc69cf0d57499c58ff880d0446f910e67ad379e44d8900cf572f1f2691e8ae39c6d2a9a39109c8fa254ed2dd2b83d6ccb14093
+SHA512 (keepass-2.45.tar.xz) = f319a90732115fface3f0bd8842ca3524f464f22997d1110f21e34ec061fe290fbd67eb754d0368ee44f88ea32f396bf9f630c985f72a2e37b0bfcfe1b209f11
commit 34c9add1b984f2db432188a0b72a3f63e23745b6
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 06:58:48 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 19c6a81..12161fb 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.44-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
- Update to version 2.44.
commit d9a156bb89db31343e4dace4d1ca52af50f0439e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Jan 25 12:54:03 2020 +0000
Update to version 2.44.
diff --git a/keepass.spec b/keepass.spec
index 9e3d96b..19c6a81 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.43
+Version: 2.44
Release: 1%{?dist}
Summary: Password manager
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sat Jan 25 2020 Peter Oliver <rpm(a)mavit.org.uk> - 2.44-1
+- Update to version 2.44.
+
* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
- Update to version 2.43.
diff --git a/sources b/sources
index f0fa783..127ab8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.43.tar.xz) = 12a256d27b6b9f72d73265eee649ce4189018f94bc7457841e6cf82b05976515e03c92210851d71ebd63e1e861506594e786b1ef3d8b174c8fc009b7c1ea749b
+SHA512 (keepass-2.44.tar.xz) = 46d5ba6f4c42bd570877c5ba4efc69cf0d57499c58ff880d0446f910e67ad379e44d8900cf572f1f2691e8ae39c6d2a9a39109c8fa254ed2dd2b83d6ccb14093
commit 91e4117eadafcbb0cd87b2e94a0d1306e4bec65a
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Sep 15 20:27:33 2019 +0100
Update to version 2.43.
diff --git a/keepass.spec b/keepass.spec
index daeb6ad..9e3d96b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.42.1
-Release: 3%{?dist}
+Version: 2.43
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Sep 15 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.43-1
+- Update to version 2.43.
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index c7d8ccd..f0fa783 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.42.1.tar.xz) = b28966e7fdfa330f47242309b78a6821252288e08dd670d2de10c96fb190169fb00e78c5aa3fe21a4254689dc348d1e384f59b2ff2259807bd2b3559cf4e9903
+SHA512 (keepass-2.43.tar.xz) = 12a256d27b6b9f72d73265eee649ce4189018f94bc7457841e6cf82b05976515e03c92210851d71ebd63e1e861506594e786b1ef3d8b174c8fc009b7c1ea749b
commit 3d51b26566cc045e12307b9d174ffae17933713a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 11:21:43 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 40f5257..daeb6ad 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.42.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.42.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
- Always build against latest available Mono framework version.
commit e341b5e353b33b078d7ef94dd79ed1ed34e6b29a
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jun 25 13:30:00 2019 +0100
Use Recommends header only where available.
diff --git a/keepass.spec b/keepass.spec
index a72af89..40f5257 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -28,8 +28,10 @@ BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Requires: mono-winforms
+%if 0%{?fedora} >=24 || 0%{?rhel} >= 8
Recommends: gtk2
Recommends: libgcrypt
+%endif
# The debuginfo package would be empty if created.
commit 95a60b22c7e264fd36a821328e75bd013aa811dc
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jun 25 13:07:16 2019 +0100
Drop unused file keepass-enable-local-help.patch.
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
deleted file mode 100644
index 57c7f7a..0000000
--- a/keepass-enable-local-help.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur /tmp/keepass-2.39/KeePass/App/AppHelp.cs ./KeePass/App/AppHelp.cs
---- /tmp/keepass-2.39/KeePass/App/AppHelp.cs 2018-04-13 14:55:18.000000000 +0100
-+++ ./KeePass/App/AppHelp.cs 2018-05-07 09:50:23.881108244 +0100
-@@ -58,7 +58,7 @@
- {
- if(m_strLocalHelpFile == null) return false;
-
-- try { return File.Exists(m_strLocalHelpFile); }
-+ try { return Directory.Exists(@"/usr/share/doc/keepass/Chm/help/"); }
- catch(Exception) { }
- return false;
- }
-@@ -115,13 +115,12 @@
- {
- Debug.Assert(m_strLocalHelpFile != null);
-
-- // Unblock CHM file for proper display of help contents
-- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
--
-- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
-+ string strCmd = "/usr/share/doc/keepass/Chm/help/";
-
- if(strTopic != null)
-- strCmd += "::/help/" + strTopic + ".html";
-+ strCmd += strTopic + ".html";
-+ else
-+ strCmd += "../index.html";
-
- if(strSection != null)
- {
-@@ -129,16 +128,14 @@
- strCmd += "#" + strSection;
- }
-
-- strCmd += "\"";
--
- try
- {
-- Process p = Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd);
-+ Process p = Process.Start(strCmd);
- if(p != null) p.Dispose();
- }
- catch(Exception ex)
- {
-- MessageService.ShowWarning("HH.exe " + strCmd, ex);
-+ MessageService.ShowWarning(strCmd, ex);
- }
- }
-
commit 32c3601cebacab3ca1b6e29f9d22c9fa4ea4ca6d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed May 8 00:10:50 2019 +0100
Always build against latest available Mono framework version.
diff --git a/keepass.spec b/keepass.spec
index a4851f7..a72af89 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.42.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -54,12 +54,11 @@ find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
%build
( cd Build && sh PrepMonoDev.sh )
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
-xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
-
+xbuild /target:KeePass /property:TargetFrameworkVersion=v$(ls -d /usr/lib/mono/*-api | cut -d/ -f5 | cut -d- -f1 | sort -Vr | head -1) /property:Configuration=Release
%install
install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
@@ -107,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-2
+- Always build against latest available Mono framework version.
+
* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
- Update to version 2.42.1.
commit f66a7aa4ccb5d1ad38609568f4f2920fce573ab5
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 7 16:47:58 2019 +0100
Update to version 2.42.1.
diff --git a/keepass.spec b/keepass.spec
index fd2cf53..a4851f7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.42
+Version: 2.42.1
Release: 1%{?dist}
Summary: Password manager
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue May 7 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42.1-1
+- Update to version 2.42.1.
+
* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
- Update to version 2.42.
diff --git a/sources b/sources
index 439ca1f..c7d8ccd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.42.tar.xz) = c085d20c56efd2201aa5e3988a6d1b0f3419fd8b321b59fdf5aef3088b62172a054b374ac719ab450b3db5c83825ab43d8674d83172004a57efc4ae3fec0cd11
+SHA512 (keepass-2.42.1.tar.xz) = b28966e7fdfa330f47242309b78a6821252288e08dd670d2de10c96fb190169fb00e78c5aa3fe21a4254689dc348d1e384f59b2ff2259807bd2b3559cf4e9903
commit 9d6e211743fbee815a8482dc4a0c11e4ac7aed78
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 2 00:30:50 2019 +0100
Update to version 2.42.
diff --git a/keepass.spec b/keepass.spec
index de00d81..fd2cf53 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.41
-Release: 3%{?dist}
+Version: 2.42
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,8 +107,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Thu May 2 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.42-1
+- Update to version 2.42.
+
* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
-- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+- Build against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
- Require mono-winforms. Works around #1700892.
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
diff --git a/sources b/sources
index 515b834..439ca1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.41.tar.xz) = aa4cbc720c3dc05492e3ce1977492b28455bcdc7cd61ed143021544146d9d767e401ed76f045ffbbb28e377b404af123ca9e43be4756f7823b289416bb15eaab
+SHA512 (keepass-2.42.tar.xz) = c085d20c56efd2201aa5e3988a6d1b0f3419fd8b321b59fdf5aef3088b62172a054b374ac719ab450b3db5c83825ab43d8674d83172004a57efc4ae3fec0cd11
commit 3df721047974daa66a00618f4710c75accf2e162
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Apr 29 00:40:00 2019 +0100
Require mono-winforms.
Works around #1700892.
diff --git a/keepass.spec b/keepass.spec
index cab67f2..de00d81 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -27,6 +27,7 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
+Requires: mono-winforms
Recommends: gtk2
Recommends: libgcrypt
@@ -108,6 +109,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+- Require mono-winforms. Works around #1700892.
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 10437aa2ecb9098dd1d3c8c47b7fc16eb0614eb9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Apr 29 00:37:58 2019 +0100
Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
diff --git a/keepass.spec b/keepass.spec
index f072be4..cab67f2 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.41
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -53,12 +53,11 @@ find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
%build
( cd Build && sh PrepMonoDev.sh )
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
-find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
-xbuild /target:KeePass /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
-xbuild /target:KeePass /property:Configuration=Release
+xbuild /target:KeePass /property:TargetFrameworkVersion=v4.7.1 /property:Configuration=Release
%install
@@ -107,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Mon Apr 29 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-3
+- Build against against framework version 4.7.1 for Mono 5.18. Fixes #1680388.
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 185ad448a3826e478e94135a7a9d83547a66e547
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 05:19:13 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 1cc0f53..f072be4 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.41
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
- Update to version 2.41.
commit eb6741be7d30f22766316955534f4b849d533589
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Jan 13 17:23:18 2019 +0000
Update to version 2.41.
diff --git a/keepass.spec b/keepass.spec
index 2db35c9..1cc0f53 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.40
+Version: 2.41
Release: 1%{?dist}
Summary: Password manager
@@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Sun Jan 13 2019 Peter Oliver <rpm(a)mavit.org.uk> - 2.41-1
+- Update to version 2.41.
+
* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
- Update to version 2.40.
- Drop keepass-doc subpackage, since we need Python 2 to build it.
diff --git a/sources b/sources
index c6e34e6..515b834 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.40.tar.xz) = acd4fa94b668130fc512343632519270446a4bb14aea248ce1608805b4b819476ddddcc525a6769c147348e264963bda331001d7348f854611d08510018d5395
+SHA512 (keepass-2.41.tar.xz) = aa4cbc720c3dc05492e3ce1977492b28455bcdc7cd61ed143021544146d9d767e401ed76f045ffbbb28e377b404af123ca9e43be4756f7823b289416bb15eaab
commit 8835566ff142f50579a78c42385ce42dee0d637c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Sep 22 12:50:26 2018 +0100
Update to version 2.40
Drop keepass-doc subpackage, since we need Python 2 to build it.
diff --git a/keepass.spec b/keepass.spec
index d57039e..2db35c9 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.39.1
-Release: 2%{?dist}
+Version: 2.40
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -17,24 +17,18 @@ Patch0: keepass-desktop-integration.patch
# Move XSL files to /usr/share/keepass:
Patch1: keepass-fix-XSL-search-path.patch
-# Locate locally-installed help files:
-Patch2: keepass-enable-local-help.patch
-
ExclusiveArch: %{mono_arches}
BuildRequires: ImageMagick
-BuildRequires: archmage
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
-BuildRequires: python2-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
Recommends: libgcrypt
-Suggests: keepass-doc
# The debuginfo package would be empty if created.
@@ -65,7 +59,6 @@ for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
done
xbuild /target:KeePass /property:Configuration=Release
-%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
%install
@@ -86,7 +79,6 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
-cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%check
@@ -114,20 +106,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/%{name}.appdata.xml
-%package doc
-Summary: Documentation for the KeePass password manager
-BuildArch: noarch
-Recommends: keepass
-
-%description doc
-Documentation for KeePass, a free open source password manager.
-
-%files doc
-%dir %{_docdir}
-%doc %{_docdir}/%{name}/Chm/
-
-
%changelog
+* Thu Sep 20 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.40-1
+- Update to version 2.40.
+- Drop keepass-doc subpackage, since we need Python 2 to build it.
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index a1bf4a1..c6e34e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.39.1.tar.xz) = 8aef18ace04bc633e565069215801b43eb6ce63eff693eff941d2d7ad8e6b026b8d469fcbbe897bb099ffb86d36197f76b6829a90951090e678754d80fd8d513
+SHA512 (keepass-2.40.tar.xz) = acd4fa94b668130fc512343632519270446a4bb14aea248ce1608805b4b819476ddddcc525a6769c147348e264963bda331001d7348f854611d08510018d5395
commit 6d5d8ed92cfe77550da79a164ad8455d96d883ec
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 06:59:01 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 46e622a..d57039e 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.39.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -128,6 +128,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
- Update to version 2.39.1.
commit 49d72b89654643547cec89f4cbb4d1f262da593c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun May 13 11:30:08 2018 +0100
Update to version 2.39.1.
diff --git a/keepass.spec b/keepass.spec
index 03e1095..46e622a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.39
+Version: 2.39.1
Release: 1%{?dist}
Summary: Password manager
@@ -128,6 +128,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun May 13 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39.1-1
+- Update to version 2.39.1.
+
* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
- Update to version 2.39.
- Suggest documentation.
diff --git a/sources b/sources
index a407889..a1bf4a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.39.tar.xz) = 9dc7f18fb1a897fb564f7797258f004f001d8bd6249348e9bbd10825a7d7235fc81b13e41294a74da50b9d31641266ec7a78f9a910ff6d0e9163340cc7c7945e
+SHA512 (keepass-2.39.1.tar.xz) = 8aef18ace04bc633e565069215801b43eb6ce63eff693eff941d2d7ad8e6b026b8d469fcbbe897bb099ffb86d36197f76b6829a90951090e678754d80fd8d513
commit 7ab2d3c4c19482d0100ddee26ee8de94e82248c6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 8 23:19:22 2018 +0100
Suggest documentation.
diff --git a/keepass.spec b/keepass.spec
index 85d6ca7..03e1095 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -34,6 +34,7 @@ BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
Recommends: libgcrypt
+Suggests: keepass-doc
# The debuginfo package would be empty if created.
@@ -116,6 +117,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%package doc
Summary: Documentation for the KeePass password manager
BuildArch: noarch
+Recommends: keepass
%description doc
Documentation for KeePass, a free open source password manager.
@@ -128,6 +130,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
- Update to version 2.39.
+- Suggest documentation.
* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
- Correct directory owning.
commit 29db0cae58e0ebef6cbbcc7df25b12c3e4fd25b7
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue May 8 23:07:52 2018 +0100
Update to version 2.39.
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
index bd6c67f..57c7f7a 100644
--- a/keepass-enable-local-help.patch
+++ b/keepass-enable-local-help.patch
@@ -1,17 +1,7 @@
-From: Julian Taylor <jtaylor.debian(a)googlemail.com>
-Date: Tue, 12 Jul 2011 21:51:43 +0200
-Subject: enable local help
-
-disable windows chm viewer and use x-www-browser to view docs
-located as html files in "/usr/share/doc/keepass2/Chm/help/"
-Forwarded: not-needed
----
- KeePass/App/AppHelp.cs | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
---- a/KeePass/App/AppHelp.cs
-+++ b/KeePass/App/AppHelp.cs
-@@ -58,7 +58,7 @@ namespace KeePass.App
+diff -ur /tmp/keepass-2.39/KeePass/App/AppHelp.cs ./KeePass/App/AppHelp.cs
+--- /tmp/keepass-2.39/KeePass/App/AppHelp.cs 2018-04-13 14:55:18.000000000 +0100
++++ ./KeePass/App/AppHelp.cs 2018-05-07 09:50:23.881108244 +0100
+@@ -58,7 +58,7 @@
{
if(m_strLocalHelpFile == null) return false;
@@ -20,38 +10,40 @@ Forwarded: not-needed
catch(Exception) { }
return false;
}
-@@ -114,14 +114,13 @@ namespace KeePass.App
- private static void ShowHelpLocal(string strTopic, string strSection)
+@@ -115,13 +115,12 @@
{
Debug.Assert(m_strLocalHelpFile != null);
--
+
- // Unblock CHM file for proper display of help contents
- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
-
- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
-+
-+ string strCmd = @"/usr/share/doc/keepass/Chm/help/";
++ string strCmd = "/usr/share/doc/keepass/Chm/help/";
if(strTopic != null)
-- strCmd += @"::/help/" + strTopic + ".html";
+- strCmd += "::/help/" + strTopic + ".html";
+ strCmd += strTopic + ".html";
-+ else
-+ strCmd += @"../index.html";
++ else
++ strCmd += "../index.html";
if(strSection != null)
{
-@@ -129,12 +128,10 @@ namespace KeePass.App
- strCmd += @"#" + strSection;
+@@ -129,16 +128,14 @@
+ strCmd += "#" + strSection;
}
- strCmd += "\"";
-
-- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
-+ try { Process.Start("x-www-browser", strCmd); }
- catch(Exception exStart)
+ try
+ {
+- Process p = Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd);
++ Process p = Process.Start(strCmd);
+ if(p != null) p.Dispose();
+ }
+ catch(Exception ex)
{
-- MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);
-+ MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);
+- MessageService.ShowWarning("HH.exe " + strCmd, ex);
++ MessageService.ShowWarning(strCmd, ex);
}
}
diff --git a/keepass.spec b/keepass.spec
index 7e630a5..85d6ca7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.38
-Release: 6%{?dist}
+Version: 2.39
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun May 6 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.39-1
+- Update to version 2.39.
+
* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
- Correct directory owning.
diff --git a/sources b/sources
index a723eef..a407889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.38.tar.xz) = f70c08e3af66c17cea603f1707bbdcc6fee1fd25c9078dfc1aaa5c1ca5de1b146f49169bd15a5e13a9c63b36b3b59069b93f45fc45777eb0b4dd8542ba2e8093
+SHA512 (keepass-2.39.tar.xz) = 9dc7f18fb1a897fb564f7797258f004f001d8bd6249348e9bbd10825a7d7235fc81b13e41294a74da50b9d31641266ec7a78f9a910ff6d0e9163340cc7c7945e
commit 6724e6cfab19db1c705c8e04ea7c83b82be361ad
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Mar 27 17:05:25 2018 +0100
Bump revision.
diff --git a/keepass.spec b/keepass.spec
index d5da034..7e630a5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Mar 19 2018 Vasiliy Glazov <vascom(a)fedoraproject.org> - 2.38-6
+- Correct directory owning.
+
* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
commit 0d0c217927ab0b3a7490c074a4f6fc42f763b07d
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Mon Mar 19 13:34:15 2018 +0000
Correct directory owning
Directory /usr/share/mime should be owned only by shared-mime-info package.
diff --git a/keepass.spec b/keepass.spec
index e707dbd..d5da034 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -101,7 +101,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_prefix}/lib/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime
+%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
commit e91a91ddbe17b9a1b19ae4f66f321c5eed766300
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Thu Mar 15 05:49:58 2018 +0100
Update Python 2 dependency declarations to new packaging standards
diff --git a/keepass.spec b/keepass.spec
index 9e2393a..e707dbd 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,7 +29,7 @@ BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
-BuildRequires: python-devel
+BuildRequires: python2-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
Recommends: gtk2
@@ -126,6 +126,10 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Mar 15 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.38-5
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
- Escape macros in %%changelog
commit 92a09dd059d0d5f6f4a6c5acc24da87f5c10c115
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 9 09:04:51 2018 +0100
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 908df01..9e2393a 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.38-4
+- Escape macros in %%changelog
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -226,7 +229,7 @@ Documentation for KeePass, a free open source password manager.
- Update to version 2.27.
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
-- Add missing %u to Exec line in .desktop.
+- Add missing %%u to Exec line in .desktop.
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -236,13 +239,13 @@ Documentation for KeePass, a free open source password manager.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
-- The "%{__python2}" macro requires python-devel.
+- The "%%{__python2}" macro requires python-devel.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
-- Use "doc" rather than "-n %{name}-doc" in subpackages.
-- Use "%{__python2}" macro.
+- Use "doc" rather than "-n %%{name}-doc" in subpackages.
+- Use "%%{__python2}" macro.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit 14743d02c67893f9e027945df4adcfdb5cfd9fdf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 19:52:47 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/keepass.spec b/keepass.spec
index 34358c3..908df01 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -126,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.38-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
commit 5a012b29a7c93ff89daaba119acc366e43cc35fe
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 6 17:47:57 2018 +0000
Update URL.
diff --git a/keepass.spec b/keepass.spec
index fd59515..34358c3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -4,7 +4,7 @@ Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
-URL: http://keepass.info/
+URL: https://keepass.info/
# Created with, e.g.:
# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
commit 3250cec73c6e513ddeb10f70d7cf0d4caa039eaf
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed Jan 31 15:19:44 2018 +0000
Remove icon cache scriptlets, to keep up with latest packaging guidelines.
diff --git a/keepass.spec b/keepass.spec
index 0e1b009..fd59515 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.38
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -113,21 +113,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/%{name}.appdata.xml
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%package doc
Summary: Documentation for the KeePass password manager
BuildArch: noarch
@@ -141,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jan 31 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-2
+- Remove icon cache scriptlets, to keep up with latest packaging guidelines.
+
* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
- Update to version 2.38.
commit a80a95760c9d13374afa0c2ce98055cd02627f0d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Wed Jan 10 13:11:05 2018 +0000
Update to version 2.38.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index a221f2f..bcb09cc 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,14 +1,14 @@
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
-@@ -36,6 +36,8 @@ namespace KeePass.App
- public static readonly Color ColorQualityLow = Color.FromArgb(255, 128, 0);
- public static readonly Color ColorQualityHigh = Color.FromArgb(0, 255, 0);
-
-+ public const string DebianDataDir = "/usr/share/keepass/";
+@@ -32,6 +32,8 @@
+ {
+ public static class AppDefs
+ {
++ public const string DebianDataDir = "/usr/share/keepass/";
+
- public const string XslFilesDir = "XSL";
- public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
- public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
+ public static readonly Color ColorControlNormal = SystemColors.Window;
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -89,8 +89,7 @@ namespace KeePass.Forms
diff --git a/keepass.spec b/keepass.spec
index 44206b5..0e1b009 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.37
+Version: 2.38
Release: 1%{?dist}
Summary: Password manager
@@ -141,6 +141,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jan 10 2018 Peter Oliver <rpm(a)mavit.org.uk> - 2.38-1
+- Update to version 2.38.
+
* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
- Update to version 2.37.
- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
diff --git a/sources b/sources
index 8e3f1dc..a723eef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.37.tar.xz) = 60d40b6e708e54cc7629402a45c17dae7106b775c8799aca6273612476ce64a234fa692b978e16bc8094dfe93c6b628046dcc0ae2df5d8aeb4181bc6e428aad2
+SHA512 (keepass-2.38.tar.xz) = f70c08e3af66c17cea603f1707bbdcc6fee1fd25c9078dfc1aaa5c1ca5de1b146f49169bd15a5e13a9c63b36b3b59069b93f45fc45777eb0b4dd8542ba2e8093
commit 1e72101f077214f379ad05022bf679cedc5f58db
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Oct 14 23:14:25 2017 +0100
Recommend gtk2 and libgcrypt packages
For theming and key derivation, respectively.
diff --git a/keepass.spec b/keepass.spec
index b4f52ce..44206b5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -32,6 +32,8 @@ BuildRequires: mono-web
BuildRequires: python-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
+Recommends: gtk2
+Recommends: libgcrypt
# The debuginfo package would be empty if created.
@@ -141,6 +143,8 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
- Update to version 2.37.
+- Recommend gtk2 and libgcrypt packages (for theming and key derivation,
+ respectively).
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 92fe5ed6be36e58cdae96550fe1f47a04c178226
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat Oct 14 22:59:20 2017 +0100
Update to version 2.37.
diff --git a/keepass.spec b/keepass.spec
index 39b5228..b4f52ce 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,13 +1,13 @@
Name: keepass
-Version: 2.36
-Release: 3%{?dist}
+Version: 2.37
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO https://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
Source1: %{name}.appdata.xml
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Oct 14 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.37-1
+- Update to version 2.37.
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/sources b/sources
index 6c469f4..8e3f1dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.36.tar.xz) = 53921b5ac747da886322f0b869f7f36b10ff098b8ad000be42f6126df6db1e2c391bb875b7c9497f0b7085edb4e597a2ddc1a02764f2836c5155a62fd6b78586
+SHA512 (keepass-2.37.tar.xz) = 60d40b6e708e54cc7629402a45c17dae7106b775c8799aca6273612476ce64a234fa692b978e16bc8094dfe93c6b628046dcc0ae2df5d8aeb4181bc6e428aad2
commit 56cfbaa99637ff54da156bdc67270e99f083d91a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 00:20:02 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index e4403b5..39b5228 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.36
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit c02d0c565a46162a579e0e398d5bc5683e904f7f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 15:07:56 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 3422f4f..e4403b5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.36
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
- Update to version 2.36.
commit 7ec1f54dc66ab59e51b9479464a2f98aea7961b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Jun 12 21:49:53 2017 +0100
Update to version 2.36.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index 949aa5c..a221f2f 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,8 +1,8 @@
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
- public static readonly Color ColorControlDisabled = SystemColors.Control;
- public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+ public static readonly Color ColorQualityLow = Color.FromArgb(255, 128, 0);
+ public static readonly Color ColorQualityHigh = Color.FromArgb(0, 255, 0);
+ public const string DebianDataDir = "/usr/share/keepass/";
+
diff --git a/keepass.spec b/keepass.spec
index 84fed0f..3422f4f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.35
-Release: 3%{?dist}
+Version: 2.36
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Jun 12 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.36-1
+- Update to version 2.36.
+
* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
- Workaround for crash when pressing Super key. Fixes #1424852.
diff --git a/sources b/sources
index 4fc91a1..6c469f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepass-2.35.tar.xz) = 50d518bd957009182ac2c9075cb1ea466877193ffc82ec1761c7228d50fd9e3b8162a05608eb199bd9ea7a5ed7b904c761ee53fcb3af638f47249e2988fb6801
+SHA512 (keepass-2.36.tar.xz) = 53921b5ac747da886322f0b869f7f36b10ff098b8ad000be42f6126df6db1e2c391bb875b7c9497f0b7085edb4e597a2ddc1a02764f2836c5155a62fd6b78586
commit cf044982308e827a8c956bca453e5c20bb7c4317
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 21 19:29:04 2017 +0000
Remember to bump release number.
diff --git a/keepass.spec b/keepass.spec
index c901bc0..84fed0f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.35
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,7 +139,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
-* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-2
+* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-3
- Workaround for crash when pressing Super key. Fixes #1424852.
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
commit 14070dac9bb4d663250acce537a3a480bf83dff8
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Feb 21 19:02:18 2017 +0000
Workaround for crash when pressing Super key. Fixes #1424852.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index d154acd..0ee5138 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -4,7 +4,7 @@ diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
@@ -0,0 +1,3 @@
+#!/bin/sh
+
-+exec /usr/bin/mono /usr/lib/keepass/KeePass.exe "$@"
++exec /usr/bin/mono --verify-all /usr/lib/keepass/KeePass.exe "$@"
diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
diff --git a/keepass.spec b/keepass.spec
index 9a4607b..c901bc0 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Tue Feb 21 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-2
+- Workaround for crash when pressing Super key. Fixes #1424852.
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 9d6e5c869b37c288b55286f0044e88098b52c6d3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 10 17:44:17 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index a47ea2c..9a4607b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.35
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.35-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
- Update to 2.35.
commit 529e7ac8d7ed43c1e5ed52701d00753e03278bb9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jan 20 23:47:37 2017 +0000
Update to 2.35.
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
index eb73bc6..949aa5c 100644
--- a/keepass-fix-XSL-search-path.patch
+++ b/keepass-fix-XSL-search-path.patch
@@ -1,15 +1,3 @@
-From: Debian CLI Applications Team <pkg-cli-apps-team(a)lists.alioth.debian.org>
-Date: Tue, 21 Jun 2011 19:43:31 +0200
-Subject: fix XSL search path
-
-search for XSL files in /usr/share/keepass2
-
-Forwarded: not-needed
----
- KeePass/App/AppDefs.cs | 2 ++
- KeePass/Forms/AboutForm.cs | 3 +--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -19,8 +7,8 @@ Forwarded: not-needed
+ public const string DebianDataDir = "/usr/share/keepass/";
+
public const string XslFilesDir = "XSL";
- public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
- public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
+ public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
+ public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -89,8 +89,7 @@ namespace KeePass.Forms
@@ -32,4 +20,4 @@ Forwarded: not-needed
+ string strPath = AppDefs.DebianDataDir;
strPath += AppDefs.XslFilesDir;
strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
+ bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/keepass.spec b/keepass.spec
index d2d69a6..a47ea2c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.34
-Release: 3%{?dist}
+Version: 2.35
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -68,7 +68,7 @@ xbuild /target:KeePass /property:Configuration=Release
%install
install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
-install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 Ext/XSL/KDBX_Common.xsl Ext/XSL/KDBX_DetailsFull_HTML.xsl Ext/XSL/KDBX_DetailsLight_HTML.xsl Ext/XSL/KDBX_PasswordsOnly_TXT.xsl Ext/XSL/KDBX_Tabular_HTML.xsl %{buildroot}/%{_datadir}/%{name}/XSL
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jan 20 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.35-1
+- Update to 2.35.
+
* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
- Validate appdata.
diff --git a/sources b/sources
index 456c5b4..4fc91a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d939f55fa09e1d973dce43b35dd1373 keepass-2.34.tar.xz
+SHA512 (keepass-2.35.tar.xz) = 50d518bd957009182ac2c9075cb1ea466877193ffc82ec1761c7228d50fd9e3b8162a05608eb199bd9ea7a5ed7b904c761ee53fcb3af638f47249e2988fb6801
commit 6729cc6f1d17df3ab26f4f52e39302c41c43ca94
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jan 20 21:53:18 2017 +0000
Validate appdata.
diff --git a/keepass.spec b/keepass.spec
index 266e8dc..d2d69a6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.34
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -24,6 +24,7 @@ ExclusiveArch: %{mono_arches}
BuildRequires: ImageMagick
BuildRequires: archmage
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
BuildRequires: libgdiplus-devel
BuildRequires: mono-devel
BuildRequires: mono-winforms
@@ -85,6 +86,11 @@ sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+
%files
%dir %{_docdir}
%doc %{_docdir}/%{name}/History.txt
@@ -133,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Jan 7 2017 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-3
+- Validate appdata.
+
* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
- mono rebuild for aarch64 support
commit 990649cf0ca6e9c53f09cee0cd49e38f959b9c7c
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Thu Oct 13 15:46:47 2016 +0100
- mono rebuild for aarch64 support
diff --git a/keepass.spec b/keepass.spec
index e087046..266e8dc 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.34
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -133,6 +133,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Oct 13 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.34-2
+- mono rebuild for aarch64 support
+
* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
- Update to version 2.34.
commit e19c756188e33c09bbaba6d8a258a0c560f98875
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 28 22:33:44 2016 +0100
Fix bad rebase.
diff --git a/keepass.spec b/keepass.spec
index 3005953..e087046 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,14 +1,6 @@
Name: keepass
-<<<<<<< variant A
-Version: 2.33
-Release: 2%{?dist}
->>>>>>> variant B
Version: 2.34
Release: 1%{?dist}
-####### Ancestor
-Version: 2.33
-Release: 1%{?dist}
-======= end
Summary: Password manager
License: GPLv2+
commit 64146d54766352b5b0f0d8612e9bd1b4a1274cc2
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 28 22:25:56 2016 +0100
Update to version 2.34.
diff --git a/keepass.spec b/keepass.spec
index fa1e575..3005953 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,14 @@
Name: keepass
+<<<<<<< variant A
Version: 2.33
Release: 2%{?dist}
+>>>>>>> variant B
+Version: 2.34
+Release: 1%{?dist}
+####### Ancestor
+Version: 2.33
+Release: 1%{?dist}
+======= end
Summary: Password manager
License: GPLv2+
@@ -133,6 +141,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 28 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.34-1
+- Update to version 2.34.
+
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
- Remove scriptlets replaced by triggers in Fedora 24.
diff --git a/sources b/sources
index b649b49..456c5b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e15c3b516d12181b73c3053c3e40323 keepass-2.33.tar.xz
+8d939f55fa09e1d973dce43b35dd1373 keepass-2.34.tar.xz
commit 17d5f8e3a86f11452c24b41c126ec78da2726f1f
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:30:59 2016 +0100
Remove scriptlets replaced by triggers in Fedora 25.
diff --git a/keepass.spec b/keepass.spec
index 31a2db5..fa1e575 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -106,16 +106,13 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
-/usr/bin/update-desktop-database &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
fi
@@ -139,6 +136,7 @@ Documentation for KeePass, a free open source password manager.
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
- Remove scriptlets replaced by triggers in Fedora 24.
+- Remove scriptlets replaced by triggers in Fedora 25.
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit 69d06edd149fa1cd7bb9678744ff3873ea0407f0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:28:46 2016 +0100
Remove scriptlets replaced by triggers in Fedora 24.
diff --git a/keepass.spec b/keepass.spec
index 56e21e7..31a2db5 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -107,7 +107,6 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -117,13 +116,11 @@ if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
- /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%package doc
@@ -141,6 +138,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
- Update AppStream XML.
+- Remove scriptlets replaced by triggers in Fedora 24.
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit 54c70b9bee532947667e3561c3a7265300a4691c
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Aug 22 21:20:01 2016 +0100
Update AppStream XML.
diff --git a/keepass-appdata.patch b/keepass-appdata.patch
deleted file mode 100644
index 5837028..0000000
--- a/keepass-appdata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- keepass-2.26/dist/keepass.appdata.xml 1970-01-01 01:00:00.000000000 +0100
-+++ keepass/dist/keepass.appdata.xml 2014-04-20 15:24:36.025952830 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright 2014 Peter Oliver <appdata(a)mavit.org.uk> -->
-+<application>
-+ <id type="desktop">keepass.desktop</id>
-+ <metadata_license>CC0</metadata_license>
-+ <name>KeePass</name>
-+ <summary>Password manager</summary>
-+ <description>
-+ <p>
-+ KeePass is a free open source password manager, which helps you to
-+ remember your passwords securely. You can put all your
-+ passwords in one database, which is locked with one master key or a
-+ key file. You only have to remember one single master password or
-+ select the key file to unlock the whole database.
-+ </p>
-+ </description>
-+ <screenshots>
-+ <screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/keepass-main-window.png</screenshot>
-+ </screenshots>
-+ <url type="homepage">http://keepass.info/</url>
-+ <updatecontact>appdata(a)mavit.org.uk</updatecontact>
-+</application>
diff --git a/keepass.appdata.xml b/keepass.appdata.xml
new file mode 100644
index 0000000..199c0e1
--- /dev/null
+++ b/keepass.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014, 2016 Peter Oliver <appdata(a)mavit.org.uk> -->
+<component type="desktop">
+ <id>keepass.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>KeePass</name>
+ <summary>Password manager</summary>
+ <project_license>GPL-2.0+</project_license>
+ <developer_name>Dominik Reichl</developer_name>
+ <description>
+ <p>
+ KeePass is a free open source password manager, which helps you to
+ remember your passwords securely. You can put all your
+ passwords in one database, which is locked with one master key or a
+ key file. You only have to remember one single master password or
+ select the key file to unlock the whole database.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot height="351" width="624" type="default">
+ <image>https://mavit.fedorapeople.org/appdata/keepass-main-window.png</image>
+ <caption>KeePass showing the example database</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://keepass.info/</url>
+ <url type="bugtracker">https://sourceforge.net/p/keepass/_list/tickets</url>
+ <url type="translate">http://keepass.info/translations_devinfo.html</url>
+ <url type="donation">http://keepass.info/donate.html</url>
+ <url type="help">http://keepass.info/help/base/index.html</url>
+ <update_contact>appdata(a)mavit.org.uk</update_contact>
+</component>
diff --git a/keepass.spec b/keepass.spec
index 051e47d..56e21e7 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -9,10 +9,10 @@ URL: http://keepass.info/
# Created with, e.g.:
# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
+Source1: %{name}.appdata.xml
# Upstream does not include a .desktop file, etc..
Patch0: keepass-desktop-integration.patch
-Patch3: keepass-appdata.patch
# Move XSL files to /usr/share/keepass:
Patch1: keepass-fix-XSL-search-path.patch
@@ -78,7 +78,7 @@ install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{build
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
-install -p -m 0644 dist/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/appdata
install -p dist/%{name} %{buildroot}/%{_bindir}
sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Aug 22 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-2
+- Update AppStream XML.
+
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
- Update to version 2.33.
commit e0d383aee24f3129abc4c19e25508065cb9fffd9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 21 14:54:04 2016 +0100
Update to version 2.33.
diff --git a/keepass.spec b/keepass.spec
index b9e9da6..051e47d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,13 +1,13 @@
Name: keepass
-Version: 2.32
-Release: 3%{?dist}
+Version: 2.33
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-2.32-Source.zip.asc KeePass-2.32-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-$version-Source.zip.asc KeePass-$version-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
# Upstream does not include a .desktop file, etc..
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.33-1
+- Update to version 2.33.
+
* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
- Remove now-unneeded workaround for BOM-handling bug in grep.
diff --git a/sources b/sources
index 33e21b1..b649b49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2485dde5dfe48370dc34481ec8f2533c keepass-2.32.tar.xz
+6e15c3b516d12181b73c3053c3e40323 keepass-2.33.tar.xz
commit dd4685b28efdceef6fd524670e3381a01d596215
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sat May 21 13:17:30 2016 +0100
Remove now-unneeded workaround for BOM-handling bug in grep.
diff --git a/keepass.spec b/keepass.spec
index a493a67..b9e9da6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.32
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -51,10 +51,6 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-# Work around BOM-handling bug
-# (https://bugzilla.redhat.com/show_bug.cgi?id=1317084):
-sed -i '1s/^//' KeePass/KeePass.csproj
-
%build
( cd Build && sh PrepMonoDev.sh )
@@ -143,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat May 21 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-3
+- Remove now-unneeded workaround for BOM-handling bug in grep.
+
* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
- Update to version 2.32.
commit 6a32084a6f7a4aa2d2e11c47ee2ef259984ab9a6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Mar 11 22:59:17 2016 +0000
Add link to BOM-handling bug.
diff --git a/keepass.spec b/keepass.spec
index 676145b..a493a67 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -51,7 +51,8 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
-# Work around BOM:
+# Work around BOM-handling bug
+# (https://bugzilla.redhat.com/show_bug.cgi?id=1317084):
sed -i '1s/^//' KeePass/KeePass.csproj
commit e4eee07b45f1eafc132bac47d354986b8d088157
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu Mar 10 22:13:36 2016 +0000
Update to version 2.32.
diff --git a/keepass.spec b/keepass.spec
index b93907d..676145b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,5 +1,5 @@
Name: keepass
-Version: 2.31
+Version: 2.32
Release: 2%{?dist}
Summary: Password manager
@@ -7,7 +7,7 @@ License: GPLv2+
URL: http://keepass.info/
# Created with, e.g.:
-# version=2.25 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO http://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/K... && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+# version=2.32 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO https://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/... && curl -RO http://keepass.info/integrity/v2/KeePass-$version-Source.zip.asc && gpg2 --verify KeePass-2.32-Source.zip.asc KeePass-2.32-Source.zip && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
Source0: %{name}-%version.tar.xz
# Upstream does not include a .desktop file, etc..
@@ -51,6 +51,9 @@ to unlock the whole database.
# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+# Work around BOM:
+sed -i '1s/^//' KeePass/KeePass.csproj
+
%build
( cd Build && sh PrepMonoDev.sh )
@@ -139,6 +142,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Mar 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.32-2
+- Update to version 2.32.
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index fc30a8e..33e21b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30d34d65f6be2a496d6ea8e43837e1c6 keepass-2.31.tar.xz
+2485dde5dfe48370dc34481ec8f2533c keepass-2.32.tar.xz
commit d8681f3eebbef3ef8501ae30e4dfe503f7c8e727
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Feb 4 01:55:23 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 24fe42d..b93907d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.31
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -139,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
- Update to version 2.31.
commit fb6959412351353dae0cdbb20e88b769b1a69d46
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Mon Jan 11 20:53:04 2016 +0000
Update to version 2.31.
diff --git a/keepass.spec b/keepass.spec
index 0ba9627..24fe42d 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.30
-Release: 6%{?dist}
+Version: 2.31
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -65,10 +65,16 @@ xbuild /target:KeePass /property:Configuration=Release
%install
-install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
-install -p -m 0644 -T Ext/Icons/Finals/plockb.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_512.png %{buildroot}/%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_256.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_128.png %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 0644 -T Ext/Icons_15_VA/KeePass_Round/KeePass_Round_16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
@@ -88,7 +94,13 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
-%{_datadir}/icons/hicolor/256x256/apps/keepass.png
+%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -127,6 +139,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Jan 11 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.31-1
+- Update to version 2.31.
+
* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
- Add keyword to .desktop file.
diff --git a/sources b/sources
index cdd3fdf..fc30a8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76b8ad9df4256317a1753572560ce172 keepass-2.30.tar.xz
+30d34d65f6be2a496d6ea8e43837e1c6 keepass-2.31.tar.xz
commit fdf3acba2be61ef150d65d0e3822f0125ec48e2e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Jan 10 14:02:52 2016 +0000
Add keyword to .desktop file.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 8a48f3c..d154acd 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -35,7 +35,7 @@ diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=KeePass
+GenericName=Password manager
@@ -46,6 +46,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+StartupWMClass=keepass2
+Categories=Utility;
+MimeType=application/x-keepass2;
++Keywords=passwords;
diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
+++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
diff --git a/keepass.spec b/keepass.spec
index 35f4ce2..0ba9627 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -127,6 +127,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Jan 10 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-6
+- Add keyword to .desktop file.
+
* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
- Remove workaround for #1251756, which is now fixed.
commit 452b6aa8f08da23834036dd4b09d5c29c4c853a5
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Tue Jan 5 22:58:18 2016 +0000
Remove workaround for #1251756, which is now fixed.
diff --git a/keepass.spec b/keepass.spec
index 6225a4f..35f4ce2 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -32,9 +32,6 @@ BuildRequires: python-devel
BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
-# Workaround for 1251756:
-Requires: libgdiplus-devel
-
# The debuginfo package would be empty if created.
%global debug_package %{nil}
@@ -130,6 +127,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Tue Jan 5 2016 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-5
+- Remove workaround for #1251756, which is now fixed.
+
* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
- Ensure .png files are repacked into .bin files at build time.
- Work around missing icons. Fixes #1276843.
commit 181e61806bf4015927a108cbd7f8cd3df33f6487
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Nov 22 21:09:22 2015 +0000
Work around some icons not appearing in 2.30. Fixes #1276843.
diff --git a/keepass.spec b/keepass.spec
index 0f82f6b..6225a4f 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -21,6 +21,7 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
ExclusiveArch: %{mono_arches}
+BuildRequires: ImageMagick
BuildRequires: archmage
BuildRequires: desktop-file-utils
BuildRequires: libgdiplus-devel
@@ -50,6 +51,9 @@ to unlock the whole database.
%prep
%autosetup -p1
+# Work around libpng bug (https://bugzilla.redhat.com/show_bug.cgi?id=1276843):
+find -name \*.png -print0 | xargs -0 mogrify -define png:format=png32
+
%build
( cd Build && sh PrepMonoDev.sh )
@@ -128,6 +132,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
- Ensure .png files are repacked into .bin files at build time.
+- Work around missing icons. Fixes #1276843.
* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
commit 8076144e113e695452f39416b4c4af042cc0d51f
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Nov 22 21:08:12 2015 +0000
Ensure .png files are repacked into .bin files at build time.
Conflicts:
keepass.spec
diff --git a/keepass.spec b/keepass.spec
index 43d7a5c..0f82f6b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -28,6 +28,7 @@ BuildRequires: mono-devel
BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
+BuildRequires: xorg-x11-server-Xvfb
Requires: xdotool xsel hicolor-icon-theme
# Workaround for 1251756:
@@ -55,6 +56,10 @@ to unlock the whole database.
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
xbuild /target:KeePass /property:Configuration=Release
+for subdir in Images_App_HighRes Images_Client_16 Images_Client_HighRes; do
+ xvfb-run -a mono Build/KeePass/Release/KeePass.exe -d:`pwd`/Ext/$subdir --makexspfile `pwd`/KeePass/Resources/Data/$subdir.bin
+done
+xbuild /target:KeePass /property:Configuration=Release
%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
@@ -121,6 +126,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Nov 22 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-4
+- Ensure .png files are repacked into .bin files at build time.
+
* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
commit f380e22bb031e38966ab0fbe33b59e3c8ff6c614
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Oct 23 21:40:56 2015 +0100
Set StartupWMClass. Fixes #1266312.
This is so that desktops can match the .desktop file with the windows mapped by the application.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index ca99a8c..8a48f3c 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -43,7 +43,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+Icon=keepass
+Terminal=false
+Type=Application
-+StartupNotify=false
++StartupWMClass=keepass2
+Categories=Utility;
+MimeType=application/x-keepass2;
diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
diff --git a/keepass.spec b/keepass.spec
index 44dee7c..43d7a5c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -121,6 +121,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Oct 23 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-3
+- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application. Fixes #1266312.
+
* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
- Add workaround for #1251756.
commit a7c5b39b76adce7050d03c70f80a03f7e8f8ba58
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 17:50:36 2015 +0100
Inline comments not possible.
diff --git a/keepass.spec b/keepass.spec
index 259fd24..44dee7c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -29,7 +29,9 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
-Requires: libgdiplus-devel # Workaround for 1251756
+
+# Workaround for 1251756:
+Requires: libgdiplus-devel
# The debuginfo package would be empty if created.
commit d0c7df367081639609317d8c21c006550f32acc0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 17:48:36 2015 +0100
Add workaround for #1251756.
diff --git a/keepass.spec b/keepass.spec
index cc35222..259fd24 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.30
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -29,6 +29,7 @@ BuildRequires: mono-winforms
BuildRequires: mono-web
BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
+Requires: libgdiplus-devel # Workaround for 1251756
# The debuginfo package would be empty if created.
@@ -118,6 +119,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-2
+- Add workaround for #1251756.
+
* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
- Update to 2.30. Fixes #1222120.
commit d92043d28d80653a93088a4b00d6e0e37f0a33ad
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Sun Aug 9 15:02:06 2015 +0100
Update to 2.30. Fixes #1222120.
diff --git a/keepass.spec b/keepass.spec
index b51b2e1..cc35222 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.29
-Release: 2%{?dist}
+Version: 2.30
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -118,6 +118,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Aug 9 2015 Peter Oliver <rpm(a)mavit.org.uk> - 2.30-1
+- Update to 2.30. Fixes #1222120.
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index 41c584a..cdd3fdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d25a343d95d486cf338446203418bce0 keepass-2.29.tar.xz
+76b8ad9df4256317a1753572560ce172 keepass-2.30.tar.xz
commit 258ab3ea7529886d69a26afd5e5d59e1e3beb1e3
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jun 17 13:07:11 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index 934c881..b51b2e1 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.29
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -118,6 +118,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
- Update to 2.29
- Rebuild (mono4)
commit 75b16329d8ad2eab246008a5820a0d1fde4dd5c6
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue May 19 14:16:12 2015 +0100
2.29 plus mono 4 build fixes
diff --git a/.gitignore b/.gitignore
index 07c6bbb..ed4c5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/keepass-2.26.tar.xz
-/keepass-2.27.tar.xz
+/keepass-*.tar.xz
diff --git a/keepass.spec b/keepass.spec
index 7053760..934c881 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.27
-Release: 5%{?dist}
+Version: 2.29
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -21,7 +21,13 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
ExclusiveArch: %{mono_arches}
-BuildRequires: mono-devel archmage desktop-file-utils python-devel
+BuildRequires: archmage
+BuildRequires: desktop-file-utils
+BuildRequires: libgdiplus-devel
+BuildRequires: mono-devel
+BuildRequires: mono-winforms
+BuildRequires: mono-web
+BuildRequires: python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -43,6 +49,8 @@ to unlock the whole database.
%build
( cd Build && sh PrepMonoDev.sh )
+find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+find . -name "*.csproj" -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g' {} \;
xbuild /target:KeePass /property:Configuration=Release
%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
@@ -78,8 +86,8 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
@@ -110,7 +118,8 @@ Documentation for KeePass, a free open source password manager.
%changelog
-* Mon May 18 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.27-5
+* Tue May 19 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.29-1
+- Update to 2.29
- Rebuild (mono4)
* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
diff --git a/sources b/sources
index c4ba8d3..41c584a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4e243b7f3784db99a3f5e3ede2493b keepass-2.27.tar.xz
+d25a343d95d486cf338446203418bce0 keepass-2.29.tar.xz
commit 1103118c3e40e833b67e4e6fa8b205ef00300609
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon May 18 22:09:42 2015 +0100
Rebuild (mono4)
diff --git a/keepass.spec b/keepass.spec
index d14dcfd..7053760 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -110,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon May 18 2015 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.27-5
+- Rebuild (mono4)
+
* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
- switch to ExclusiveArch, but seems FTBFS even on x86_64
commit fbc16b6b4553eab69daf0054d6ac06fbad0b70fa
Author: Dan Horák <dan(a)danny.cz>
Date: Sat Oct 4 16:37:58 2014 +0200
- switch to ExclusiveArch, but seems FTBFS even on x86_64
diff --git a/keepass.spec b/keepass.spec
index dc89afe..d14dcfd 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Password manager
License: GPLv2+
@@ -20,7 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
-ExcludeArch: armv7hl
+ExclusiveArch: %{mono_arches}
BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -110,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Oct 04 2014 Dan Horák <dan[at]danny.cz> - 2.27-4
+- switch to ExclusiveArch, but seems FTBFS even on x86_64
+
* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
- update mime scriptlets
commit 44e4c7d34e42f7ce9acec99dbbd9c7db0cfe1399
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Aug 18 12:05:14 2014 -0500
update mime scriptlets
diff --git a/keepass.spec b/keepass.spec
index 91a5f2b..dc89afe 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Password manager
License: GPLv2+
@@ -78,21 +78,23 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%post
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+ /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%package doc
@@ -108,6 +110,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Mon Aug 18 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.27-3
+- update mime scriptlets
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit d9da45871cec1a75d1fb5224100c9f433681e4cd
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Sat Aug 16 23:34:08 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index df670e6..91a5f2b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.27
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
- Update to version 2.27.
commit 6f87ecdd7819060d6b3f373ad4b1cdd40429e0b0
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jul 18 22:43:18 2014 +0100
Update to version 2.27.
diff --git a/.gitignore b/.gitignore
index 6856ffb..07c6bbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/keepass-2.26.tar.xz
+/keepass-2.27.tar.xz
diff --git a/keepass.spec b/keepass.spec
index 8b77771..df670e6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
-Version: 2.26
-Release: 10%{?dist}
+Version: 2.27
+Release: 1%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.27-1
+- Update to version 2.27.
+
* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
- Add missing %u to Exec line in .desktop.
diff --git a/sources b/sources
index aa134f8..c4ba8d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aec8893be3fa27f94491a0b1a619bf7 keepass-2.26.tar.xz
+5a4e243b7f3784db99a3f5e3ede2493b keepass-2.27.tar.xz
commit bb91a54e6978e282b3e6f9c375c850f89ba38baa
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Jul 18 22:12:40 2014 +0100
Add missing %u to Exec line in .desktop.
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index 6894a41..ca99a8c 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -39,7 +39,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+[Desktop Entry]
+Name=KeePass
+GenericName=Password manager
-+Exec=keepass
++Exec=keepass %u
+Icon=keepass
+Terminal=false
+Type=Application
diff --git a/keepass.spec b/keepass.spec
index 74c1ac3..8b77771 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Fri Jul 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-10
+- Add missing %u to Exec line in .desktop.
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 60527416461169d46b4f96ef018569804ef3d88c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 21:15:22 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/keepass.spec b/keepass.spec
index dd21fc9..74c1ac3 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Password manager
License: GPLv2+
@@ -108,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.26-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
- Mono crashes on ARM builders, so exclude that architecture.
commit 8a13b18142f2acf423996e2c4b5535b0e0af9baa
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri May 23 20:22:10 2014 +0100
Bump version number.
diff --git a/keepass.spec b/keepass.spec
index c0efef6..dd21fc9 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Password manager
License: GPLv2+
commit e5129597db37a7f7782285297941112d380fa9b6
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 20:36:59 2014 +0100
Mono crashes on ARM builders, so exclude that architecture.
diff --git a/keepass.spec b/keepass.spec
index 2024a67..c0efef6 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Password manager
License: GPLv2+
@@ -20,6 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
+ExcludeArch: armv7hl
BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -107,6 +108,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-7
+- Mono crashes on ARM builders, so exclude that architecture.
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
- The "%{__python2}" macro requires python-devel.
commit 9a37729e759c4fcf30f03d5912fc7d505979064e
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 20:03:41 2014 +0100
The "%{__python2}" macro requires python-devel.
diff --git a/keepass.spec b/keepass.spec
index d285427..2024a67 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -20,7 +20,7 @@ Patch1: keepass-fix-XSL-search-path.patch
# Locate locally-installed help files:
Patch2: keepass-enable-local-help.patch
-BuildRequires: mono-devel archmage desktop-file-utils
+BuildRequires: mono-devel archmage desktop-file-utils python-devel
Requires: xdotool xsel hicolor-icon-theme
@@ -109,6 +109,7 @@ Documentation for KeePass, a free open source password manager.
%changelog
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
- Depend on hicolor-icon-theme.
+- The "%{__python2}" macro requires python-devel.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
commit 63fd17e2acbf9d5f1b68192cf943a3051a2351ca
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:37:36 2014 +0100
Depend on hicolor-icon-theme.
diff --git a/keepass.spec b/keepass.spec
index 290255b..d285427 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Password manager
License: GPLv2+
@@ -21,7 +21,7 @@ Patch1: keepass-fix-XSL-search-path.patch
Patch2: keepass-enable-local-help.patch
BuildRequires: mono-devel archmage desktop-file-utils
-Requires: xdotool xsel
+Requires: xdotool xsel hicolor-icon-theme
# The debuginfo package would be empty if created.
@@ -70,7 +70,7 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
-%{_datadir}/icons/hicolor
+%{_datadir}/icons/hicolor/256x256/apps/keepass.png
%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -107,6 +107,9 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-6
+- Depend on hicolor-icon-theme.
+
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
commit d79fc885457187cc772a622205b5512e1848c19d
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:14:14 2014 +0100
Use "%{__python2}" macro.
diff --git a/keepass.spec b/keepass.spec
index 2d3ed27..290255b 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -43,7 +43,7 @@ to unlock the whole database.
%build
( cd Build && sh PrepMonoDev.sh )
xbuild /target:KeePass /property:Configuration=Release
-python -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
+%{__python2} -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
%install
@@ -111,6 +111,7 @@ Documentation for KeePass, a free open source password manager.
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
- Use "doc" rather than "-n %{name}-doc" in subpackages.
+- Use "%{__python2}" macro.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit 6a9327078220aa4c6f43d2e23e3c7381c291e869
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:10:37 2014 +0100
Use "doc" rather than "-n %{name}-doc" in subpackages.
diff --git a/keepass.spec b/keepass.spec
index 30d05ed..2d3ed27 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -98,10 +98,10 @@ fi
Summary: Documentation for the KeePass password manager
BuildArch: noarch
-%description -n %{name}-doc
+%description doc
Documentation for KeePass, a free open source password manager.
-%files -n %{name}-doc
+%files doc
%dir %{_docdir}
%doc %{_docdir}/%{name}/Chm/
@@ -110,6 +110,7 @@ Documentation for KeePass, a free open source password manager.
* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
- Use "*" rather than ".gz" as the man page suffix, in case the
compression format changes.
+- Use "doc" rather than "-n %{name}-doc" in subpackages.
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
commit d4596a30f1ea13bbce141481171f5c9d79eb88c9
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:06:24 2014 +0100
Use "*" rather than ".gz" as the man page suffix, in case the compression format changes.
diff --git a/keepass.spec b/keepass.spec
index c814205..30d05ed 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
Name: keepass
Version: 2.26
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Password manager
License: GPLv2+
@@ -71,7 +71,7 @@ cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime
%{_datadir}/icons/hicolor
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1*
%{_datadir}/appdata/%{name}.appdata.xml
@@ -107,6 +107,10 @@ Documentation for KeePass, a free open source password manager.
%changelog
+* Thu May 22 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-5
+- Use "*" rather than ".gz" as the man page suffix, in case the
+ compression format changes.
+
* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
- Install .desktop file via desktop-file-install.
- Don't recreate the build-root.
commit 502495f19236db24216945dd9452c0fd8c0c42d4
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Thu May 22 19:00:38 2014 +0100
Initial import. Bug 1089425.
diff --git a/.gitignore b/.gitignore
index e69de29..6856ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/keepass-2.26.tar.xz
diff --git a/keepass-appdata.patch b/keepass-appdata.patch
new file mode 100644
index 0000000..5837028
--- /dev/null
+++ b/keepass-appdata.patch
@@ -0,0 +1,25 @@
+--- keepass-2.26/dist/keepass.appdata.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.appdata.xml 2014-04-20 15:24:36.025952830 +0100
+@@ -0,0 +1,22 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2014 Peter Oliver <appdata(a)mavit.org.uk> -->
++<application>
++ <id type="desktop">keepass.desktop</id>
++ <metadata_license>CC0</metadata_license>
++ <name>KeePass</name>
++ <summary>Password manager</summary>
++ <description>
++ <p>
++ KeePass is a free open source password manager, which helps you to
++ remember your passwords securely. You can put all your
++ passwords in one database, which is locked with one master key or a
++ key file. You only have to remember one single master password or
++ select the key file to unlock the whole database.
++ </p>
++ </description>
++ <screenshots>
++ <screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/keepass-main-window.png</screenshot>
++ </screenshots>
++ <url type="homepage">http://keepass.info/</url>
++ <updatecontact>appdata(a)mavit.org.uk</updatecontact>
++</application>
diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
new file mode 100644
index 0000000..6894a41
--- /dev/null
+++ b/keepass-desktop-integration.patch
@@ -0,0 +1,61 @@
+diff -uNr keepass-2.26/dist/keepass keepass/dist/keepass
+--- keepass-2.26/dist/keepass 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass 2014-04-18 22:39:57.973399231 +0100
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec /usr/bin/mono /usr/lib/keepass/KeePass.exe "$@"
+diff -uNr keepass-2.26/dist/keepass.1 keepass/dist/keepass.1
+--- keepass-2.26/dist/keepass.1 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.1 2014-04-18 22:39:50.906367857 +0100
+@@ -0,0 +1,23 @@
++.TH KEEPASS 1 "Mar 19, 2011"
++.SH NAME
++keepass \- password manager
++.SH SYNOPSIS
++.B keepass
++.SH DESCRIPTION
++\fBKeePass\fP is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your passwords in one database, which is locked with one master key or a key file. So you only have to remember one single master password to unlock the whole database. The databases are encrypted using AES-256.
++.SH OPTIONS
++.TP
++\fB\-\-auto-type\fP
++invokes global auto-type
++.TP
++\fB\-\-lock-all\fP
++lock databases of all KeePass instances
++.TP
++\fB\-\-unlock-all\fP
++unlock databases of all KeePass instances
++.TP
++\fB\-\-exit-all\fP
++exit all KeePass instances
++.SH AUTHOR
++This manual page was written by Julian Taylor <jtaylor.debian(a)googlemail.com>,
++for the Debian project (but may be used by others).
+diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
+--- keepass-2.26/dist/keepass.desktop 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.desktop 2014-04-18 22:39:35.719301001 +0100
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Name=KeePass
++GenericName=Password manager
++Exec=keepass
++Icon=keepass
++Terminal=false
++Type=Application
++StartupNotify=false
++Categories=Utility;
++MimeType=application/x-keepass2;
+diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
+--- keepass-2.26/dist/keepass.xml 1970-01-01 01:00:00.000000000 +0100
++++ keepass/dist/keepass.xml 2014-04-18 22:39:44.732340767 +0100
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
++ <mime-type type="application/x-keepass2">
++ <comment>KeePass 2 database</comment>
++ <comment xml:lang="de">KeePass 2 Datenbank</comment>
++ <glob pattern="*.kdbx"/>
++ <icon name="keepass"/>
++ </mime-type>
++</mime-info>
diff --git a/keepass-enable-local-help.patch b/keepass-enable-local-help.patch
new file mode 100644
index 0000000..bd6c67f
--- /dev/null
+++ b/keepass-enable-local-help.patch
@@ -0,0 +1,57 @@
+From: Julian Taylor <jtaylor.debian(a)googlemail.com>
+Date: Tue, 12 Jul 2011 21:51:43 +0200
+Subject: enable local help
+
+disable windows chm viewer and use x-www-browser to view docs
+located as html files in "/usr/share/doc/keepass2/Chm/help/"
+Forwarded: not-needed
+---
+ KeePass/App/AppHelp.cs | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+
+--- a/KeePass/App/AppHelp.cs
++++ b/KeePass/App/AppHelp.cs
+@@ -58,7 +58,7 @@ namespace KeePass.App
+ {
+ if(m_strLocalHelpFile == null) return false;
+
+- try { return File.Exists(m_strLocalHelpFile); }
++ try { return Directory.Exists(@"/usr/share/doc/keepass/Chm/help/"); }
+ catch(Exception) { }
+ return false;
+ }
+@@ -114,14 +114,13 @@ namespace KeePass.App
+ private static void ShowHelpLocal(string strTopic, string strSection)
+ {
+ Debug.Assert(m_strLocalHelpFile != null);
+-
+- // Unblock CHM file for proper display of help contents
+- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
+-
+- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
++
++ string strCmd = @"/usr/share/doc/keepass/Chm/help/";
+
+ if(strTopic != null)
+- strCmd += @"::/help/" + strTopic + ".html";
++ strCmd += strTopic + ".html";
++ else
++ strCmd += @"../index.html";
+
+ if(strSection != null)
+ {
+@@ -129,12 +128,10 @@ namespace KeePass.App
+ strCmd += @"#" + strSection;
+ }
+
+- strCmd += "\"";
+-
+- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
++ try { Process.Start("x-www-browser", strCmd); }
+ catch(Exception exStart)
+ {
+- MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);
++ MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);
+ }
+ }
+
diff --git a/keepass-fix-XSL-search-path.patch b/keepass-fix-XSL-search-path.patch
new file mode 100644
index 0000000..eb73bc6
--- /dev/null
+++ b/keepass-fix-XSL-search-path.patch
@@ -0,0 +1,35 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team(a)lists.alioth.debian.org>
+Date: Tue, 21 Jun 2011 19:43:31 +0200
+Subject: fix XSL search path
+
+search for XSL files in /usr/share/keepass2
+
+Forwarded: not-needed
+---
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 3 +--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
+@@ -36,6 +36,8 @@ namespace KeePass.App
+ public static readonly Color ColorControlDisabled = SystemColors.Control;
+ public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+
++ public const string DebianDataDir = "/usr/share/keepass/";
++
+ public const string XslFilesDir = "XSL";
+ public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
+ public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -89,8 +89,7 @@ namespace KeePass.Forms
+ m_lvComponents.Items.Add(lvi);
+
+ lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
+- string strPath = WinUtil.GetExecutable();
+- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
++ string strPath = AppDefs.DebianDataDir;
+ strPath += AppDefs.XslFilesDir;
+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+ bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
diff --git a/keepass.spec b/keepass.spec
new file mode 100644
index 0000000..c814205
--- /dev/null
+++ b/keepass.spec
@@ -0,0 +1,127 @@
+Name: keepass
+Version: 2.26
+Release: 4%{?dist}
+Summary: Password manager
+
+License: GPLv2+
+URL: http://keepass.info/
+
+# Created with, e.g.:
+# version=2.25 tmpdir=`mktemp -d` && cd $tmpdir && curl -LRO http://downloads.sourceforge.net/project/keepass/KeePass%202.x/$version/K... && mkdir keepass-$version && unzip -d keepass-$version KeePass-$version-Source.zip && find keepass-$version -name "*dll" -delete && tar -cJf keepass-$version.tar.xz keepass-$version
+Source0: %{name}-%version.tar.xz
+
+# Upstream does not include a .desktop file, etc..
+Patch0: keepass-desktop-integration.patch
+Patch3: keepass-appdata.patch
+
+# Move XSL files to /usr/share/keepass:
+Patch1: keepass-fix-XSL-search-path.patch
+
+# Locate locally-installed help files:
+Patch2: keepass-enable-local-help.patch
+
+BuildRequires: mono-devel archmage desktop-file-utils
+Requires: xdotool xsel
+
+
+# The debuginfo package would be empty if created.
+%global debug_package %{nil}
+
+
+%description
+KeePass is a free open source password manager, which helps you to
+remember your passwords in a secure way. You can put all your passwords in
+one database, which is locked with one master key or a key file. You
+only have to remember one single master password or select the key file
+to unlock the whole database.
+
+
+%prep
+%autosetup -p1
+
+
+%build
+( cd Build && sh PrepMonoDev.sh )
+xbuild /target:KeePass /property:Configuration=Release
+python -c 'import archmod.CHM; archmod.CHM.CHMDir("Docs").process_templates("Docs/Chm")'
+
+
+%install
+install -d %{buildroot}/%{_prefix}/lib/%{name} %{buildroot}/%{_datadir}/%{name} %{buildroot}/%{_datadir}/%{name}/XSL %{buildroot}/%{_datadir}/applications %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/mime/packages %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps %{buildroot}/%{_mandir}/man1 %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_datadir}/appdata
+install -p -m 0644 Build/KeePass/Release/KeePass.exe Ext/KeePass.config.xml Ext/KeePass.exe.config %{buildroot}/%{_prefix}/lib/%{name}
+install -p -m 0644 Ext/XSL/KDBX_DetailsFull.xsl Ext/XSL/KDBX_DetailsLite.xsl Ext/XSL/KDBX_PasswordsOnly.xsl Ext/XSL/KDBX_Styles.css Ext/XSL/KDBX_Tabular.xsl Ext/XSL/TableHeader.gif %{buildroot}/%{_datadir}/%{name}/XSL
+install -p -m 0644 -T Ext/Icons/Finals/plockb.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications dist/%{name}.desktop
+install -p -m 0644 dist/%{name}.xml %{buildroot}/%{_datadir}/mime/packages
+install -p -m 0644 dist/%{name}.1 %{buildroot}/%{_mandir}/man1
+install -p -m 0644 dist/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata
+install -p dist/%{name} %{buildroot}/%{_bindir}
+sed 's/\r$//' Docs/History.txt > %{buildroot}/%{_docdir}/%{name}/History.txt
+sed 's/\r$//' Docs/License.txt > %{buildroot}/%{_docdir}/%{name}/License.txt
+cp -pr Docs/Chm %{buildroot}/%{_docdir}/%{name}/
+
+
+%files
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/History.txt
+%doc %{_docdir}/%{name}/License.txt
+%{_bindir}/%{name}
+%{_prefix}/lib/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime
+%{_datadir}/icons/hicolor
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/appdata/%{name}.appdata.xml
+
+
+%post
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%package doc
+Summary: Documentation for the KeePass password manager
+BuildArch: noarch
+
+%description -n %{name}-doc
+Documentation for KeePass, a free open source password manager.
+
+%files -n %{name}-doc
+%dir %{_docdir}
+%doc %{_docdir}/%{name}/Chm/
+
+
+%changelog
+* Sun May 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-4
+- Install .desktop file via desktop-file-install.
+- Don't recreate the build-root.
+- Own documentation directory.
+- Own icon and mime directories.
+- Make the -doc subpackage noarch.
+- Preserve timestamps when installing files.
+
+* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-3
+- Reliable clipboard handling requires xsel.
+
+* Sun Apr 20 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-2
+- Build a documentation subpackage.
+- For auto-type, xdotool is required.
+- Include an AppData file.
+
+* Fri Apr 18 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.26-1
+- New package, based in part on the Debian package.
diff --git a/sources b/sources
index e69de29..aa134f8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2aec8893be3fa27f94491a0b1a619bf7 keepass-2.26.tar.xz
4 months, 4 weeks
Architecture specific change in rpms/bottles.git
by githook-noreply@fedoraproject.org
The package rpms/bottles.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/bottles.git/commit/?id=0a7e2e162c....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 0a7e2e162ce014a160f78ee8e8dddd269e8b3193
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 13:04:55 2023 +0100
Update meta info (summary, description)
Also re-order spec file a little (pedantic).
diff --git a/bottles.spec b/bottles.spec
index 431d784..c94071a 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -4,24 +4,23 @@ Name: bottles
Epoch: 1
Version: 51.10
Release: %autorelease
-BuildArch: noarch
-
-# blueprint-compiler does not work on s390x:
-# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
-ExcludeArch: s390x
+Summary: Run Windows in a Bottle
%global tag %{version}
-
%forgemeta
# The following two files are licensed as MIT:
# bottles/backend/models/vdict.py
# bottles/backend/utils/vdf.py
License: GPL-3.0-or-later AND MIT
-Summary: Easily manage Wine prefix in a new way
URL: %{forgeurl}
Source0: %{forgesource}
+BuildArch: noarch
+# blueprint-compiler does not work on s390x:
+# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
+ExcludeArch: s390x
+
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: meson
@@ -57,39 +56,21 @@ Requires: ImageMagick %dnl # https://bugzilla.redhat.com/show_bug.
Requires: python3-chardet %dnl # https://bugzilla.redhat.com/show_bug.cgi?id=2240292
%description
-Easily manage Wine prefix in a new way! (Run Windows software and games on
-Linux).
+Bottles lets you run Windows software on Linux, such as applications
+and games. It introduces a workflow that helps you organize by
+categorizing each software to your liking. Bottles provides several
+tools and integrations to help you manage and optimize your
+applications.
Features:
- * Create bottles based on environments (a set of rule and dependencies for
- better software compatibility)
- * Access to a customizable environment for all your experiments
- * Run every executable (.exe/.msi) in your bottles, using the context menu
- in your file manager
- * Integrated management and storage for executable file arguments
- * Support for custom environment variables
- * Simplified DLL overrides
- * On-the-fly runner change for any Bottle
- * Various optimizations for better gaming performance (esync, fsync, dxvk,
- cache, shader compiler, offload .. and much more.)
- * Tweak different wine prefix settings, without leaving Bottles
- * Automated dxvk installation
- * Automatic installation and management of Wine and Proton runners
- * System for checking runner updates for the bottle and automatic repair in
- case of breakage
- * Integrated Dependencies installer with compatibility check based on a
- community-driver repository
- * Detection of installed programs
- * Integrated Task manager for wine processes
- * Easy access to ProtonDB and WineHQ for support
- * Configurations update system across Bottles versions
- * Backup bottles as configuration file or full archive
- * Import backup archive
- * Importer from Bottles v1 (and other wineprefix manager)
- * Bottles versioning (experimental)
- * .. and much more that you can find by installing Bottles!
-
+- Use pre-configured environments as a base
+- Change runners for any bottle
+- Various optimizations and options for gaming
+- Repair in case software or bottle is broken
+- Install various known dependencies
+- Integrated task manager to manage and monitor processes
+- Backup and restore
%prep
%forgeautosetup -p1
commit eb26f5222b417a1c81cdd8fdce9af4ccf5c9ca55
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:52:33 2023 +0100
Update to 51.10 (RHBZ#2255734)
- Close RHBZ#2247856 RHBZ#2249922 RHBZ#2254894
diff --git a/.gitignore b/.gitignore
index 79e799b..0c75929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
/bottles-2022.7.14-brescia-3.tar.gz
/Bottles-51.6.tar.gz
/Bottles-51.9.tar.gz
+/Bottles-51.10.tar.gz
diff --git a/bottles.spec b/bottles.spec
index 1a1924d..431d784 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -2,7 +2,7 @@
Name: bottles
Epoch: 1
-Version: 51.9
+Version: 51.10
Release: %autorelease
BuildArch: noarch
diff --git a/sources b/sources
index 7ec3991..e89f76e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Bottles-51.9.tar.gz) = 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4
+SHA512 (Bottles-51.10.tar.gz) = a5d27f70d580cc115f797370437a41a0eeb7335e8278618415f7ba7268aae8102ba9ee8417723a731f677b7bf346773e5851f9021ff12bdec4305b436e589c24
commit f54334cda44d4379ce0f2bc34886fbce7b146564
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:24:56 2023 +0100
Fix Packit configuration
Bottles doesn't munge version ('v' prefix). Tell packit to use the plain
version for computing the download URL.
diff --git a/.packit.yaml b/.packit.yaml
index 2e9373e..7659433 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,5 +1,6 @@
upstream_project_url: https://github.com/bottlesdevs/Bottles
upstream_package_name: Bottles
+upstream_tag_template: "{version}"
downstream_package_name: bottles
copy_upstream_release_description: false
commit 35ef5736a27fd9dc61e76e14394315d1dc75b3eb
Author: Nikola Forró <nforro(a)redhat.com>
Date: Sun Dec 24 09:31:16 2023 +0100
Fix %forgesource
Signed-off-by: Nikola Forró <nforro(a)redhat.com>
diff --git a/bottles.spec b/bottles.spec
index a4cf6f0..1a1924d 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -10,6 +10,8 @@ BuildArch: noarch
# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
ExcludeArch: s390x
+%global tag %{version}
+
%forgemeta
# The following two files are licensed as MIT:
4 months, 4 weeks
Architecture specific change in rpms/bottles.git
by githook-noreply@fedoraproject.org
The package rpms/bottles.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/bottles.git/commit/?id=20f69f45ed....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 20f69f45ed39067f1f1c2fc6b92d0336865e774c
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 13:04:55 2023 +0100
Update meta info (summary, description)
Also re-order spec file a little (pedantic).
diff --git a/bottles.spec b/bottles.spec
index 431d784..c94071a 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -4,24 +4,23 @@ Name: bottles
Epoch: 1
Version: 51.10
Release: %autorelease
-BuildArch: noarch
-
-# blueprint-compiler does not work on s390x:
-# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
-ExcludeArch: s390x
+Summary: Run Windows in a Bottle
%global tag %{version}
-
%forgemeta
# The following two files are licensed as MIT:
# bottles/backend/models/vdict.py
# bottles/backend/utils/vdf.py
License: GPL-3.0-or-later AND MIT
-Summary: Easily manage Wine prefix in a new way
URL: %{forgeurl}
Source0: %{forgesource}
+BuildArch: noarch
+# blueprint-compiler does not work on s390x:
+# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
+ExcludeArch: s390x
+
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: meson
@@ -57,39 +56,21 @@ Requires: ImageMagick %dnl # https://bugzilla.redhat.com/show_bug.
Requires: python3-chardet %dnl # https://bugzilla.redhat.com/show_bug.cgi?id=2240292
%description
-Easily manage Wine prefix in a new way! (Run Windows software and games on
-Linux).
+Bottles lets you run Windows software on Linux, such as applications
+and games. It introduces a workflow that helps you organize by
+categorizing each software to your liking. Bottles provides several
+tools and integrations to help you manage and optimize your
+applications.
Features:
- * Create bottles based on environments (a set of rule and dependencies for
- better software compatibility)
- * Access to a customizable environment for all your experiments
- * Run every executable (.exe/.msi) in your bottles, using the context menu
- in your file manager
- * Integrated management and storage for executable file arguments
- * Support for custom environment variables
- * Simplified DLL overrides
- * On-the-fly runner change for any Bottle
- * Various optimizations for better gaming performance (esync, fsync, dxvk,
- cache, shader compiler, offload .. and much more.)
- * Tweak different wine prefix settings, without leaving Bottles
- * Automated dxvk installation
- * Automatic installation and management of Wine and Proton runners
- * System for checking runner updates for the bottle and automatic repair in
- case of breakage
- * Integrated Dependencies installer with compatibility check based on a
- community-driver repository
- * Detection of installed programs
- * Integrated Task manager for wine processes
- * Easy access to ProtonDB and WineHQ for support
- * Configurations update system across Bottles versions
- * Backup bottles as configuration file or full archive
- * Import backup archive
- * Importer from Bottles v1 (and other wineprefix manager)
- * Bottles versioning (experimental)
- * .. and much more that you can find by installing Bottles!
-
+- Use pre-configured environments as a base
+- Change runners for any bottle
+- Various optimizations and options for gaming
+- Repair in case software or bottle is broken
+- Install various known dependencies
+- Integrated task manager to manage and monitor processes
+- Backup and restore
%prep
%forgeautosetup -p1
commit ce6b7342d9550aaa08df8cc660dab59508b40432
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:52:33 2023 +0100
Update to 51.10 (RHBZ#2255734)
- Close RHBZ#2247856 RHBZ#2249922 RHBZ#2254894
diff --git a/.gitignore b/.gitignore
index 79e799b..0c75929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
/bottles-2022.7.14-brescia-3.tar.gz
/Bottles-51.6.tar.gz
/Bottles-51.9.tar.gz
+/Bottles-51.10.tar.gz
diff --git a/bottles.spec b/bottles.spec
index 1a1924d..431d784 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -2,7 +2,7 @@
Name: bottles
Epoch: 1
-Version: 51.9
+Version: 51.10
Release: %autorelease
BuildArch: noarch
diff --git a/sources b/sources
index 7ec3991..e89f76e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Bottles-51.9.tar.gz) = 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4
+SHA512 (Bottles-51.10.tar.gz) = a5d27f70d580cc115f797370437a41a0eeb7335e8278618415f7ba7268aae8102ba9ee8417723a731f677b7bf346773e5851f9021ff12bdec4305b436e589c24
commit 0fb7f417395625fb73f59de67c3f20d0bdfa9dbd
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:39:21 2023 +0100
Revert "[packit] 51.10 upstream release"
Mishap. I was playing with Packit and didn't expect it to push right
away. Revert, revert!
This reverts commit 17ba7c76aa880a4060f2b78b20aa99a2b8a2141f.
diff --git a/.gitignore b/.gitignore
index 0c75929..79e799b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,3 @@
/bottles-2022.7.14-brescia-3.tar.gz
/Bottles-51.6.tar.gz
/Bottles-51.9.tar.gz
-/Bottles-51.10.tar.gz
diff --git a/README.packit b/README.packit
deleted file mode 100644
index 5998f60..0000000
--- a/README.packit
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 0.85.0.
diff --git a/bottles.spec b/bottles.spec
index 431d784..1a1924d 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -2,7 +2,7 @@
Name: bottles
Epoch: 1
-Version: 51.10
+Version: 51.9
Release: %autorelease
BuildArch: noarch
diff --git a/sources b/sources
index e89f76e..7ec3991 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Bottles-51.10.tar.gz) = a5d27f70d580cc115f797370437a41a0eeb7335e8278618415f7ba7268aae8102ba9ee8417723a731f677b7bf346773e5851f9021ff12bdec4305b436e589c24
+SHA512 (Bottles-51.9.tar.gz) = 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4
commit 17ba7c76aa880a4060f2b78b20aa99a2b8a2141f
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:37:58 2023 +0100
[packit] 51.10 upstream release
Upstream tag: 51.10
Upstream commit: 28ab196b
diff --git a/.gitignore b/.gitignore
index 79e799b..0c75929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
/bottles-2022.7.14-brescia-3.tar.gz
/Bottles-51.6.tar.gz
/Bottles-51.9.tar.gz
+/Bottles-51.10.tar.gz
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..5998f60
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.85.0.
diff --git a/bottles.spec b/bottles.spec
index 1a1924d..431d784 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -2,7 +2,7 @@
Name: bottles
Epoch: 1
-Version: 51.9
+Version: 51.10
Release: %autorelease
BuildArch: noarch
diff --git a/sources b/sources
index 7ec3991..e89f76e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Bottles-51.9.tar.gz) = 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4
+SHA512 (Bottles-51.10.tar.gz) = a5d27f70d580cc115f797370437a41a0eeb7335e8278618415f7ba7268aae8102ba9ee8417723a731f677b7bf346773e5851f9021ff12bdec4305b436e589c24
commit e64a882879c7e8dcc12c3e0d7c4307222c4a2205
Author: Sandro <devel(a)penguinpee.nl>
Date: Sun Dec 24 12:24:56 2023 +0100
Fix Packit configuration
Bottles doesn't munge version ('v' prefix). Tell packit to use the plain
version for computing the download URL.
diff --git a/.packit.yaml b/.packit.yaml
index 2e9373e..7659433 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,5 +1,6 @@
upstream_project_url: https://github.com/bottlesdevs/Bottles
upstream_package_name: Bottles
+upstream_tag_template: "{version}"
downstream_package_name: bottles
copy_upstream_release_description: false
commit 893a1fbfccc7d22f83bdbf7fe9a867bed0fb2640
Author: Nikola Forró <nforro(a)redhat.com>
Date: Sun Dec 24 09:31:16 2023 +0100
Fix %forgesource
Signed-off-by: Nikola Forró <nforro(a)redhat.com>
diff --git a/bottles.spec b/bottles.spec
index a4cf6f0..1a1924d 100644
--- a/bottles.spec
+++ b/bottles.spec
@@ -10,6 +10,8 @@ BuildArch: noarch
# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96
ExcludeArch: s390x
+%global tag %{version}
+
%forgemeta
# The following two files are licensed as MIT:
4 months, 4 weeks