Accepting request 515209 from filesystems

OBS-URL: https://build.opensuse.org/request/show/515209
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmirage?expand=0&rev=17

01_g_assert_nonnull.diff

@@ -1,52 +0,0 @@
-Index: libmirage-3.0.5/images/image-ccd/parser.c
-===================================================================
---- libmirage-3.0.5.orig/images/image-ccd/parser.c	2016-10-19 20:45:47.238020045 +0200
-+++ libmirage-3.0.5/images/image-ccd/parser.c	2016-10-19 20:46:38.188531986 +0200
-@@ -927,7 +927,7 @@
- 
-     CCD_RegexRule *new_rule = g_new(CCD_RegexRule, 1);
-     new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
--    g_assert_nonnull(new_rule->regex);
-+    g_assert(new_rule->regex != NULL);
-     new_rule->callback_func = callback;
-     /* Append to the list */
-     list = g_list_append(list, new_rule);
-Index: libmirage-3.0.5/images/image-cue/parser.c
-===================================================================
---- libmirage-3.0.5.orig/images/image-cue/parser.c	2016-10-19 20:45:47.238020045 +0200
-+++ libmirage-3.0.5/images/image-cue/parser.c	2016-10-19 20:46:38.188531986 +0200
-@@ -767,7 +767,7 @@
- 
-     CUE_RegexRule *new_rule = g_new(CUE_RegexRule, 1);
-     new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
--    g_assert_nonnull(new_rule->regex);
-+    g_assert(new_rule->regex != NULL);
-     new_rule->callback_func = callback;
-     /* Append to the list */
-     list = g_list_append(list, new_rule);
-Index: libmirage-3.0.5/images/image-toc/parser.c
-===================================================================
---- libmirage-3.0.5.orig/images/image-toc/parser.c	2016-10-19 20:45:47.238020045 +0200
-+++ libmirage-3.0.5/images/image-toc/parser.c	2016-10-19 20:46:38.188531986 +0200
-@@ -863,7 +863,7 @@
- 
-     TOC_RegexRule *new_rule = g_new(TOC_RegexRule, 1);
-     new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
--    g_assert_nonnull(new_rule->regex);
-+    g_assert(new_rule->regex != NULL);
-     new_rule->callback_func = callback;
-     /* Append to the list */
-     list = g_list_append(list, new_rule);
-Index: libmirage-3.0.5/images/image-xcdroast/parser.c
-===================================================================
---- libmirage-3.0.5.orig/images/image-xcdroast/parser.c	2016-10-19 20:45:47.238020045 +0200
-+++ libmirage-3.0.5/images/image-xcdroast/parser.c	2016-10-19 20:46:38.188531986 +0200
-@@ -496,7 +496,7 @@
- 
-     XCDROAST_RegexRule *new_rule = g_new(XCDROAST_RegexRule, 1);
-     new_rule->regex = g_regex_new(rule, G_REGEX_OPTIMIZE, 0, NULL);
--    g_assert_nonnull(new_rule->regex);
-+    g_assert(new_rule->regex != NULL);
-     new_rule->callback_func = callback;
-     /* Append to the list */
-     list = g_list_append(list, new_rule);

libmirage-3.0.5-glib-2.28-workaround.patch

