From 21d92d7c922206d1c8aaba7e5937308b577b9dcb7a2f1f2b0e0bbe7e0096a343 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 6 Mar 2018 22:32:16 +0000 Subject: [PATCH 1/2] Accepting request 583637 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583637 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=45 --- gegl.changes | 5 +++++ gegl.spec | 18 +++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gegl.changes b/gegl.changes index 3df444c..26f4f9a 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:26:18 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Wed Jan 24 12:59:26 UTC 2018 - pgajdos@suse.com diff --git a/gegl.spec b/gegl.spec index a34908f..8c498da 100644 --- a/gegl.spec +++ b/gegl.spec @@ -21,9 +21,9 @@ Name: gegl Version: 0.2.0 Release: 0 Summary: Generic Graphics Library -License: GPL-3.0+ and LGPL-3.0+ +License: GPL-3.0-or-later AND LGPL-3.0-or-later Group: System/Libraries -Url: http://gegl.org/ +URL: http://gegl.org/ Source: http://ftp.gtk.org/pub/gegl/0.2/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gegl-lua52.patch bgo#667675 vuntz@opensuse.org -- Fix build with lua 5.2 Patch0: gegl-lua52.patch @@ -68,7 +68,6 @@ BuildRequires: lua-devel BuildRequires: ruby # For umfpack BuildRequires: suitesparse-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) @@ -177,7 +176,7 @@ export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %if ! 0%{?BUILD_ORIG} for MODULE in \ %{_libdir}/gegl-0.2/ff-load.so \ @@ -189,15 +188,12 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-0.2 %{?no_lang_C} %post -n libgegl-0_2-0 -p /sbin/ldconfig - %postun -n libgegl-0_2-0 -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/gegl %files 0_2 -%defattr(-,root,root) %dir %{_libdir}/gegl-0.2/ %{_libdir}/gegl-0.2/*.so %if 0%{?BUILD_ORIG} @@ -205,27 +201,23 @@ find %{buildroot} -type f -name "*.la" -delete -print %exclude %{_libdir}/gegl-0.2/ff-load.so %files 0_2-orig-addon -%defattr(-,root,root) %{_libdir}/gegl-0.2/ff-load.so %endif %endif %files -n libgegl-0_2-0 -%defattr(-,root,root) -%doc AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_libdir}/libgegl-0.2.so.* %files devel -%defattr(-,root,root) %{_includedir}/gegl-0.2/ %{_libdir}/libgegl-0.2.so %{_libdir}/pkgconfig/gegl-0.2.pc %files doc -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/gegl/ %files -n %{name}-0_2-lang -f %{name}-0.2.lang -%defattr(-,root,root) %changelog From ccb1066c5007a975201d7ea73e8781e55582c36c61075c71ce870cfce12077e9 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 8 Mar 2018 16:05:37 +0000 Subject: [PATCH 2/2] Accepting request 583838 from home:jengelh:branches:graphics - Fix SRPM group. Update descriptions. Remove idempotent %if..%endif around %package. OBS-URL: https://build.opensuse.org/request/show/583838 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=46 --- gegl.changes | 6 ++++++ gegl.spec | 46 ++++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/gegl.changes b/gegl.changes index 26f4f9a..ec72723 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 7 10:35:17 UTC 2018 - jengelh@inai.de + +- Fix SRPM group. Update descriptions. Remove idempotent + %if..%endif around %package. + ------------------------------------------------------------------- Wed Feb 28 16:26:18 UTC 2018 - dimstar@opensuse.org diff --git a/gegl.spec b/gegl.spec index 8c498da..9994110 100644 --- a/gegl.spec +++ b/gegl.spec @@ -22,8 +22,8 @@ Version: 0.2.0 Release: 0 Summary: Generic Graphics Library License: GPL-3.0-or-later AND LGPL-3.0-or-later -Group: System/Libraries -URL: http://gegl.org/ +Group: Productivity/Graphics/Other +Url: http://gegl.org/ Source: http://ftp.gtk.org/pub/gegl/0.2/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gegl-lua52.patch bgo#667675 vuntz@opensuse.org -- Fix build with lua 5.2 Patch0: gegl-lua52.patch @@ -83,8 +83,8 @@ Provides: patched_subset %endif %description -GEGL provides infrastructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. @@ -94,41 +94,36 @@ Group: System/Libraries Recommends: %{name}-0_2-lang %description 0_2 -GEGL provides infrastructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. -%if 0%{?BUILD_ORIG} -%if 0%{?BUILD_ORIG_ADDON} %package 0_2-orig-addon Summary: Generic Graphics Library Group: System/Libraries Supplements: packageand(%{name}-0_2:%(cd %{_libdir} ; rpm -qf --queryformat=%%{NAME} `readlink %{_libdir}/libavcodec.so` )) %description 0_2-orig-addon -GEGL provides infrastructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. -%endif -%endif - %package -n libgegl-0_2-0 Summary: Generic Graphics Library Group: System/Libraries Recommends: %{name}-0_2 >= %{version} %description -n libgegl-0_2-0 -GEGL provides infrastructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. %package devel -Summary: Generic Graphics Library -Group: System/Libraries +Summary: Development files for GEGL, the "Generic Graphics Library" +Group: Development/Libraries/C and C++ Requires: babl-devel Requires: glib2-devel Requires: glibc-devel @@ -136,22 +131,25 @@ Requires: libgegl-0_2-0 = %{version} Requires: pcre-devel %description devel -GEGL provides infratructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. +This subpackage contains the C headers for the GEGL API. + %package doc -Summary: Generic Graphics Library -Group: System/Libraries -Requires: libgegl-0_2-0 = %{version} +Summary: Documentation for GEGL, the "Generic Graphics Library" +Group: Documentation/HTML %description doc -GEGL provides infrastructure to do demand based cached non destructive -image editing on larger than RAM buffers. Through babl it provides +GEGL provides infrastructure to do demand-based cached non-destructive +image editing on larger than RAM buffers. Through babl, it provides support for a wide range of color models and pixel storage formats for input and output. +This subpackage contains the documentation for GEGL. + %lang_package -n %{name}-0_2 %prep