Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	inkscape.spec
@@ -1,18 +1,12 @@ Name: inkscape -Version: 0.91 -Release: 30.%{?dist} +Version: 0.92.2 +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -Patch0: inkscape-0.48.2-types.patch -Patch15: inkscape-0.91-desktop.patch - -%if 0%{?fedora} && 0%{?fedora} < 18 -%define desktop_vendor fedora -%endif BuildRequires: atk-devel BuildRequires: desktop-file-utils @@ -41,6 +35,7 @@ BuildRequires: popt-devel # We detect new poppler in inkscape-0.48.2-poppler_020.patch BuildRequires: automake +BuildRequires: cmake # Disable all for now. TODO: Be smarter %if 0 @@ -101,6 +96,7 @@ Group: Applications/Productivity # the package requires libperl.so, so it also has to require this: Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: inkscape = %{version}-%{release} %description view Viewer for files in W3C standard Scalable Vector Graphics (SVG) file @@ -119,8 +115,6 @@ %prep %setup -q -%patch0 -p1 -b .types -%patch15 -p1 -b .desktop # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -142,20 +136,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DWITH_GNOME_VFS:BOOL=OFF . make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT +sed -i 's/Drawing Shortcut Group/X-Drawing Shortcut Group/g' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +find $RPM_BUILD_ROOT -type f -name 'lib.a' \| xargs rm -f desktop-file-install --vendor="%{?desktop_vendor}" --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -211,8 +201,9 @@ %{_datadir}/inkscape/ui %{_datadir}/applications/inkscape.desktop %{_datadir}/icons/hicolor///inkscape* +%dir %{_prefix}/lib/inkscape +%{_prefix}/lib/inkscape/lib.so %{_mandir}//gz -%{_mandir}///gz %exclude %{_mandir}/man1/inkview.1* %doc AUTHORS COPYING ChangeLog NEWS README @@ -232,6 +223,9 @@ %changelog +* Thu Aug 24 2017 Jan Horak <jhorak@redhat.com> - 0.92.2-2 +- Rebase to version 0.92.2 + * Fri Apr 1 2016 Jan Horak <jhorak@redhat.com> - 0.91-2 - Rebase to version 0.91
[-] [+]	Deleted	inkscape-0.48.2-types.patch ^
@@ -1,17 +0,0 @@ -From: Lubomir Rintel <lkundrak@v3.sk> - -https://bugzilla.redhat.com/show_bug.cgi?id=458845 - -Index: inkscape-0.48.2/inkscape.desktop.in -=================================================================== ---- inkscape-0.48.2.orig/inkscape.desktop.in -+++ inkscape-0.48.2/inkscape.desktop.in -@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphi - _Comment=Create and edit Scalable Vector Graphics images - Type=Application - Categories=Graphics;VectorGraphics;GTK; --MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; -+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr; - Exec=inkscape %F - TryExec=inkscape - Terminal=false
[-] [+]	Deleted	inkscape-0.91-desktop.patch ^
@@ -1,11 +0,0 @@ ---- inkscape-0.91/inkscape.desktop.in~ 2015-01-29 09:53:06.000000000 -0600 -+++ inkscape-0.91/inkscape.desktop.in 2015-01-29 09:54:08.680065820 -0600 -@@ -14,7 +14,7 @@ - Icon=inkscape - X-Ayatana-Desktop-Shortcuts=Drawing - --[Drawing Shortcut Group] -+[X-Drawing Shortcut Group] - _Name=New Drawing - Exec=inkscape - TargetEnvironment=Unity
	Changed	inkscape-0.92.2.tar.bz2 ^