Hello community, here is the log from the commit of package Terminal for openSUSE:Factory checked in at 2012-04-19 15:12:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Terminal (Old) and /work/SRC/openSUSE:Factory/.Terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Terminal", Maintainer is "xfce-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/Terminal/Terminal.changes 2012-03-20 11:36:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Terminal.new/Terminal.changes 2012-04-19 15:12:29.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Mar 31 21:32:42 UTC 2012 - g...@opensuse.org + +- added defattrc to filelist to fix the build on 11.4 + +------------------------------------------------------------------- +Fri Mar 30 16:48:05 UTC 2012 - g...@opensuse.org + +- specfile cleanup +- correct dependencies +- improve packaging of localized manpages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Terminal.spec ++++++ --- /var/tmp/diff_new_pack.wzUZcp/_old 2012-04-19 15:12:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wzUZcp/_new 2012-04-19 15:12:30.000000000 +0200 @@ -23,18 +23,17 @@ License: GPL-2.0+ Group: System/X11/Terminals Url: http://goodies.xfce.org/projects/applications/terminal -Source0: %{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/apps/terminal/0.4/%{name}-%{version}.tar.bz2 Source1: %name-rpmlintrc # PATCH-FIX-UPSTREAM Terminal-0.4.8-fix-help.patch g...@opensuse.org -- Fix help by making sure there is no trailing '#' in URLs which make exo-helper-1 choke Patch0: Terminal-0.4.8-fix-help.patch BuildRequires: fdupes BuildRequires: intltool -BuildRequires: startup-notification BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools -BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exo-1) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(vte) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,8 +57,8 @@ %description doc This package contains the documentation for Terminal. - %lang_package + %prep %setup -q %patch0 -p1 @@ -70,26 +69,56 @@ make %{?_smp_mflags} V=1 %install -%makeinstall -%fdupes %{buildroot}/%{_datadir} +%make_install + %suse_update_desktop_file -i Terminal System TerminalEmulator Utility + rm %{buildroot}%{_datadir}/pixmaps/terminal.xpm -# create terminal -> Terminal symlinks + +# create terminal -> Terminal compatibility symlinks for manpage in %{buildroot}%{_mandir}/*/man1/Terminal.1* \ %{buildroot}%{_mandir}/man1/Terminal.1*; do ( cd "${manpage%/*}" && \ ln -sf "${manpage##*/}" \ "$(printf "%s\n" "${manpage##*/}" | tr [:upper:] [:lower:])" ) done -%find_lang %{name} --with-man + +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} + +# create a list of localized man directories, these need to be owned +( + printf '%%%%defattr(-,root,root)\n' + cd '%{buildroot}' + for dir in ".%{_mandir}/"*; do + [ -d "${dir}" ] || continue + case ${dir##*/} in + man*) continue ;; + *) lang="${dir##*/}" + printf "%%%%dir %%%%lang(%%s) %%s\n" "${lang}" "${dir#.}" + for subdir in "${dir}/"*; do + [ -d "${subdir}" ] || continue + printf "%%%%dir %%%%lang(%%s) %%s\n" "${lang}" \ + "${subdir#.}" + done + ;; + esac + done +) >> %{name}.lang +%find_lang %{name} --with-man %{?no_lang_C} +%find_lang terminal %{name}.lang --with-man %{?no_lang_C} + +%fdupes %{buildroot}/%{_mandir} + +%clean +rm -rf %{buildroot} %post -%icon_theme_cache_post %desktop_database_post +%icon_theme_cache_post %postun -%icon_theme_cache_postun %desktop_database_postun +%icon_theme_cache_postun %files %defattr(-,root,root) @@ -104,7 +133,7 @@ %dir %{_datadir}/gnome-control-center %dir %{_datadir}/gnome-control-center/default-apps %{_datadir}/gnome-control-center/default-apps/Terminal-default-apps.xml -%doc %{_mandir}/man?/* +%doc %{_mandir}/man1/[Tt]erminal.1* %files doc %defattr(-,root,root) @@ -113,11 +142,5 @@ %doc %{_datadir}/xfce4/Terminal/html/ %files lang -f %{name}.lang -%defattr(-,root,root) -%dir %{_mandir}/?? -%dir %{_mandir}/??_?? -%doc %dir %{_mandir}/??/man1 -%doc %dir %{_mandir}/??_??/man1 -%doc %{_mandir}/*/man1/terminal.* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
