salimma pushed to ocaml-atd (rawhide). "Initial import (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 18:07:38 UTC
From b6419ba499dbaa49abacc98ca8afaeae2bf55e81 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel(a)michel-slm.name>
Date: Apr 30 2021 18:07:22 +0000
Subject: Initial import
Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name>
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9c38ac7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/atd-2.2.1.tar.gz
diff --git a/ocaml-atd.spec b/ocaml-atd.spec
new file mode 100644
index 0000000..c15e61a
--- /dev/null
+++ b/ocaml-atd.spec
@@ -0,0 +1,316 @@
+%global project_name atd
+%global forgeurl https://github.com/ahrefs/%{project_name}
+
+# Scala tests are failing
+# missing atds/test/argonaut_2.13-6.2.2.jar;
+# The tests only work with scala 2.11 or 2.12
+%bcond_with scala
+%bcond_without tests
+
+Name: ocaml-%{project_name}
+Version: 2.2.1
+Release: 2%{?dist}
+Summary: Static Types for Json APIs
+
+License: BSD
+URL: %{forgeurl}
+Source0: %{url}/archive/%{version}/%{project_name}-%{version}.tar.gz
+
+BuildRequires: ocaml
+BuildRequires: ocaml-dune
+BuildRequires: ocaml-menhir
+BuildRequires: ocaml-biniou-devel
+BuildRequires: ocaml-easy-format-devel
+BuildRequires: ocaml-re-devel
+BuildRequires: ocaml-yojson-devel
+%if %{with tests}
+BuildRequires: java-11-openjdk-devel
+%if %{with scala}
+BuildRequires: scala
+%endif
+%endif
+
+%description
+ATD stands for Adaptable Type Definitions. It is a syntax for defining
+cross-language data types. It is used as input to generate efficient and
+type-safe serializers, deserializers and validators. The current target
+languages are OCaml and Java.
+
+The following opam packages are provided by the atd project:
+
+* atdgen: executable that generates OCaml code dealing with json and
+ biniou data formats
+* atdj: executable that generates Java code dealing with json
+* atd: library for parsing atd files used by code generators
+
+
+%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}.
+
+
+%package -n ocaml-atdgen
+Summary: Generates efficient JSON serializers, deserializers and validators
+# Requires:
+
+%description -n ocaml-atdgen
+Atdgen is a command-line program that takes as input type definitions in the ATD
+syntax and produces OCaml code suitable for data serialization and
+deserialization. Two data formats are currently supported, these are biniou and
+JSON. Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or
+the other. Atdgen was designed with efficiency and durability in mind. Software
+authors are encouraged to use Atdgen directly and to write tools that may reuse
+part of Atdgen’s source code.
+
+
+%package -n ocaml-atdgen-devel
+Summary: Development files for ocaml-atdgen
+Requires: ocaml-atdgen%{?_isa} = %{version}-%{release}
+
+%description -n ocaml-atdgen-devel
+The ocaml-atdgen-devel package contains libraries and signature files for
+developing applications that use ocaml-atdgen.
+
+
+%package -n ocaml-atdj
+Summary: Java code generation for ATD
+# Requires:
+
+%description -n ocaml-atdj
+Atdj is a program that generates a Java interface from type definitions. In
+particular, given a set of ATD type definitions, this tool generates a set of
+Java classes representing those types with built-in JSON serializers and
+deserializers.
+
+The primary benefits of using the generated interface, over manually
+manipulating JSON strings from within Java, are safety and ease of use.
+Specifically, the generated interface offers the following features:
+
+- JSON strings are automatically checked for correctness with respect to the ATD
+ specification.
+
+- Details such as optional fields and their associated default values are
+ automatically handled.
+
+
+%if %{with scala}
+%package -n ocaml-atds
+Summary: ATD Code generator for Scala
+# Requires:
+
+%description -n ocaml-atds
+Atdj is a program that generates a Scala interface from type definitions. In
+particular, given a set of ATD type definitions, this tool generates a set of
+Scala classes representing those types with built-in JSON serializers and
+deserializers.
+
+The primary benefits of using the generated interface, over manually
+manipulating JSON strings from within Scala, are safety and ease of use.
+Specifically, the generated interface offers the following features:
+
+- JSON strings are automatically checked for correctness with respect to the ATD
+ specification.
+
+- Details such as optional fields and their associated default values are
+ automatically handled.
+%endif
+
+
+%package -n ocaml-atdgen-codec-runtime
+Summary: Runtime for atdgen generated bucklescript converters
+# Requires:
+
+%description -n ocaml-atdgen-codec-runtime
+This library contains the types that are used by atdgen's bucklescript backend.
+
+
+%package -n ocaml-atdgen-codec-runtime-devel
+Summary: Development files for ocaml-atdgen-codec-runtime
+Requires: ocaml-atdgen-codec-runtime%{?_isa} = %{version}-%{release}
+
+%description -n ocaml-atdgen-codec-runtime-devel
+The ocaml-atdgen-codec-runtime-devel package contains libraries and signature
+files for developing applications that use ocaml-atdgen-codec-runtime.
+
+
+%package -n ocaml-atdgen-runtime
+Summary: Runtime library for code generated by atdgen
+# Requires:
+
+%description -n ocaml-atdgen-runtime
+This package should be used only in conjunction with the stdgen code generator.
+
+
+%package -n ocaml-atdgen-runtime-devel
+Summary: Development files for ocaml-atdgen-runtime
+Requires: ocaml-atdgen-runtime%{?_isa} = %{version}-%{release}
+
+%description -n ocaml-atdgen-runtime-devel
+The ocaml-atdgen-runtime-devel package contains libraries and signature files
+for developing applications that use ocaml-atdgen-runtime.
+
+
+%prep
+%autosetup -p1 -n %{project_name}-%{version}
+%if %{with scala}
+%else
+rm atds.opam
+rm -rf atds
+%endif
+
+
+%build
+dune build %{?_smp_mflags} --verbose
+
+
+%install
+dune install --destdir=%{buildroot} --verbose
+
+# we are already packaging these properly
+rm -rf %{buildroot}%{_usr}/doc
+
+# atdj and atds do not ship libraries
+# dune has a known issue where it generates empty META files
+#
+# we actually don't need to ship devel files at all so remove
+# the directories entirely
+#
+# https://github.com/ocaml/dune/issues/2353
+rm -rf %{buildroot}%{_libdir}/ocaml/atd{j,s}
+
+
+%if %{with tests}
+%check
+dune runtest
+%endif
+
+
+%files
+%license LICENSE.md
+%doc CHANGES.md README.md
+%{_bindir}/atdcat
+%{_bindir}/cppo-json
+%{_libdir}/ocaml/atd
+%exclude %{_libdir}/ocaml/atd/dune-package
+%exclude %{_libdir}/ocaml/atd/opam
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/atd/*.a
+%exclude %{_libdir}/ocaml/atd/*.cmxa
+%exclude %{_libdir}/ocaml/atd/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/atd/*.ml
+%exclude %{_libdir}/ocaml/atd/*.mli
+
+
+%files devel
+%doc CODEOWNERS
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/atd/dune-package
+%{_libdir}/ocaml/atd/opam
+%{_libdir}/ocaml/atd/*.a
+%{_libdir}/ocaml/atd/*.cmxa
+%{_libdir}/ocaml/atd/*.cmx
+%endif
+%{_libdir}/ocaml/atd/*.ml
+%{_libdir}/ocaml/atd/*.mli
+
+
+%files -n ocaml-atdgen
+%{_bindir}/atdgen
+%{_bindir}/atdgen-cppo
+%{_libdir}/ocaml/atdgen
+%exclude %{_libdir}/ocaml/atdgen/dune-package
+%exclude %{_libdir}/ocaml/atdgen/opam
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/atdgen/*.a
+%exclude %{_libdir}/ocaml/atdgen/*.cmxa
+%exclude %{_libdir}/ocaml/atdgen/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/atdgen/*.ml
+
+
+%files -n ocaml-atdgen-devel
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/atdgen/dune-package
+%{_libdir}/ocaml/atdgen/opam
+%{_libdir}/ocaml/atdgen/*.a
+%{_libdir}/ocaml/atdgen/*.cmxa
+%{_libdir}/ocaml/atdgen/*.cmx
+%endif
+%{_libdir}/ocaml/atdgen/*.ml
+
+
+%files -n ocaml-atdj
+%{_bindir}/atdj
+
+
+%if %{with scala}
+%files -n ocaml-atds
+%{_bindir}/atds
+%{_libdir}/ocaml/atds
+%endif
+
+
+%files -n ocaml-atdgen-codec-runtime
+%{_libdir}/ocaml/atdgen-codec-runtime
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/dune-package
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/opam
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/*.a
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/*.cmxa
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/*.ml
+%exclude %{_libdir}/ocaml/atdgen-codec-runtime/*.mli
+
+
+%files -n ocaml-atdgen-codec-runtime-devel
+%{_libdir}/ocaml/atdgen-codec-runtime/dune-package
+%{_libdir}/ocaml/atdgen-codec-runtime/opam
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/atdgen-codec-runtime/*.a
+%{_libdir}/ocaml/atdgen-codec-runtime/*.cmxa
+%{_libdir}/ocaml/atdgen-codec-runtime/*.cmx
+%endif
+%{_libdir}/ocaml/atdgen-codec-runtime/*.ml
+%{_libdir}/ocaml/atdgen-codec-runtime/*.mli
+
+
+%files -n ocaml-atdgen-runtime
+%{_libdir}/ocaml/atdgen-runtime
+%exclude %{_libdir}/ocaml/atdgen-runtime/dune-package
+%exclude %{_libdir}/ocaml/atdgen-runtime/opam
+%ifarch %{ocaml_native_compiler}
+%exclude %{_libdir}/ocaml/atdgen-runtime/*.a
+%exclude %{_libdir}/ocaml/atdgen-runtime/*.cmxa
+%exclude %{_libdir}/ocaml/atdgen-runtime/*.cmx
+%endif
+%exclude %{_libdir}/ocaml/atdgen-runtime/*.ml
+%exclude %{_libdir}/ocaml/atdgen-runtime/*.mli
+
+
+%files -n ocaml-atdgen-runtime-devel
+%{_libdir}/ocaml/atdgen-runtime/dune-package
+%{_libdir}/ocaml/atdgen-runtime/opam
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/atdgen-runtime/*.a
+%{_libdir}/ocaml/atdgen-runtime/*.cmxa
+%{_libdir}/ocaml/atdgen-runtime/*.cmx
+%endif
+%{_libdir}/ocaml/atdgen-runtime/*.ml
+%{_libdir}/ocaml/atdgen-runtime/*.mli
+
+
+%changelog
+* Fri Apr 23 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2.2.1-2
+- Create subpackages per OPAM module
+- Optionally compile and test `atds`
+- Skip shipping empty META files; known Dune issue
+ https://github.com/ocaml/dune/issues/2353
+
+* Wed Apr 07 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2.2.1-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..e4ab2e1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (atd-2.2.1.tar.gz) = c59d9ef820339fec3736aab31647bcb06e5520a957e97850bbcbb6b27bc9ce2b8573decb2f4057e9e451583af8b9255cdea221aa51ec2109584256a5f50df04d
https://src.fedoraproject.org/rpms/ocaml-atd/c/b6419ba499dbaa49abacc98ca8...
2Â years, 10Â months
jskarvad pushed to pidgin (rawhide). "New version (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 17:57:28 UTC
From 88c5fbdd11ab370ac3536872f60536d89ab730aa Mon Sep 17 00:00:00 2001
From: Jaroslav Å karvada <jskarvad(a)redhat.com>
Date: Apr 30 2021 17:57:21 +0000
Subject: New version
Resolves: rhbz#1945753
---
diff --git a/.gitignore b/.gitignore
index b3b07e8..e67c5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1 @@
-pidgin-2.7.2.tar.bz2
-pidgin-2.7.3.tar.bz2
-/pidgin-2.7.4.tar.bz2
-/pidgin-2.7.5.tar.bz2
-/pidgin-2.7.7.tar.bz2
-/pidgin-2.7.9.tar.bz2
-/pidgin-2.7.10.tar.bz2
-/pidgin-2.7.11.tar.bz2
-/pidgin-2.8.0.tar.bz2
-/pidgin-2.9.0.tar.bz2
-/pidgin-2.10.0.tar.bz2
-/pidgin-2.10.1.tar.bz2
-/pidgin-2.10.2.tar.bz2
-/pidgin-2.10.4.tar.bz2
-/pidgin-2.10.5.tar.bz2
-/pidgin-2.10.6.tar.bz2
-/pidgin-2.10.7.tar.bz2
-/pidgin-2.10.9.tar.bz2
-/pidgin-2.10.10.tar.bz2
-/pidgin-2.10.11.tar.bz2
-/pidgin-2.10.12.tar.bz2
-/pidgin-2.11.0.tar.bz2
-/pidgin-2.12.0.tar.bz2
-/pidgin-2.13.0.tar.bz2
-/pidgin-2.14.1.tar.bz2
+/pidgin-*.tar.bz2
diff --git a/pidgin-2.13.0-drop-aim.patch b/pidgin-2.13.0-drop-aim.patch
deleted file mode 100644
index f5f674b..0000000
--- a/pidgin-2.13.0-drop-aim.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urNp pidgin-2.13.0.orig/libpurple/protocols/oscar/Makefile.am pidgin-2.13.0/libpurple/protocols/oscar/Makefile.am
---- pidgin-2.13.0.orig/libpurple/protocols/oscar/Makefile.am 2019-06-07 15:38:26.610979141 +0200
-+++ pidgin-2.13.0/libpurple/protocols/oscar/Makefile.am 2019-06-07 15:40:11.377723987 +0200
-@@ -51,25 +51,21 @@ OSCARSOURCES = \
-
- AM_CFLAGS = $(st)
-
--libaim_la_LDFLAGS = -module -avoid-version
- libicq_la_LDFLAGS = -module -avoid-version
- if STATIC_OSCAR
-
- st = -DPURPLE_STATIC_PRPL
- noinst_LTLIBRARIES = liboscar.la
--liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
-+liboscar_la_SOURCES = $(OSCARSOURCES) libicq.c
- liboscar_la_CFLAGS = $(AM_CFLAGS)
-
- else
-
- st =
--pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la
-+pkg_LTLIBRARIES = liboscar.la libicq.la
- liboscar_la_SOURCES = $(OSCARSOURCES)
- liboscar_la_LIBADD = $(GLIB_LIBS)
-
--libaim_la_SOURCES = libaim.c
--libaim_la_LIBADD = liboscar.la
--
- libicq_la_SOURCES = libicq.c
- libicq_la_LIBADD = liboscar.la
-
diff --git a/pidgin-2.13.0-fix-msn-ft-crashes.patch b/pidgin-2.13.0-fix-msn-ft-crashes.patch
deleted file mode 100644
index 8bfec09..0000000
--- a/pidgin-2.13.0-fix-msn-ft-crashes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libpurple/ft.c b/libpurple/ft.c
-index c15efcf..a9cadaf 100644
---- a/libpurple/ft.c
-+++ b/libpurple/ft.c
-@@ -1106,11 +1106,9 @@ purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize size)
- r = write(xfer->fd, buffer, s);
- if (r < 0 && errno == EAGAIN)
- r = 0;
-+ if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
-+ purple_xfer_set_completed(xfer, TRUE);
- }
-- if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer) &&
-- !purple_xfer_is_completed(xfer))
-- purple_xfer_set_completed(xfer, TRUE);
--
-
- return r;
- }
diff --git a/pidgin-2.14.1-autoconf-2.71-build-fix.patch b/pidgin-2.14.1-autoconf-2.71-build-fix.patch
deleted file mode 100644
index 718c047..0000000
--- a/pidgin-2.14.1-autoconf-2.71-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e27c4d7..8adf0cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,7 +257,7 @@ dnl #######################################################################
- AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
-
- if test x$enable_i18n = xyes; then
-- AC_PROG_INTLTOOL
-+AC_PROG_INTLTOOL
- GETTEXT_PACKAGE=pidgin
- AC_SUBST(GETTEXT_PACKAGE)
-
diff --git a/pidgin-2.14.1-do-not-disable-wall.patch b/pidgin-2.14.1-do-not-disable-wall.patch
deleted file mode 100644
index 9d1aa51..0000000
--- a/pidgin-2.14.1-do-not-disable-wall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24678ee..e27c4d7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1278,11 +1278,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FOR
-
- DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
- if test "x$GCC" = "xyes"; then
-- dnl We enable -Wall later.
-- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
-- dnl This leads to warnings we don't want.
-- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
--
- dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
- dnl
- dnl Future Possibilities
diff --git a/pidgin-2.14.1-valgrind.patch b/pidgin-2.14.1-valgrind.patch
deleted file mode 100644
index 31572f1..0000000
--- a/pidgin-2.14.1-valgrind.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
-index e9928cc..57244e2 100644
---- a/libpurple/Makefile.am
-+++ b/libpurple/Makefile.am
-@@ -283,8 +283,7 @@ libpurple_la_SOURCES = \
-
- noinst_HEADERS= \
- internal.h \
-- media/backend-fs2.h \
-- valgrind.h
-+ media/backend-fs2.h
-
- libpurpleincludedir=$(includedir)/libpurple
- libpurpleinclude_HEADERS = \
diff --git a/pidgin-2.14.4-do-not-disable-wall.patch b/pidgin-2.14.4-do-not-disable-wall.patch
new file mode 100644
index 0000000..4571a72
--- /dev/null
+++ b/pidgin-2.14.4-do-not-disable-wall.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 1fe32c3..470453c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1258,11 +1258,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FOR
+
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
+ if test "x$GCC" = "xyes"; then
+- dnl We enable -Wall later.
+- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
+- dnl This leads to warnings we don't want.
+- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
+-
+ dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
+ dnl
+ dnl Future Possibilities
diff --git a/pidgin-2.14.4-fix-msn-ft-crashes.patch b/pidgin-2.14.4-fix-msn-ft-crashes.patch
new file mode 100644
index 0000000..703c9f7
--- /dev/null
+++ b/pidgin-2.14.4-fix-msn-ft-crashes.patch
@@ -0,0 +1,18 @@
+diff --git a/libpurple/ft.c b/libpurple/ft.c
+index 89c9377..a672fc6 100644
+--- a/libpurple/ft.c
++++ b/libpurple/ft.c
+@@ -1107,11 +1107,9 @@ purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize size)
+ r = write(xfer->fd, buffer, s);
+ if (r < 0 && errno == EAGAIN)
+ r = 0;
++ if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
++ purple_xfer_set_completed(xfer, TRUE);
+ }
+- if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer) &&
+- !purple_xfer_is_completed(xfer))
+- purple_xfer_set_completed(xfer, TRUE);
+-
+
+ return r;
+ }
diff --git a/pidgin-2.14.4-valgrind.patch b/pidgin-2.14.4-valgrind.patch
new file mode 100644
index 0000000..ea5e01b
--- /dev/null
+++ b/pidgin-2.14.4-valgrind.patch
@@ -0,0 +1,14 @@
+diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
+index 2739cec..6f58739 100644
+--- a/libpurple/Makefile.am
++++ b/libpurple/Makefile.am
+@@ -282,8 +282,7 @@ libpurple_la_SOURCES = \
+
+ noinst_HEADERS= \
+ internal.h \
+- media/backend-fs2.h \
+- valgrind.h
++ media/backend-fs2.h
+
+ libpurpleincludedir=$(includedir)/libpurple
+ libpurpleinclude_HEADERS = \
diff --git a/pidgin.spec b/pidgin.spec
index 8d86036..1e991ab 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -124,8 +124,8 @@
%endif
Name: pidgin
-Version: 2.14.1
-Release: 5%{?dist}
+Version: 2.14.4
+Release: 1%{?dist}
License: BSD and GPLv2+ and GPLv2 and LGPLv2+ and MIT
# GPLv2+ - libpurple, finch, pidgin, most prpls
# GPLv2 - novell prpls
@@ -161,14 +161,12 @@ Source1: purple-fedora-prefs.xml
## Patches 0-99: Fedora specific or upstream wont accept
Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
-Patch1: pidgin-2.14.1-valgrind.patch
-Patch3: pidgin-2.13.0-drop-aim.patch
+Patch1: pidgin-2.14.4-valgrind.patch
## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.13.0-fix-msn-ft-crashes.patch
+Patch100: pidgin-2.14.4-fix-msn-ft-crashes.patch
# upstream ticket https://developer.pidgin.im/ticket/16593
-Patch102: pidgin-2.14.1-do-not-disable-wall.patch
-Patch103: pidgin-2.14.1-autoconf-2.71-build-fix.patch
+Patch102: pidgin-2.14.4-do-not-disable-wall.patch
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -465,7 +463,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
%patch0 -p1 -b .aplay
%endif
%patch1 -p1 -b .valgrind
-%patch3 -p1 -b .drop-aim
## Patches 100+: To be Included in Future Upstream
@@ -473,8 +470,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
%patch100 -p1 -b .ftcrash
# https://developer.pidgin.im/ticket/16593
%patch102 -p1 -b .do-not-disable-wall
-# https://issues.imfreedom.org/issue/PIDGIN-17509
-%patch103 -p1 -b .autoconf-2.71-build-fix
# Our preferences
cp %{SOURCE1} prefs.xml
@@ -636,7 +631,7 @@ find %{buildroot}/%{_libdir}/purple-2 -name \*.so\* -printf '%f|' | sed -e 's/|$
%{_datadir}/applications/pidgin.desktop
%{_datadir}/pixmaps/pidgin/
%{_datadir}/icons/hicolor/*/apps/pidgin.*
-%{_datadir}/appdata/pidgin.appdata.xml
+%{_datadir}/metainfo/pidgin.appdata.xml
%if %{split_evolution}
%files evolution
@@ -709,6 +704,10 @@ find %{buildroot}/%{_libdir}/purple-2 -name \*.so\* -printf '%f|' | sed -e 's/|$
%endif
%changelog
+* Fri Apr 30 2021 Jaroslav Å karvada <jskarvad(a)redhat.com> - 2.14.4-1
+- New version
+ Resolves: rhbz#1945753
+
* Tue Mar 30 2021 Jaroslav Å karvada <jskarvad(a)redhat.com> - 2.14.1-5
- Switched to upstream patch workarounding autoconf-2.71 bug
Related: rhbz#1943128
diff --git a/sources b/sources
index 3c46f37..e3cde06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pidgin-2.14.1.tar.bz2) = 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
+SHA512 (pidgin-2.14.4.tar.bz2) = 78550b7c4678242861bc0b0a3c32ab03c9fd6e4f509a9b83f872f2e201fe69617c8407d4cc90205e74598f1b8fdddfeddc8f59b47179524a7af7a241eaf1fa0b
https://src.fedoraproject.org/rpms/pidgin/c/88c5fbdd11ab370ac3536872f6053...
2Â years, 10Â months
suve pushed to lazarus (f33). "Update to 2.0.12"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 17:57:28 UTC
From 172752925aa20a077041085248f53d0e45695886 Mon Sep 17 00:00:00 2001
From: Artur Frenszek-Iwicki <fedora(a)svgames.pl>
Date: Apr 30 2021 17:55:00 +0000
Subject: Update to 2.0.12
---
diff --git a/.gitignore b/.gitignore
index 27ee784..67887c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ lazarus-0.9.28-src.tar.bz2
/lazarus-2.0.6.tar.gz
/lazarus-2.0.8.tar.gz
/lazarus-2.0.10-2.tar.gz
+/lazarus-2.0.12.tar.gz
diff --git a/Makefile_patch.diff b/Makefile_patch.diff
index 39b1f7e..17fe416 100644
--- a/Makefile_patch.diff
+++ b/Makefile_patch.diff
@@ -1,6 +1,7 @@
---- lazarus/Makefile.fpc 2017-10-18 09:51:34.000000000 +0200
-+++ lazarus/Makefile.fpc.patched 2019-02-08 19:55:55.499867322 +0100
-@@ -20,7 +20,7 @@
+--- lazarus-2.0.12--orig/lazarus/Makefile.fpc 2020-07-24 18:14:39.000000000 +0200
++++ lazarus-2.0.12--patched/lazarus/Makefile.fpc 2021-04-30 16:51:44.926870797 +0200
+@@ -19,18 +19,18 @@
+ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
[install]
fpcpackage=n
@@ -9,16 +10,19 @@
[dist]
destdir=$(BASEDIR)/dist
-@@ -28,7 +28,7 @@
+
[prerules]
RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
#
+ ifndef LAZARUS_INSTALL_DIR
-LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/share/lazarus
+LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/$(_LIB)/lazarus
INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
ifneq ($(findstring $(OS_TARGET),win32 win64),)
LAZARUS_INSTALL_DIR=C:\lazarus
-@@ -263,8 +263,9 @@
+ endif
+@@ -270,10 +270,11 @@
+ installbase:
ifneq ($(findstring $(OS_TARGET),win32 win64),)
else
@@ -29,3 +33,4 @@
$(MKDIR) $(INSTALL_PREFIX)/share/applications
$(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
$(MKDIR) $(INSTALL_PREFIX)/share/mime/packages
+ $(MKDIR) $(INSTALL_PREFIX)/share/icons/hicolor/48x48/mimetypes
diff --git a/lazarus.spec b/lazarus.spec
index 482c02d..09e152b 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,17 +1,19 @@
Name: lazarus
Summary: Lazarus Component Library and IDE for Freepascal
-Version: 2.0.10
-Release: 5%{?dist}
+Version: 2.0.12
+
+%global baserelease 1
+Release: %{baserelease}%{?dist}
# The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
%global qt5pas_version 2.6
-%global qt5pas_release %(relstr="%{version}.%{release}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*1000000 + ${relstr[1]}*10000 + ${relstr[2]}*100 + ${relstr[3]})); echo "${relno}%{?dist}";)
+%global qt5pas_release %(relstr="%{version}.%{baserelease}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*1000000 + ${relstr[1]}*10000 + ${relstr[2]}*100 + ${relstr[3]})); echo "${relno}%{?dist}";)
# GNU Classpath style exception, see COPYING.modifiedLGPL
License: GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
URL: http://www.lazarus-ide.org/
-Source0: https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZi...
+Source0: https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZi...
Source100: lazarus.appdata.xml
@@ -70,7 +72,7 @@ developing applications that use qt5pas.
%prep
%setup -c -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
@@ -163,6 +165,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%changelog
+* Fri Apr 30 2021 Artur Frenszek-Iwicki <fedora(a)svgames.pl> - 2.0.12-1
+- Update to 2.0.12
+- Use baserelease macro to fix the rpmdev-bumspec issues
+
* Sat Jan 16 2021 Artur Frenszek-Iwicki <fedora(a)svgames.pl> - 2.0.10-5
- Add an appdata file
diff --git a/sources b/sources
index 01c8841..53279b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lazarus-2.0.10-2.tar.gz) = a1dcac94646f75c9ab674b6f2db83d75bad76c81dcae10fe25b2901380a606765b34f2d43496939e27fdd092d30629c3116ea660b13b4a741ffdf37ff7752eae
+SHA512 (lazarus-2.0.12.tar.gz) = dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e
https://src.fedoraproject.org/rpms/lazarus/c/172752925aa20a077041085248f5...
2Â years, 10Â months
alexpl pushed to gucharmap (f32). "Update to 13.0.7 (#1955706)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 17:22:38 UTC
From 69383e6063cf2a7c91a369c78063a99efb086766 Mon Sep 17 00:00:00 2001
From: Alexander Ploumistos <alexpl(a)fedoraproject.org>
Date: Apr 30 2021 17:21:37 +0000
Subject: Update to 13.0.7 (#1955706)
---
diff --git a/.gitignore b/.gitignore
index 1059496..115c4aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/gucharmap-13.0.4.tar.bz2
/gucharmap-13.0.5.tar.bz2
/gucharmap-13.0.6.tar.bz2
+/gucharmap-13.0.7.tar.bz2
diff --git a/gucharmap.spec b/gucharmap.spec
index 2a4ed25..f7458d1 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -3,7 +3,7 @@
%define gtk3_version 3.15.9
Name: gucharmap
-Version: 13.0.6
+Version: 13.0.7
Release: 1%{?dist}
Summary: Unicode character picker and font browser
@@ -95,6 +95,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gucharmap.desktop
%{_datadir}/vala/vapi/gucharmap-2.90.vapi
%changelog
+* Fri Apr 30 2021 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 13.0.7-1
+- Update to 13.0.7 (#1955706)
+
* Sat Mar 20 2021 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 13.0.6-1
- Update to 13.0.6
- Drop gcc11 patch
diff --git a/sources b/sources
index beb8a18..5b07529 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gucharmap-13.0.6.tar.bz2) = 4f2d47c256ccd0bc0bb26d050d66da7720bcc484300137b87ccdf658c3badfbab251b0ed442fbd2b52b8b2471cefebf9ba565c3cdb0cf50306ad496fe9a2c0f8
+SHA512 (gucharmap-13.0.7.tar.bz2) = eb2ba8208a95249a7a5a03bb6ed7da1c6c534c6d18e7d32e282e278288cbb98bf4763bdfd08cdfb735c3b6627be6919f5d3dee3aaafceaf6fe8f902c9162b6a4
https://src.fedoraproject.org/rpms/gucharmap/c/69383e6063cf2a7c91a369c780...
2Â years, 10Â months