Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at 2015-09-08 17:46:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlterm (Old) and /work/SRC/openSUSE:Factory/.mlterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlterm" Changes: -------- --- /work/SRC/openSUSE:Factory/mlterm/mlterm.changes 2015-05-15 09:03:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mlterm.new/mlterm.changes 2015-09-08 18:12:09.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 7 16:55:03 CEST 2015 - ti...@suse.de + +- Run spec-cleaner +- Disable scim and uim plugins for SLE12 and openSUSE Leap builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.OU19sB/_old 2015-09-08 18:12:18.000000000 +0200 +++ /var/tmp/diff_new_pack.OU19sB/_new 2015-09-08 18:12:18.000000000 +0200 @@ -17,37 +17,44 @@ Name: mlterm +Version: 3.4.5 +Release: 0 +Summary: Multilingual Terminal Emulator for X +License: BSD-3-Clause +Group: System/X11/Terminals +Url: http://mlterm.sourceforge.net/ +# cvs -d :pserver:anonym...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm login +# (hit Enter) +# cvs -d :pserver:anonym...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm checkout mlterm +# cvs -z3 -d:ext:mfab...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm co mlterm +# tar jcvf mlterm-2.7.0.tar.bz2 mlterm +Source0: http://downloads.sourceforge.net/project/mlterm/01release/%{name}-%{version}/%{name}-%{version}.tar.gz +Source10: %{name}.desktop +Source11: %{name}.png +Patch0: etc.patch BuildRequires: coreutils BuildRequires: fribidi-devel BuildRequires: gcc-c++ BuildRequires: gtk2-devel BuildRequires: m17n-lib-devel +%if 0%{?suse_version} != 1315 BuildRequires: scim-devel BuildRequires: uim-devel +%endif BuildRequires: update-desktop-files BuildRequires: wordcut-devel +Provides: locale(xorg-x11:ja;ko;zh;ar;he) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 BuildRequires: utempter-devel %else BuildRequires: utempter %endif -Provides: locale(xorg-x11:ja;ko;zh;ar;he) -Version: 3.4.5 -Release: 0 -Url: http://mlterm.sourceforge.net/ -# cvs -d :pserver:anonym...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm login -# (hit Enter) -# cvs -d :pserver:anonym...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm checkout mlterm -# cvs -z3 -d:ext:mfab...@mlterm.cvs.sourceforge.net:/cvsroot/mlterm co mlterm -# tar jcvf mlterm-2.7.0.tar.bz2 mlterm -Source0: http://downloads.sourceforge.net/project/mlterm/01release/%{name}-%{version}/%{name}-%{version}.tar.gz -Source10: %name.desktop -Source11: %name.png -Patch0: etc.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Multilingual Terminal Emulator for X -License: BSD-3-Clause -Group: System/X11/Terminals +%if 0%{?suse_version} == 1315 +# for migration +Obsoletes: mlterm-scim +Obsoletes: mlterm-uim +%endif %description Mlterm is a multilingual terminal emulator for the X Window System. @@ -84,55 +91,33 @@ * scrollbar plug-in API (unstable) - - -Authors: --------- - Araki Ken <j00v0...@ip.media.kyoto-u.ac.jp> - -%package -n mlterm-scim +%if 0%{?suse_version} != 1315 +%package scim Summary: SCIM plugin for mlterm Group: System/X11/Terminals Provides: locale(scim:ja;ko;ar;he) -%description -n mlterm-scim +%description scim A plugin to use the SCIM input methods directly from mlterm. - - -Authors: --------- - Araki Ken <j00v0...@ip.media.kyoto-u.ac.jp> - -%package -n mlterm-uim +%package uim Summary: An uim plugin for mlterm Group: System/X11/Terminals Provides: locale(uim:ja;ko;ar;he) -%description -n mlterm-uim +%description uim A plugin to use the uim input methods directly from mlterm. +%endif - - -Authors: --------- - Araki Ken <j00v0...@ip.media.kyoto-u.ac.jp> - -%package -n mlterm-m17n +%package m17n Summary: A m17n plugin for mlterm Group: System/X11/Terminals Provides: locale(m17n:ja;ko;zh;ar;he) -%description -n mlterm-m17n +%description m17n A plugin to use the m17n input methods directly from mlterm. - - -Authors: --------- - Araki Ken <j00v0...@ip.media.kyoto-u.ac.jp> - -%define pixmapdir /usr/share/pixmaps +%define pixmapdir %{_datadir}/pixmaps %prep %setup -q @@ -140,37 +125,40 @@ rm -rf doc/{en,ja}/*win32 %build -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing $(/usr/bin/freetype-config --cflags) -DUSE_UTMP" +export CFLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing $(%{_bindir}/freetype-config --cflags) -DUSE_UTMP" %configure --enable-static=no \ - --prefix=/usr \ + --prefix=%{_prefix} \ --libexecdir=%{_libdir}/mlterm \ - --sysconfdir=/etc/X11 \ + --sysconfdir=%{_sysconfdir}/X11 \ --enable-anti-alias \ --enable-fribidi \ - --enable-uim \ --enable-m17nlib \ +%if 0%{?suse_version} != 1315 + --enable-scim \ + --enable-uim \ +%endif --with-tools=mlclient,mlconfig,mlterm-menu,mlcc,mlterm-zoom,mlimgloader \ --with-scrollbars=sample,extra \ - --with-type-engines=xcore,xft \ - --enable-scim -make %{?jobs:-j %jobs} + --with-type-engines=xcore,xft + +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{pixmapdir} -install -m 644 doc/icon/mlterm*xpm $RPM_BUILD_ROOT%{pixmapdir} -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{pixmapdir} -install -m 644 contrib/tool/mlterm-menu/menu $RPM_BUILD_ROOT/etc/X11/mlterm/ -mv $RPM_BUILD_ROOT/usr/%{_lib}/mlterm/mlterm/mlterm-zoom \ - $RPM_BUILD_ROOT/usr/bin/mlterm-zoom +make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p %{buildroot}%{pixmapdir} +install -m 644 doc/icon/mlterm*xpm %{buildroot}%{pixmapdir} +install -m 644 %{SOURCE11} %{buildroot}%{pixmapdir} +install -m 644 contrib/tool/mlterm-menu/menu %{buildroot}%{_sysconfdir}/X11/mlterm/ +mv %{buildroot}%{_libdir}/mlterm/mlterm/mlterm-zoom \ + %{buildroot}%{_bindir}/mlterm-zoom # remove static libraries in plugin directory: # (mlconfig duplicates buttons when the static libraries are still there!) -rm $RPM_BUILD_ROOT%{_libdir}/mlterm/*.*a +rm %{buildroot}%{_libdir}/mlterm/*.*a # ditto for libkik and libmkf -rm $RPM_BUILD_ROOT%{_libdir}/lib*.*a -rm $RPM_BUILD_ROOT%{_libdir}/mkf/*.*a +rm %{buildroot}%{_libdir}/lib*.*a +rm %{buildroot}%{_libdir}/mkf/*.*a %find_lang mlconfig -%suse_update_desktop_file -i %name TerminalEmulator +%suse_update_desktop_file -i %{name} TerminalEmulator %post -p /sbin/ldconfig @@ -179,12 +167,12 @@ %files -f mlconfig.lang %defattr(-, root, root) %doc LICENCE* README* doc/en doc/ja -%attr(555,root,tty) /usr/bin/mlterm -/usr/share/applications/%name.desktop -/usr/bin/mlclient -/usr/bin/mlclientx -/usr/bin/mlcc -/usr/bin/mlterm-zoom +%attr(555,root,tty) %{_bindir}/mlterm +%{_datadir}/applications/%{name}.desktop +%{_bindir}/mlclient +%{_bindir}/mlclientx +%{_bindir}/mlcc +%{_bindir}/mlterm-zoom %{_libdir}/libkik.* %{_libdir}/libmkf.* %{_libdir}/libmlterm_core.so @@ -203,20 +191,22 @@ %{_libdir}/mkf/*.so %{_libdir}/mlterm/mlterm/mlconfig %{_libdir}/mlterm/mlterm/mlterm-menu -%dir /etc/X11/mlterm/ -%config /etc/X11/mlterm/* +%dir %{_sysconfdir}/X11/mlterm/ +%config %{_sysconfdir}/X11/mlterm/* %{_mandir}/man?/* %{pixmapdir}/* -%files -n mlterm-scim +%if 0%{?suse_version} != 1315 +%files scim %defattr(-, root, root) %{_libdir}/mlterm/libim-scim.so -%files -n mlterm-uim +%files uim %defattr(-, root, root) %{_libdir}/mlterm/libim-uim.so +%endif -%files -n mlterm-m17n +%files m17n %defattr(-, root, root) %{_libdir}/mlterm/libim-m17nlib.so
