Hello community, here is the log from the commit of package obconf for openSUSE:Factory checked in at Tue Aug 16 14:45:33 CEST 2011.
-------- calling whatdependson for head-i586 Old: ---- obconf-2.0.3-build-translations.patch.gz obconf-2.0.3.tar.bz2 obconf-mimelnk.patch New: ---- obconf-2.0.4-git-use_proper_rc.mxl.patch obconf-2.0.4-no_nb.patch obconf-2.0.4.git500163e.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obconf.spec ++++++ --- /var/tmp/diff_new_pack.jksAwy/_old 2011-08-16 14:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.jksAwy/_new 2011-08-16 14:43:10.000000000 +0200 @@ -19,19 +19,25 @@ Name: obconf -BuildRequires: gcc-c++ gettext libglade2-devel openbox-devel -BuildRequires: startup-notification-devel update-desktop-files xorg-x11 +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: libglade2-devel +BuildRequires: xorg-x11 +BuildRequires: startup-notification-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(obrender-3.5) +BuildRequires: pkgconfig(obt-3.5) License: GPLv2+ Group: System/GUI/Other Requires: openbox AutoReqProv: on -Version: 2.0.3 -Release: 10 +Version: 2.0.4.git500163e +Release: 1 Summary: Openbox Configuration Tool Url: http://openbox.org/ Source0: %name-%version.tar.bz2 -Patch0: %name-mimelnk.patch -Patch1: %name-2.0.3-build-translations.patch.gz +Patch0: %name-2.0.4-git-use_proper_rc.mxl.patch +Patch1: %name-2.0.4-no_nb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,24 +54,21 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 -p1 %build -%__cp po/obconf.pot po/nb.po -%__rm po/*.gmo -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LDFLAGS="-export-dynamic" +mv po/no.po po/nb.po +#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LDFLAGS="-export-dynamic" +./bootstrap %configure %__make clean %__make %install %makeinstall +%__rm -rf %buildroot/%_datadir/mimelnk %suse_update_desktop_file %name Utility Settings DesktopSettings -%__rm -rf %buildroot//usr/share/locale/no -%if %suse_version >= 1120 -%__rm -rf %buildroot/opt/kde3 -%endif %find_lang %{name} %clean @@ -88,8 +91,5 @@ %_datadir/mime/packages/obconf.xml %_datadir/applications/%name.desktop %_datadir/pixmaps/obconf.png -%if %suse_version < 1120 -/opt/kde3 -%endif %changelog ++++++ obconf-2.0.4-git-use_proper_rc.mxl.patch ++++++ From: Dana Jansens <[email protected]> Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400) Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ... X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889;hp=9cffa6a9ddfc4074f3de8d0302404d70c2818d8f Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given). --- diff --git a/src/main.c b/src/main.c index 9035e8d..a576253 100644 --- a/src/main.c +++ b/src/main.c @@ -233,11 +233,10 @@ int main(int argc, char **argv) } xmlIndentTreeOutput = 1; - if (!obt_xml_load_config_file(parse_i, - "openbox", - (obc_config_file ? - obc_config_file : "rc.xml"), - "openbox_config")) + if (!((obc_config_file && + obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) || + obt_xml_load_config_file(parse_i, "openbox", "rc.xml", + "openbox_config"))) { obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE); exit_with_error = TRUE; ++++++ obconf-2.0.4-no_nb.patch ++++++ diff -uNr obconf-2.0.4.git500163e/po/LINGUAS obconf-2.0.4/po/LINGUAS --- obconf-2.0.4.git500163e/po/LINGUAS 2010-03-09 16:51:02.000000000 +0100 +++ obconf-2.0.4/po/LINGUAS 2011-08-10 16:50:33.875947447 +0200 @@ -6,7 +6,7 @@ es cs fr -no +nb tr pt_BR de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
