From 1f576592c4fa0f58f8ce41e9f989688e88127f9888773da327f4fb9402ce110f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Jul 2014 11:26:27 +0000 Subject: [PATCH 1/2] Accepting request 240827 from home:XRevan86 OBS-URL: https://build.opensuse.org/request/show/240827 OBS-URL: https://build.opensuse.org/package/show/filesystems/libmirage?expand=0&rev=28 --- libmirage-2.1.1.tar.xz | 3 -- libmirage-3.0.0.tar.bz2 | 3 ++ libmirage.changes | 5 +++ libmirage.spec | 95 ++++++++++++++--------------------------- 4 files changed, 41 insertions(+), 65 deletions(-) delete mode 100644 libmirage-2.1.1.tar.xz create mode 100644 libmirage-3.0.0.tar.bz2 diff --git a/libmirage-2.1.1.tar.xz b/libmirage-2.1.1.tar.xz deleted file mode 100644 index 2efd75b..0000000 --- a/libmirage-2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3743d979c8bb2118d1d74ded815e81138cb9f6124b19c4c2161200f15c82f05f -size 191732 diff --git a/libmirage-3.0.0.tar.bz2 b/libmirage-3.0.0.tar.bz2 new file mode 100644 index 0000000..4f3dda7 --- /dev/null +++ b/libmirage-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb0e0f0ed082efe03be4254d1be1310956652b1cec9fad10f9e602a088d17f84 +size 210658 diff --git a/libmirage.changes b/libmirage.changes index 0369117..0cd10b5 100644 --- a/libmirage.changes +++ b/libmirage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru + +- Update to 3.0.0 + ------------------------------------------------------------------- Sun Nov 24 11:18:45 UTC 2013 - jengelh@inai.de diff --git a/libmirage.spec b/libmirage.spec index ab60f5c..137f4b9 100644 --- a/libmirage.spec +++ b/libmirage.spec @@ -1,7 +1,7 @@ # # spec file for package libmirage # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,20 @@ Name: libmirage -%define lname libmirage9 -%define pname 2_1 +%define lname libmirage10 +%define pname 3_0 Summary: A CD-ROM image access library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Version: 2.1.1 +Version: 3.0.0 Release: 0 -Url: http://cdemu.sf.net/ +Url: http://cdemu.sourceforge.net/about/libmirage/ -#Freecode-URL: https://freecode.com/projects/cdemu-for-linux -#Git-Clone: git://git.code.sf.net/p/cdemu/code -#DL-URL: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 -Source: %name-%version.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: %{name}-%{version}.tar.bz2 BuildRequires: cmake >= 2.8.5 BuildRequires: pkgconfig >= 0.16 +BuildRequires: xz +BuildRequires: pkgconfig(bzip2) >= 1.0.0 BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gmodule-2.0) >= 2.28 BuildRequires: pkgconfig(gobject-2.0) >= 2.28 @@ -42,12 +40,6 @@ BuildRequires: pkgconfig(liblzma) >= 5.0.0 BuildRequires: pkgconfig(samplerate) >= 0.1.0 BuildRequires: pkgconfig(sndfile) >= 1.0.0 BuildRequires: pkgconfig(zlib) >= 1.2.0 -%if 0%{?fedora_version} -BuildRequires: bzip2-devel >= 1.0.0 -%else -BuildRequires: pkgconfig(bzip2) >= 1.0.0 -%endif -BuildRequires: xz %description A CD-ROM image access library part of the cdemu suite. @@ -56,29 +48,25 @@ libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. -%package -n %lname +%package -n %{lname} Summary: A CD-ROM image access library Group: System/Libraries # Technically Suggests:, but pretty useless without -Requires: libmirage-%pname >= %version +Requires: libmirage-%{pname} >= %{version} -%description -n %lname +%description -n %{lname} A CD-ROM image access library part of the cdemu suite. libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. -%package %pname +%package %{pname} Summary: CD-ROM image format plugins for libmirage Group: System/Libraries -%if 0%{?suse_version} Recommends: libmirage-data -%else -Requires: libmirage-data -%endif -%description %pname +%description %{pname} A CD-ROM image access library part of the cdemu suite. libmirage provides uniform access to the data stored in different @@ -90,7 +78,7 @@ This package provides the image format plugins for libmirage. %package devel Summary: Development files for libmirage, a CD-ROM image access library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel A CD-ROM image access library part of the cdemu suite. @@ -104,11 +92,9 @@ This package contains files needed to develop with libmirage. %package data Summary: MIME type definitions and documentation for libmirage Group: Development/Libraries/C and C++ -Requires(post): shared-mime-info -Requires(postun): shared-mime-info -%if 0%{?suse_version} >= 1140 +Requires(post): shared-mime-info +Requires(postun): shared-mime-info BuildArch: noarch -%endif %description data libmirage provides uniform access to the data stored in different @@ -117,11 +103,11 @@ file. This package contains the MIME type definitions and documentation. -%package -n typelib-1_0-libmirage-%pname +%package -n typelib-1_0-libmirage-%{pname} Summary: The libmirage CD-ROM image access library - introspection bindings Group: System/Libraries -%description -n typelib-1_0-libmirage-%pname +%description -n typelib-1_0-libmirage-%{pname} libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. @@ -132,54 +118,39 @@ This package provides the GObject Introspection bindings for libmirage. %setup -q %build -# gir is busted on 12.1 cmake . \ -%if 0%{?suse_version} == 1210 - -DINTROSPECTION_ENABLED=0 \ -%endif - -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_C_FLAGS:STRING="%optflags"; -make %{?_smp_mflags}; + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ + -DCMAKE_C_FLAGS:STRING="%{optflags}" +make %{?_smp_mflags} %install -b="%buildroot"; -make install DESTDIR="$b"; +make install DESTDIR=%{buildroot} -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig - -%post data -update-mime-database %{_datadir}/mime || :; - -%postun data -update-mime-database %{_datadir}/mime || :; +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) -%_libdir/libmirage.so.9* +%{_libdir}/libmirage.so.10* %files %pname %defattr(-,root,root) -%_libdir/libmirage-2.1/ +%{_libdir}/libmirage-3.0/ %files data %defattr(-,root,root) -%_datadir/gtk-doc/ -%_datadir/mime/packages/* +%{_datadir}/gtk-doc/ +%{_datadir}/mime/packages/* %files devel %defattr(-,root,root) -%_includedir/libmirage/ -%_libdir/libmirage.so -%_libdir/pkgconfig/libmirage.pc -%if 0%{?suse_version} != 1210 -%_datadir/gir-1.0 -%endif +%{_includedir}/libmirage-3.0/ +%{_libdir}/libmirage.so +%{_libdir}/pkgconfig/libmirage.pc +%{_datadir}/gir-1.0 -%if 0%{?suse_version} != 1210 %files -n typelib-1_0-libmirage-%pname %defattr(-,root,root) -%_libdir/girepository-1.0 -%endif +%{_libdir}/girepository-1.0 %changelog From 02ccec71a79ec140297328ac87fe7806d3e7e45418568fa165dd766a4639468d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Jul 2014 11:32:06 +0000 Subject: [PATCH 2/2] Restore style and metadata fields, and add a changelog entry OBS-URL: https://build.opensuse.org/package/show/filesystems/libmirage?expand=0&rev=29 --- libmirage.changes | 7 ++++++- libmirage.spec | 50 +++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/libmirage.changes b/libmirage.changes index 0cd10b5..4548c64 100644 --- a/libmirage.changes +++ b/libmirage.changes @@ -1,7 +1,12 @@ ------------------------------------------------------------------- Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru -- Update to 3.0.0 +- Update to new upstream release 3.0.0 +* The file access and filter stream layer in libMirage were + revised to allow implementation of filters for both reading and + writing, and an infrastructure for implementing image writers + was added, along with reference implementations for ISO and TOC + writers. ------------------------------------------------------------------- Sun Nov 24 11:18:45 UTC 2013 - jengelh@inai.de diff --git a/libmirage.spec b/libmirage.spec index 137f4b9..8bf8ac9 100644 --- a/libmirage.spec +++ b/libmirage.spec @@ -24,12 +24,12 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ Version: 3.0.0 Release: 0 -Url: http://cdemu.sourceforge.net/about/libmirage/ +Url: http://cdemu.sf.net/about/libmirage/ -Source: %{name}-%{version}.tar.bz2 +#Git-Clone: git://git.code.sf.net/p/cdemu/code +Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 BuildRequires: cmake >= 2.8.5 BuildRequires: pkgconfig >= 0.16 -BuildRequires: xz BuildRequires: pkgconfig(bzip2) >= 1.0.0 BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gmodule-2.0) >= 2.28 @@ -48,25 +48,25 @@ libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. -%package -n %{lname} +%package -n %lname Summary: A CD-ROM image access library Group: System/Libraries # Technically Suggests:, but pretty useless without -Requires: libmirage-%{pname} >= %{version} +Requires: libmirage-%pname >= %version -%description -n %{lname} +%description -n %lname A CD-ROM image access library part of the cdemu suite. libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. -%package %{pname} +%package %pname Summary: CD-ROM image format plugins for libmirage Group: System/Libraries Recommends: libmirage-data -%description %{pname} +%description %pname A CD-ROM image access library part of the cdemu suite. libmirage provides uniform access to the data stored in different @@ -78,7 +78,7 @@ This package provides the image format plugins for libmirage. %package devel Summary: Development files for libmirage, a CD-ROM image access library Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel A CD-ROM image access library part of the cdemu suite. @@ -103,11 +103,11 @@ file. This package contains the MIME type definitions and documentation. -%package -n typelib-1_0-libmirage-%{pname} +%package -n typelib-1_0-libmirage-%pname Summary: The libmirage CD-ROM image access library - introspection bindings Group: System/Libraries -%description -n typelib-1_0-libmirage-%{pname} +%description -n typelib-1_0-libmirage-%pname libmirage provides uniform access to the data stored in different image formats by creating a representation of disc stored in image file. @@ -119,38 +119,38 @@ This package provides the GObject Introspection bindings for libmirage. %build cmake . \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_C_FLAGS:STRING="%{optflags}" + -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ + -DCMAKE_C_FLAGS:STRING="%optflags" make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +make install DESTDIR="%buildroot" -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) -%{_libdir}/libmirage.so.10* +%_libdir/libmirage.so.10* %files %pname %defattr(-,root,root) -%{_libdir}/libmirage-3.0/ +%_libdir/libmirage-3.0/ %files data %defattr(-,root,root) -%{_datadir}/gtk-doc/ -%{_datadir}/mime/packages/* +%_datadir/gtk-doc/ +%_datadir/mime/packages/* %files devel %defattr(-,root,root) -%{_includedir}/libmirage-3.0/ -%{_libdir}/libmirage.so -%{_libdir}/pkgconfig/libmirage.pc -%{_datadir}/gir-1.0 +%_includedir/libmirage-3.0/ +%_libdir/libmirage.so +%_libdir/pkgconfig/libmirage.pc +%_datadir/gir-1.0 %files -n typelib-1_0-libmirage-%pname %defattr(-,root,root) -%{_libdir}/girepository-1.0 +%_libdir/girepository-1.0 %changelog