@@ -1,71 +0,0 @@
---- a/images/image-ccd/parser.c	2016-10-10 02:01:03.000000000 +0100
-+++ b/images/image-ccd/parser.c	2017-03-20 02:40:11.000000000 +0100
-@@ -1033,7 +1033,7 @@
-         gsize line_length;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
---- a/images/image-cue/parser.c	2016-10-10 02:01:03.000000000 +0100
-+++ b/images/image-cue/parser.c	2017-03-20 02:40:56.000000000 +0100
-@@ -839,7 +839,7 @@
-         gsize line_length;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
---- a/images/image-toc/parser.c	2016-10-10 02:01:03.000000000 +0100
-+++ b/images/image-toc/parser.c	2017-03-20 02:42:21.000000000 +0100
-@@ -1007,7 +1007,7 @@
-         GMatchInfo *match_info = NULL;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
-@@ -1166,7 +1166,7 @@
-         GMatchInfo *match_info = NULL;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
---- a/images/image-xcdroast/parser.c	2016-10-10 02:01:03.000000000 +0100
-+++ b/images/image-xcdroast/parser.c	2017-03-20 02:42:52.000000000 +0100
-@@ -587,7 +587,7 @@
-         gsize line_length;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
-@@ -670,7 +670,7 @@
-         gsize line_length;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {
-@@ -766,7 +766,7 @@
-         GMatchInfo *match_info = NULL;
- 
-         /* Read line */
--        line_string = g_data_input_stream_read_line_utf8(data_stream, &line_length, NULL, &local_error);
-+        line_string = g_data_input_stream_read_line(data_stream, &line_length, NULL, &local_error);
- 
-         /* Handle error */
-         if (!line_string) {

libmirage-3.0.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:225af44a447e4cc968ca1fa09c0939f5674072a0f91d71c73cd3aab83ded8e07
-size 210651

libmirage-3.1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b67ecc1056cf1986321d637f1a52cb36b0f5bec4fac08fd9c71075dcb7dd7363
+size 234649

libmirage.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Aug  7 13:30:23 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 3.1.0
+  * Avoid using g_assert_nonnull() to keep compatibility with
+    glib <= 2.40.
+  * Adjusted bundled MIME types to prevent false positives.
+  * Added infrastructure for localization support.
+  * Slovenian and Russian translations.
+  * Improved compile-time checks of arguments passed to debug
+    message functions.
+  * Explicitly specify minimum required zlib version (1.2.4).
+  * Fixed acquisition of underlying streams in DMG ans ISZ filters.
+- Drop 01_g_assert_nonnull.diff,
+  libmirage-3.0.5-glib-2.28-workaround.patch
+  (integrated upstream)
+
 -------------------------------------------------------------------
 Sat Apr 06 08:39:43 UTC 2017 - zenitur@ya.ru
 

libmirage.spec

@@ -17,36 +17,32 @@
 
 
 Name:           libmirage
-%define lname   libmirage10
+%define lname   libmirage11
-%define pname	3_0
+%define pname	3_1
 Summary:        A CD-ROM image access library
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
-Version:        3.0.5
+Version:        3.1.0
 Release:        0
 Url:            http://cdemu.sf.net/about/libmirage/
 
 #Git-Clone:     git://git.code.sf.net/p/cdemu/code
 Source:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
-# A patch taken from Cdemu PPA
-Patch1:         01_g_assert_nonnull.diff
-# SLES 11 is still supported
-%if 0%{?sles_version} && 0%{?suse_version} == 1110
-Patch2:         libmirage-3.0.5-glib-2.28-workaround.patch
-# Dependencies list in an old style
 BuildRequires:  cmake >= 2.8.5
+BuildRequires:  intltool >= 0.21
+BuildRequires:  pkg-config >= 0.16
+%if 0%{?sles_version} && 0%{?suse_version} == 1110
+# SLES 11 is still supported
+# Dependencies list in an old style
 BuildRequires:  glib2-devel >= 2.28
 BuildRequires:  gtk-doc >= 1.4
 BuildRequires:  libbz2-devel >= 1.0.0
 BuildRequires:  libsamplerate-devel >= 0.1.0
 BuildRequires:  libsndfile-devel >= 1.0.0
-BuildRequires:  pkg-config >= 0.16
 BuildRequires:  shared-mime-info
 BuildRequires:  xz-devel >= 5.0.0
-BuildRequires:  zlib-devel >= 1.2.0
+BuildRequires:  zlib-devel >= 1.2.4
 %else
-BuildRequires:  cmake >= 2.8.5
-BuildRequires:  pkg-config >= 0.16
 BuildRequires:  pkgconfig(bzip2) >= 1.0.0
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 BuildRequires:  pkgconfig(gmodule-2.0) >= 2.28
@@ -57,8 +53,9 @@ BuildRequires:  pkgconfig(liblzma) >= 5.0.0
 BuildRequires:  pkgconfig(samplerate) >= 0.1.0
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sndfile) >= 1.0.0
-BuildRequires:  pkgconfig(zlib) >= 1.2.0
+BuildRequires:  pkgconfig(zlib) >= 1.2.4
 %endif
+Recommends:     %name-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -68,6 +65,16 @@ libmirage provides uniform access to the data stored in different
 image formats by creating a representation of disc stored in image
 file.
 
+%package lang
+Summary:        Translations for libmirage
+Group:          System/Localization
+Provides:       %name-lang-all = %version
+Supplements:    packageand(bundle-lang-other:%lname)
+BuildArch:      noarch
+
+%description lang
+Provides translations for the "%name" package.
+
 %package -n %lname
 Summary:        A CD-ROM image access library
 # Technically Suggests:, but pretty useless without
@@ -139,10 +146,6 @@ This package provides the GObject Introspection bindings for libmirage.
 
 %prep
 %setup -q
-%patch1 -p1
-%if 0%{?sles_version} && 0%{?suse_version} == 1110
-%patch2 -p1
-%endif
 
 %build
 %cmake -DCMAKE_MODULE_LINKER_FLAGS=""
@@ -150,31 +153,32 @@ make %{?_smp_mflags}
 
 %install
 %cmake_install
+%find_lang %name
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %post data
 %if 0%{?sles_version} && 0%{?suse_version} == 1110
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime >/dev/null || :
 %else
 %mime_database_post
 %endif
 
 %postun data
 %if 0%{?sles_version} && 0%{?suse_version} == 1110
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime >/dev/null || :
 %else
 %mime_database_postun
 %endif
 
 %files -n %lname
 %defattr(-,root,root)
-%_libdir/libmirage.so.10*
+%_libdir/libmirage.so.11*
 
 %files %pname
 %defattr(-,root,root)
-%_libdir/libmirage-3.0/
+%_libdir/libmirage-3.1/
 
 %files data
 %defattr(-,root,root)
@@ -183,12 +187,15 @@ make %{?_smp_mflags}
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libmirage-3.0/
+%_includedir/libmirage-3.1/
 %_libdir/libmirage.so
 %_libdir/pkgconfig/libmirage.pc
 %if 0%{?suse_version} > 1110
 %_datadir/gir-1.0
 
+%files lang -f %name.lang
+%defattr(-,root,root)
+
 %files -n typelib-1_0-libmirage-%pname
 %defattr(-,root,root)
 %_libdir/girepository-1.0