September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit cherrytree for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package cherrytree for openSUSE:Factory checked in at Fri Sep 24 01:03:53 CEST 2010. -------- --- GNOME/cherrytree/cherrytree.changes 2010-09-07 10:25:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/cherrytree/cherrytree.changes 2010-09-19 09:20:14.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Sep 19 09:15:42 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.14.2: + + Removed the shebang lines from the top of non executable + python source files + + Changed the cherrytree process name from python to cherrytree + + Improved import from basket + + Fixed codebox print/save as pdf bugs + + Rearranged the messy rich text right click menu +- Drop cherrytree-remove-shebang-line.patch: fixed upstream. + +------------------------------------------------------------------- +Mon Sep 13 09:48:21 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 0.14.1: + + added Ukrainian and French languages. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cherrytree-0.14.tar.bz2 cherrytree-remove-shebang-line.patch New: ---- cherrytree-0.14.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cherrytree.spec ++++++ --- /var/tmp/diff_new_pack.lPJQ7h/_old 2010-09-24 01:03:43.000000000 +0200 +++ /var/tmp/diff_new_pack.lPJQ7h/_new 2010-09-24 01:03:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cherrytree (Version 0.14) +# spec file for package cherrytree (Version 0.14.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,13 @@ Name: cherrytree -Version: 0.14 -Release: 2 +Version: 0.14.2 +Release: 1 License: GPLv2+ Summary: A hierarchical note taking application Url: http://www.giuspen.com/cherrytree/ Group: Productivity/Office/Other Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE %{name}-remove-shebang-line.patch badshah400(a)gmail.com -- delete shebang lines in .py files -Patch0: %{name}-remove-shebang-line.patch BuildRequires: desktop-file-utils BuildRequires: python-gtk BuildRequires: python-gtksourceview @@ -52,7 +50,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %build @@ -92,7 +89,7 @@ %{_datadir}/cherrytree/ %{_datadir}/icons/hicolor/scalable/apps/cherrytree.svg %{_datadir}/mime/packages/cherrytree.xml -%{python_sitelib}/CherryTree-0.14-py%{python_version}.egg-info +%{python_sitelib}/CherryTree-%{version}-py%{python_version}.egg-info %files lang -f %{name}.lang ++++++ cherrytree-0.14.tar.bz2 -> cherrytree-0.14.2.tar.bz2 ++++++ ++++ 8565 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit conntrack-tools for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package conntrack-tools for openSUSE:Factory checked in at Fri Sep 24 01:03:41 CEST 2010. -------- --- conntrack-tools/conntrack-tools.changes 2010-02-23 23:14:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/conntrack-tools/conntrack-tools.changes 2010-07-15 21:49:42.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 15 19:47:42 UTC 2010 - jengelh(a)medozas.de + +- new upstream release 0.9.15 + * support for conntrack zones + * support for TCP window scale synchronization + * fixes to option parsing and printouts + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- conntrack-tools-0.9.14.tar.bz2 New: ---- conntrack-tools-0.9.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conntrack-tools.spec ++++++ --- /var/tmp/diff_new_pack.psJu95/_old 2010-09-24 01:03:04.000000000 +0200 +++ /var/tmp/diff_new_pack.psJu95/_new 2010-09-24 01:03:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package conntrack-tools (Version 0.9.14) +# spec file for package conntrack-tools (Version 0.9.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,16 @@ Name: conntrack-tools -Version: 0.9.14 +Version: 0.9.15 Release: 1 License: GNU GPL v2 Group: Productivity/Networking/Security Url: http://conntrack-tools.netfilter.org/ Source: http://www.netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.… BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: bison flex libnetfilter_conntrack-devel libnfnetlink-devel pkg-config +BuildRequires: bison flex +BuildRequires: libnetfilter_conntrack-devel >= 0.0.102 +BuildRequires: libnfnetlink-devel pkg-config Summary: Userspace tools for interacting with the Connection Tracking System %description ++++++ conntrack-tools-0.9.14.tar.bz2 -> conntrack-tools-0.9.15.tar.bz2 ++++++ ++++ 14096 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit compizconfig-settings-manager for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package compizconfig-settings-manager for openSUSE:Factory checked in at Fri Sep 24 01:03:34 CEST 2010. -------- --- compizconfig-settings-manager/compizconfig-settings-manager.changes 2010-07-21 09:19:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/compizconfig-settings-manager/compizconfig-settings-manager.changes 2010-09-22 15:28:13.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 22 13:30:41 UTC 2010 - dimstar(a)opensuse.org + +- Move python-compizconfig Requires from main package to python-ccm + +------------------------------------------------------------------- +Wed Aug 25 21:25:31 UTC 2010 - dimstar(a)opensuse.org + +- Forward to git snapshot of today. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- update.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compizconfig-settings-manager.spec ++++++ --- /var/tmp/diff_new_pack.vZBmKh/_old 2010-09-24 01:03:19.000000000 +0200 +++ /var/tmp/diff_new_pack.vZBmKh/_new 2010-09-24 01:03:19.000000000 +0200 @@ -19,7 +19,7 @@ Name: compizconfig-settings-manager Version: 0.9.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: Settings Manager for Compiz (CCSM) Url: http://opencompositing.org @@ -32,7 +32,6 @@ BuildRequires: python-gtk BuildRequires: update-desktop-files Requires: python-ccm -Requires: python-compizconfig Requires: python-gtk BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,6 +43,7 @@ License: GPLv2+ Summary: CompizConfig Manager Backend Group: System/X11/Utilities +Requires: python-compizconfig %py_requires %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} ++++++ compizconfig-settings-manager.tar.bz2 ++++++ ++++++ update.sh ++++++ #!/bin/sh oscmodule=$(basename $PWD) (cd $oscmodule; git pull; git submodule update ) tar cjf $oscmodule.tar.bz2 $oscmodule osc ci -m "Update to git-snapshot" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crystalhd for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package crystalhd for openSUSE:Factory checked in at Fri Sep 24 01:03:00 CEST 2010. -------- --- crystalhd/crystalhd.changes 2010-09-16 00:07:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/crystalhd/crystalhd.changes 2010-09-23 19:50:04.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 23 19:46:48 CEST 2010 - tiwai(a)suse.de + +- updated version 3.8: + fixed crash when multiple streams are opened + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- crystalhd-driver_3.7.0-1.tar.bz2 New: ---- crystalhd-driver_3.8.0-1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crystalhd.spec ++++++ --- /var/tmp/diff_new_pack.UFrdMl/_old 2010-09-24 01:02:55.000000000 +0200 +++ /var/tmp/diff_new_pack.UFrdMl/_new 2010-09-24 01:02:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package crystalhd (Version 3.7.0) +# spec file for package crystalhd (Version 3.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ BuildRequires: %kernel_module_package_buildreqs Summary: Broadcom Crystal HD driver KMP Group: Hardware/Other -Version: 3.7.0 -Release: 3 +Version: 3.8.0 +Release: 1 License: GPLv2 Group: Hardware/Other Source0: crystalhd-driver_%{version}-1.tar.bz2 ++++++ crystalhd-driver_3.7.0-1.tar.bz2 -> crystalhd-driver_3.8.0-1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/Makefile.in new/crystalhd-driver/Makefile.in --- old/crystalhd-driver/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/crystalhd-driver/Makefile.in 2010-09-22 21:54:37.000000000 +0200 @@ -0,0 +1,48 @@ +# +# Broadcom Crystal HD (BCM970012) controller Makefile. +# +# +KDIR = @KERN_DIR@ + + +INCLUDES = -I$(KDIR)/include +INCLUDES += -I$(src)/../../include +INCLUDES += -I$(src)/../../include/link +INCLUDES += -I$(src)/../../include/flea +INCLUDES += -I$(src)/../../include/flea/70015/magnum/basemodules/chp/70015/rdb/a0 + +EXTRA_CFLAGS = -D__KERNEL__ -DMODULE $(INCLUDES) $(INC) +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -Werror -O2 + +OBJ := crystalhd_lnx.o \ + crystalhd_misc.o \ + crystalhd_cmds.o \ + crystalhd_hw.o \ + crystalhd_linkfuncs.o \ + crystalhd_fleafuncs.o \ + crystalhd_flea_ddr.o + +PWD = $(shell pwd) + +obj-m := crystalhd.o + crystalhd-objs := $(OBJ) + +all: + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules + +install: + if [ -e "/lib/udev/rules.d" ] ; then cp -f 20-crystalhd.rules /lib/udev/rules.d/ ; fi + if [ -e "/etc/udev/rules.d" ] ; then cp -f 20-crystalhd.rules /etc/udev/rules.d/ ; fi + install -d /lib/modules/$(shell uname -r)/kernel/drivers/video/broadcom + install -m 0644 crystalhd.ko /lib/modules/$(shell uname -r)/kernel/drivers/video/broadcom + /sbin/depmod -a + +clean: + rm -f *.map *.list *.o *.ko crystalhd.mod.c $(OBJ) + +distclean: + rm -f *.map *.list *.o *.ko crystalhd.mod.c $(OBJ) + rm -f configure config.status config.log *~* + rm -rf autom4te.cache + rm -f Makefile + rm -f Module.symvers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/configure.ac new/crystalhd-driver/configure.ac --- old/crystalhd-driver/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/crystalhd-driver/configure.ac 2010-09-22 21:54:37.000000000 +0200 @@ -0,0 +1,12 @@ +AC_INIT(configure.ac) +AC_CHECK_TOOL(LD, ld, :) + +AC_ARG_WITH(kernel-path, [ --with-kernel-path Specify kernel path], + KERN_DIR=$withval, KERN_DIR="/lib/modules/"$(uname -r)"/build") + + +AC_SUBST(KERN_DIR) + +AC_OUTPUT([ +./Makefile +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_cmds.c new/crystalhd-driver/crystalhd_cmds.c --- old/crystalhd-driver/crystalhd_cmds.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_cmds.c 2010-09-22 21:54:37.000000000 +0200 @@ -303,6 +303,8 @@ { BC_STATUS sts = BC_STS_SUCCESS; + dev_dbg(chddev(), "Downloading FW\n"); + if (!ctx || !idata || !idata->add_cdata || !idata->add_cdata_sz) { dev_err(chddev(), "%s: Invalid Arg\n", __func__); return BC_STS_INV_ARG; @@ -317,7 +319,7 @@ idata->add_cdata_sz); if (sts != BC_STS_SUCCESS) { - dev_err(chddev(), "Firmware Download Failure!! - %d\n", sts); + dev_info(chddev(), "Firmware Download Failure!! - %d\n", sts); } else ctx->state |= BC_LINK_INIT; @@ -789,7 +791,7 @@ stats->DrvNextMDataPLD = 0; if (pic_width <= 1920) { // get fetch lock to make sure that fetch is not in progress as wel peek - if(down_interruptible(&ctx->hw_ctx->fetch_sem)) + if(down_interruptible(&ctx->hw_ctx->fetch_sem)) goto get_out; if(ctx->hw_ctx->pfnPeekNextDeodedFr(ctx->hw_ctx,&stats->DrvNextMDataPLD, &stats->picNumFlags, pic_width)) { // Check in case we dropped a picture here @@ -899,7 +901,7 @@ if (sts != BC_STS_SUCCESS) return sts; - dev_dbg(dev, "Crystal HD suspend success\n"); + dev_info(dev, "Crystal HD suspend success\n"); return BC_STS_SUCCESS; } @@ -922,7 +924,7 @@ */ BC_STATUS crystalhd_resume(struct crystalhd_cmd *ctx) { - dev_dbg(chddev(), "crystalhd_resume Success %x\n", ctx->state); + dev_info(chddev(), "crystalhd_resume Success %x\n", ctx->state); bc_cproc_mark_pwr_state(ctx); @@ -960,13 +962,18 @@ dev_info(dev, "Opening new user[%x] handle\n", uc->uid); - ctx->hw_ctx = (struct crystalhd_hw*)kmalloc(sizeof(struct crystalhd_hw), GFP_KERNEL); - if(ctx->hw_ctx != NULL) - memset(ctx->hw_ctx, 0, sizeof(struct crystalhd_hw)); - else - return BC_STS_ERROR; + uc->mode = DTS_MODE_INV; + uc->in_use = 0; - crystalhd_hw_open(ctx->hw_ctx, ctx->adp); + if(ctx->hw_ctx == NULL) { + ctx->hw_ctx = (struct crystalhd_hw*)kmalloc(sizeof(struct crystalhd_hw), GFP_KERNEL); + if(ctx->hw_ctx != NULL) + memset(ctx->hw_ctx, 0, sizeof(struct crystalhd_hw)); + else + return BC_STS_ERROR; + + crystalhd_hw_open(ctx->hw_ctx, ctx->adp); + } uc->in_use = 1; @@ -992,26 +999,26 @@ ctx->user[uc->uid].mode = DTS_MODE_INV; ctx->user[uc->uid].in_use = 0; - ctx->cin_wait_exit = 1; - ctx->pwr_state_change = 0; - dev_info(chddev(), "Closing user[%x] handle\n", uc->uid); + dev_info(chddev(), "Closing user[%x] handle with mode %x\n", uc->uid, mode); - if (((mode & 0xFF) == DTS_DIAG_MODE) || ((mode & 0xFF) == DTS_PLAYBACK_MODE)) { + if (((mode & 0xFF) == DTS_DIAG_MODE) || + ((mode & 0xFF) == DTS_PLAYBACK_MODE) || + ((bc_cproc_get_user_count(ctx) == 0) && (ctx->hw_ctx != NULL))) { + ctx->cin_wait_exit = 1; + ctx->pwr_state_change = 0; // Stop the HW Capture just in case flush did not get called before stop crystalhd_hw_stop_capture(ctx->hw_ctx, true); crystalhd_hw_free_dma_rings(ctx->hw_ctx); crystalhd_destroy_dio_pool(ctx->adp); crystalhd_delete_elem_pool(ctx->adp); - } else if (bc_cproc_get_user_count(ctx)) { + ctx->state = BC_LINK_INVALID; + crystalhd_hw_close(ctx->hw_ctx, ctx->adp); + kfree(ctx->hw_ctx); + ctx->hw_ctx = NULL; + } /*else if (bc_cproc_get_user_count(ctx)) { return BC_STS_SUCCESS; - } - - crystalhd_hw_close(ctx->hw_ctx); - kfree(ctx->hw_ctx); - ctx->hw_ctx = NULL; - - ctx->state = BC_LINK_INVALID; + }*/ return BC_STS_SUCCESS; } @@ -1053,7 +1060,7 @@ /*Open and Close the Hardware to put it in to sleep state*/ crystalhd_hw_open(ctx->hw_ctx, ctx->adp); - crystalhd_hw_close(ctx->hw_ctx); + crystalhd_hw_close(ctx->hw_ctx, ctx->adp); kfree(ctx->hw_ctx); ctx->hw_ctx = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_fleafuncs.c new/crystalhd-driver/crystalhd_fleafuncs.c --- old/crystalhd-driver/crystalhd_fleafuncs.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_fleafuncs.c 2010-09-22 21:54:37.000000000 +0200 @@ -42,6 +42,8 @@ { unsigned int pollCnt=0,regVal=0; + dev_dbg(&hw->adp->pdev->dev,"[crystalhd_flea_core_reset]: Starting core reset\n"); + hw->pfnWriteDevRegister(hw->adp, BCHP_MISC3_RESET_CTRL, 0x01); pollCnt=0; @@ -779,9 +781,9 @@ -- For Flea, we will get a PicQSts interrupt where we will -- enable the capture. */ - if(!hw->RxCaptureState) + if(hw->RxCaptureState != 1) { - hw->RxCaptureState = true; + hw->RxCaptureState = 1; } } @@ -1127,7 +1129,7 @@ //uint32_t BuffSz = (BuffSzInDWords * 4); //uint32_t HBCnt=0; - bool bRetVal = false; + bool bRetVal = true; printk("[crystalhd_flea_download_fw]: Sz:%d\n", buffSz); @@ -1289,6 +1291,12 @@ msleep_interruptible(1); /*1 Milli Sec delay*/ } + if( !bRetVal ) + { + dev_info(&hw->adp->pdev->dev,"[crystalhd_flea_download_fw]: step 7. Firmware image signature failure.\n"); + return BC_STS_ERROR; + } + /*Clear the interrupts by writing the register value back*/ regVal &= 0x00FFFFFF; //Mask off the reserved bits.[24-31] hw->pfnWriteDevRegister(hw->adp, BCHP_WRAP_MISC_INTR2_PCI_CLEAR, regVal); @@ -1314,7 +1322,7 @@ bRetVal = crystalhd_flea_detect_fw_alive(hw); if( !bRetVal ) { - dev_err(&hw->adp->pdev->dev,"[crystalhd_flea_download_fw]: step 8. Detect firmware heart beat failed.\n"); + dev_info(&hw->adp->pdev->dev,"[crystalhd_flea_download_fw]: step 8. Detect firmware heart beat failed.\n"); return BC_STS_ERROR; } @@ -1423,7 +1431,7 @@ -- except for fatal errors. */ hw->rx_list_post_index = 0; - hw->RxCaptureState = false; + hw->RxCaptureState = 0; msleep_interruptible(1); @@ -1849,8 +1857,9 @@ msleep_interruptible(50); + // FW commands should complete even if we got a signal from the upper layer crystalhd_wait_on_event(&fw_cmd_event, hw->fwcmd_evt_sts, - 20000, rc, false); + 20000, rc, true); if (!rc) { sts = BC_STS_SUCCESS; @@ -1858,7 +1867,7 @@ dev_err(dev, "Firmware command T/O\n"); sts = BC_STS_TIMEOUT; } else if (rc == -EINTR) { - dev_dbg(dev, "FwCmd Wait Signal int.\n"); + dev_info(dev, "FwCmd Wait Signal - Can Never Happen\n"); sts = BC_STS_IO_USER_ABORT; } else { dev_err(dev, "FwCmd IO Error.\n"); @@ -1988,10 +1997,17 @@ bool failedL0 = true, failedL1 = true; uint32_t pollCnt = 0; - hw->RxCaptureState = false; + hw->RxCaptureState = 2; - if((hw->rx_list_sts[0] == sts_free) && (hw->rx_list_sts[1] == sts_free)) + if((hw->rx_list_sts[0] == sts_free) && (hw->rx_list_sts[1] == sts_free)) { + hw->RxCaptureState = 0; return; // Nothing to be done + } + + if(hw->rx_list_sts[0] == sts_free) + failedL0 = false; + if(hw->rx_list_sts[1] == sts_free) + failedL1 = false; while(1) { @@ -2004,6 +2020,8 @@ failedL0 = false; } } + else + failedL0 = false; if(hw->rx_list_sts[1] != sts_free) { if( (IntrStsValue.L1YRxDMADone) || (IntrStsValue.L1YRxDMAErr) || @@ -2012,6 +2030,9 @@ failedL1 = false; } } + else + failedL1 = false; + msleep_interruptible(10); if(pollCnt >= MAX_VALID_POLL_CNT) @@ -2026,6 +2047,8 @@ if(failedL0 || failedL1) printk("Failed to stop RX DMA\n"); + hw->RxCaptureState = 0; + crystalhd_flea_clear_rx_errs_intrs(hw); } @@ -2050,8 +2073,8 @@ return BC_STS_INV_ARG; } - if(!hw->RxCaptureState) { - printk("Capture not yet enabled\n"); + if(hw->RxCaptureState != 1) { + printk("Capture not enabled\n"); return BC_STS_BUSY; } @@ -2554,7 +2577,6 @@ break; } } - /* handle completion...*/ if (comp_sts != BC_STS_NO_DATA) { crystalhd_rx_pkt_done(hw, i, comp_sts); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_hw.c new/crystalhd-driver/crystalhd_hw.c --- old/crystalhd-driver/crystalhd_hw.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_hw.c 2010-09-22 21:54:37.000000000 +0200 @@ -119,7 +119,7 @@ return BC_STS_SUCCESS; } -BC_STATUS crystalhd_hw_close(struct crystalhd_hw *hw) +BC_STATUS crystalhd_hw_close(struct crystalhd_hw *hw, struct crystalhd_adp *adp) { if (!hw) { printk(KERN_ERR "%s: Invalid Arguments\n", __func__); @@ -130,7 +130,10 @@ return BC_STS_SUCCESS; /* Stop and DDR sleep will happen in here */ - crystalhd_hw_suspend(hw); + // Only stop the HW if we are the last user + if(adp->cfg_users == 1) + crystalhd_hw_suspend(hw); + hw->dev_started = false; return BC_STS_SUCCESS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_hw.h new/crystalhd-driver/crystalhd_hw.h --- old/crystalhd-driver/crystalhd_hw.h 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_hw.h 2010-09-22 21:54:37.000000000 +0200 @@ -26,6 +26,8 @@ #ifndef _CRYSTALHD_HW_H_ #define _CRYSTALHD_HW_H_ +#define DEBUG 1 + #include <linux/device.h> #include <linux/version.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 24) @@ -386,7 +388,7 @@ struct semaphore fetch_sem; // semaphore between fetch and probe of the next picture information, since both will be in process context - bool RxCaptureState; + uint32_t RxCaptureState; // 0 if capture is not enabled, 1 if capture is enabled, 2 if stop rxdma is pending // BCM70015 mods uint32_t PicQSts; /* This is the bitmap given by PiCQSts Interrupt*/ @@ -498,7 +500,7 @@ void crystalhd_hw_delete_ioqs(struct crystalhd_hw *hw); BC_STATUS crystalhd_hw_create_ioqs(struct crystalhd_hw *hw); BC_STATUS crystalhd_hw_open(struct crystalhd_hw *hw, struct crystalhd_adp *adp); -BC_STATUS crystalhd_hw_close(struct crystalhd_hw *hw); +BC_STATUS crystalhd_hw_close(struct crystalhd_hw *hw, struct crystalhd_adp *adp); BC_STATUS crystalhd_hw_setup_dma_rings(struct crystalhd_hw *hw); BC_STATUS crystalhd_hw_free_dma_rings(struct crystalhd_hw *hw); BC_STATUS crystalhd_hw_tx_req_complete(struct crystalhd_hw *hw, uint32_t list_id, BC_STATUS cs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_linkfuncs.c new/crystalhd-driver/crystalhd_linkfuncs.c --- old/crystalhd-driver/crystalhd_linkfuncs.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_linkfuncs.c 2010-09-22 21:54:37.000000000 +0200 @@ -473,7 +473,7 @@ dev = &hw->adp->pdev->dev; - dev_dbg(dev, "Starting Crystal HD Device\n"); + dev_dbg(dev, "Starting Crystal HD BCM70012 Device\n"); if (!crystalhd_link_bring_out_of_rst(hw)) { dev_err(dev, "Failed To Bring BCM70012 Out Of Reset\n"); @@ -521,7 +521,7 @@ uint32_t reg; BC_STATUS sts; - dev_dbg(&hw->adp->pdev->dev, "Stopping Crystal HD Device\n"); + dev_dbg(&hw->adp->pdev->dev, "Stopping Crystal HD BCM70012 Device\n"); sts = crystalhd_link_put_ddr2sleep(hw); if (sts != BC_STS_SUCCESS) { dev_err(&hw->adp->pdev->dev, "Failed to Put DDR To Sleep!!\n"); @@ -637,6 +637,8 @@ int i; unsigned long res = 0; + dev_dbg(&hw->adp->pdev->dev, "getting Picture Info\n"); + *PicNumber = 0; *PicMetaData = 0; @@ -668,7 +670,7 @@ PicInfoLineNum = link_GetPicInfoLineNum(dio, dio->pib_va); if (PicInfoLineNum > 1092) { - printk("Invalid Line Number[%x]\n", (int)PicInfoLineNum); + dev_dbg(&hw->adp->pdev->dev, "Invalid Line Number[%x]\n", (int)PicInfoLineNum); goto getpictureinfo_err; } @@ -683,7 +685,7 @@ if (picHeight) { if ((PicInfoLineNum != picHeight) && (PicInfoLineNum != picHeight/2)) { - printk("PicInfoLineNum[%d] != PICHeight " + dev_dbg(&hw->adp->pdev->dev, "PicInfoLineNum[%d] != PICHeight " "Or PICHeight/2 [%d]\n", (int)PicInfoLineNum, picHeight); goto getpictureinfo_err; @@ -1884,7 +1886,7 @@ return BC_STS_FW_AUTH_FAILED; } - dev_info(dev, "Firmware Downloaded Successfully\n"); + dev_dbg(dev, "Firmware Downloaded Successfully\n"); // Load command response addresses hw->fwcmdPostAddr = TS_Host2CpuSnd; @@ -1941,8 +1943,9 @@ msleep_interruptible(50); + // FW commands should complete even if we got a signal from the upper layer crystalhd_wait_on_event(&fw_cmd_event, hw->fwcmd_evt_sts, - 20000, rc, false); + 20000, rc, true); if (!rc) { sts = BC_STS_SUCCESS; @@ -1950,7 +1953,7 @@ dev_err(dev, "Firmware command T/O\n"); sts = BC_STS_TIMEOUT; } else if (rc == -EINTR) { - dev_dbg(dev, "FwCmd Wait Signal int.\n"); + dev_err(dev, "FwCmd Wait Signal int - Should never happen\n"); sts = BC_STS_IO_USER_ABORT; } else { dev_err(dev, "FwCmd IO Error.\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_lnx.c new/crystalhd-driver/crystalhd_lnx.c --- old/crystalhd-driver/crystalhd_lnx.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_lnx.c 2010-09-22 21:54:37.000000000 +0200 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this driver. If not, see <http://www.gnu.org/licenses/>. ***************************************************************************/ -#define DEBUG + #include <linux/version.h> #include "crystalhd_lnx.h" @@ -573,7 +573,7 @@ int rc; BC_STATUS sts = BC_STS_SUCCESS; - dev_dbg(dev, "Starting Device:0x%04x\n", pdev->device); + dev_info(dev, "Starting Device:0x%04x\n", pdev->device); pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_KERNEL); if (!pinfo) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/crystalhd_misc.c new/crystalhd-driver/crystalhd_misc.c --- old/crystalhd-driver/crystalhd_misc.c 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/crystalhd_misc.c 2010-09-22 21:54:37.000000000 +0200 @@ -138,7 +138,7 @@ * Return: * Status. * - * Get value from Link's PCIe config space. + * Get value from PCIe config space. */ BC_STATUS crystalhd_pci_cfg_rd(struct crystalhd_adp *adp, uint32_t off, uint32_t len, uint32_t *val) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crystalhd-driver/debian/changelog new/crystalhd-driver/debian/changelog --- old/crystalhd-driver/debian/changelog 2010-08-18 19:31:46.000000000 +0200 +++ new/crystalhd-driver/debian/changelog 2010-09-22 21:54:37.000000000 +0200 @@ -1,4 +1,4 @@ -crystalhd-driver (3.7.0-1) unstable; urgency=low +crystalhd-driver (3.8.0-1) unstable; urgency=low * Initial deb package release - Made for Ubuntu 10.04 * Updated clean up code to add support for MSI interrupts @@ -6,5 +6,7 @@ * Added support for correct playback of interlaced content * Expanded fetch semaphore + * Fixed system hang with multiple device handles open + * Fixed long timeout in stopping the decoder - -- Narendra Sankar <nsankar@nsankar64-laptop> Wed, 18 Aug 2010 17:30:22 +0000 + -- Narendra Sankar <nsankar@nsankar64-laptop> Wed, 22 Sep 2010 19:54:26 +0000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dconf for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package dconf for openSUSE:Factory checked in at Fri Sep 24 01:02:51 CEST 2010. -------- --- GNOME/dconf/dconf.changes 2010-09-10 14:37:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/dconf/dconf.changes 2010-09-18 15:57:08.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Sep 16 09:42:02 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.5.1: + + Adjust to GDBus API changes + + Send correct object path in Notify on WriteMany + + Use printf() and exit() instead of g_error() to avoid too many + crash reports for now + + Require gobject-introspection 0.9.5 + + Require vala 0.9.5 + + Make dconf-editor optional + + Drop libgee requirement for dconf-editor + + Tweak shared library installation to make ldconfig happy + + Bump .gir version to dconf-1.0 + + Fix introspection build with recent gobject-introspection + + Minor bug fixes +- Remove pkgconfig(gee-1.0) BuildRequires. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dconf-0.5.tar.bz2 New: ---- dconf-0.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dconf.spec ++++++ --- /var/tmp/diff_new_pack.8FHJnP/_old 2010-09-24 01:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.8FHJnP/_new 2010-09-24 01:02:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dconf (Version 0.5) +# spec file for package dconf (Version 0.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,14 @@ Name: dconf -Version: 0.5 -Release: 2 +Version: 0.5.1 +Release: 1 # FIXME: remove SUSE_ASNEEDED=0 when this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=626280 License: LGPLv2.1+ Summary: Simple key-based configuration system Group: System/Libraries Source: %{name}-%{version}.tar.bz2 BuildRequires: vala-devel -BuildRequires: pkgconfig(gee-1.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-2.0) @@ -127,7 +126,7 @@ %files -n libdconf0 %defattr(-, root, root) %{_libdir}/libdconf.so.* -%{_libdir}/girepository-1.0/dconf-0.3.typelib +%{_libdir}/girepository-1.0/dconf-1.0.typelib %files -n gsettings-backend-dconf %defattr(-, root, root) ++++++ dconf-0.5.tar.bz2 -> dconf-0.5.1.tar.bz2 ++++++ ++++ 19208 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deja-dup for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package deja-dup for openSUSE:Factory checked in at Fri Sep 24 01:02:44 CEST 2010. -------- --- GNOME/deja-dup/deja-dup.changes 2010-08-12 12:32:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/deja-dup/deja-dup.changes 2010-09-13 12:25:05.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Sep 12 11:35:17 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 15.92: + + Support ConnMan + + Disable explicit resume support until bugs with it are fixed + + Fix a bug where symlink excludes were actually included. +- Rebase deja-dup-monitor_check_for_gtk.patch. +- Handle new deja-dup-preferences.desktop. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- deja-dup-15.5.tar.bz2 New: ---- deja-dup-15.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deja-dup.spec ++++++ --- /var/tmp/diff_new_pack.KZDZjo/_old 2010-09-24 01:02:29.000000000 +0200 +++ /var/tmp/diff_new_pack.KZDZjo/_new 2010-09-24 01:02:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package deja-dup (Version 15.5) +# spec file for package deja-dup (Version 15.92) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: deja-dup -Version: 15.5 +Version: 15.92 Release: 1 License: GPLv3+ Summary: Simple backup tool and frontend for duplicity @@ -95,6 +95,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file deja-dup %suse_update_desktop_file deja-dup-monitor +%suse_update_desktop_file deja-dup-preferences %find_lang %{name} # Localized man pages for man in %{buildroot}%{_mandir}/*/man1/*; do @@ -126,6 +127,7 @@ %{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop %{_libdir}/deja-dup/deja-dup-monitor %{_datadir}/applications/deja-dup.desktop +%{_datadir}/applications/deja-dup-preferences.desktop %{_datadir}/icons/hicolor/scalable/actions/deja-dup-backup.svg %{_datadir}/icons/hicolor/scalable/actions/deja-dup-restore.svg %{_datadir}/icons/hicolor/scalable/apps/deja-dup.svg ++++++ deja-dup-15.5.tar.bz2 -> deja-dup-15.92.tar.bz2 ++++++ ++++ 267877 lines of diff (skipped) ++++++ deja-dup-monitor_check_for_gtk.patch ++++++ --- /var/tmp/diff_new_pack.KZDZjo/_old 2010-09-24 01:02:30.000000000 +0200 +++ /var/tmp/diff_new_pack.KZDZjo/_new 2010-09-24 01:02:30.000000000 +0200 @@ -1,6 +1,8 @@ ---- configure.ac.orig 2010-08-11 02:58:17.243029596 +0100 -+++ configure.ac 2010-08-11 03:08:21.949181713 +0100 -@@ -120,6 +120,7 @@ AC_SUBST(PREF_CFLAGS) +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -119,6 +119,7 @@ AC_SUBST(PREF_CFLAGS) AC_SUBST(PREF_LIBS) PKG_CHECK_MODULES(COMMON, @@ -8,11 +10,3 @@ gio-2.0 >= $GIO_REQ_VER gio-unix-2.0 >= $GIO_REQ_VER gconf-2.0 -@@ -135,6 +136,7 @@ AC_SUBST(WIDGETS_CFLAGS) - AC_SUBST(WIDGETS_LIBS) - - PKG_CHECK_MODULES(MONITOR, -+ $GTK_MODULE >= $GTK_REQ_VER - gconf-2.0 - gio-2.0 >= $GIO_REQ_VER - dbus-glib-1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit digikam for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at Fri Sep 24 01:02:21 CEST 2010. -------- --- KDE/digikam/digikam.changes 2010-08-25 20:15:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2010-08-31 12:05:01.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 31 10:05:00 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.Bzhp39/_old 2010-09-24 01:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Bzhp39/_new 2010-09-24 01:02:11.000000000 +0200 @@ -27,7 +27,7 @@ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Version: 1.4.0 -Release: 1 +Release: 2 %define tar_version 1.4.0 Source0: %name-%{tar_version}.tar.bz2 Source1: %{name}-docs.tar.bz2 @@ -38,7 +38,7 @@ Requires: libqt4-sql-sqlite libqt4-sql-mysql Recommends: kipi-plugins Requires: oxygen-icon-theme -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} Provides: kde4-digikam = 0.10.0 Obsoletes: kde4-digikam <= 0.10.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gconf2-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Fri Sep 24 01:02:15 CEST 2010. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2010-09-13 18:50:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2010-09-24 01:01:35.563423000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 21 19:35:59 CEST 2010 - vuntz(a)opensuse.org + +- Move the novell sound theme to a novell-sound-theme subpackage, + built only for SLE. +- Rework the packaging of dynamic wallpapers: + + Make all the dynamic wallpapers handling only happen if we + build the openSUSE package. + + Rename desktop-data-%{branding_name}-extra-gnome to + %{branding_name}-dynamic-wallpaper (with appropriate + %Provides/Obsoletes). + + Move the old dynamic wallpapers to + %{branding_name}-dynamic-wallpapers-old so that + %{branding_name}-dynamic-wallpaper is smaller and can be + installed by default. + + Add a Supplements on desktop-data-%{desktop_data} and + gnome-settings-daemon to %{branding_name}-dynamic-wallpaper to + automatically install it by default, and remove the previous + Enhances (gconf2-branding-%{branding_name}) and Supplements + (desktop-data-%{desktop_data}-extra). + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-SLED (Version 11.3) +# spec file for package gconf2-branding-SLED (Version 11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-SLED-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides SLED defaults for configurations based on GConf -database system. +This package provides SLED defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n SLED-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with SLED Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-SLED-extra-gnome = %{version} +Obsoletes: desktop-data-SLED-extra-gnome < %{version} + +%description -n SLED-dynamic-wallpaper +This package contains a dynamic wallpaper with SLED look. -%package -n desktop-data-SLED-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n SLED-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-SLED -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with SLED Look +Summary: Dynamic wallpapers for GNOME, from previous versions of SLED Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 15 +Enhances: SLED-dynamic-wallpaper + +%description -n SLED-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +SLED. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-SLED-extra-gnome -This optional package contains nice dynamic wallpaper with SLED -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-SLED-extra-gnome -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- SLED-dynamic-wallpaper +# If SLED-dynamic-wallpaper exists, we want nice dynamic background. gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-SLED-extra-gnome -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- SLED-dynamic-wallpaper +# If SLED-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If SLED-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-SLED-extra-gnome +%if %build_openSUSE + +%files -n SLED-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n SLED-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-SLES (Version 11.3) +# spec file for package gconf2-branding-SLES (Version 11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-SLES-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides SLES defaults for configurations based on GConf -database system. +This package provides SLES defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n SLES-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with SLES Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-SLES-extra-gnome = %{version} +Obsoletes: desktop-data-SLES-extra-gnome < %{version} + +%description -n SLES-dynamic-wallpaper +This package contains a dynamic wallpaper with SLES look. -%package -n desktop-data-SLES-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n SLES-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-SLES -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with SLES Look +Summary: Dynamic wallpapers for GNOME, from previous versions of SLES Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 15 +Enhances: SLES-dynamic-wallpaper + +%description -n SLES-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +SLES. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-SLES-extra-gnome -This optional package contains nice dynamic wallpaper with SLES -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-SLES-extra-gnome -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- SLES-dynamic-wallpaper +# If SLES-dynamic-wallpaper exists, we want nice dynamic background. gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-SLES-extra-gnome -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- SLES-dynamic-wallpaper +# If SLES-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If SLES-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-SLES-extra-gnome +%if %build_openSUSE + +%files -n SLES-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n SLES-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-openSUSE (Version 11.3) +# spec file for package gconf2-branding-openSUSE (Version 11.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-openSUSE-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides openSUSE defaults for configurations based on GConf -database system. +This package provides openSUSE defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n openSUSE-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with openSUSE Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-openSUSE-extra-gnome = %{version} +Obsoletes: desktop-data-openSUSE-extra-gnome < %{version} + +%description -n openSUSE-dynamic-wallpaper +This package contains a dynamic wallpaper with openSUSE look. -%package -n desktop-data-openSUSE-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n openSUSE-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-openSUSE -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with openSUSE Look +Summary: Dynamic wallpapers for GNOME, from previous versions of openSUSE Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 14 +Enhances: openSUSE-dynamic-wallpaper + +%description -n openSUSE-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +openSUSE. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-openSUSE-extra-gnome -This optional package contains nice dynamic wallpaper with openSUSE -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-openSUSE-extra-gnome -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- openSUSE-dynamic-wallpaper +# If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-openSUSE-extra-gnome -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- openSUSE-dynamic-wallpaper +# If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If openSUSE-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-openSUSE-extra-gnome +%if %build_openSUSE + +%files -n openSUSE-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n openSUSE-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Tue Sep 21 19:35:59 CEST 2010 - vuntz(a)opensuse.org + +- Move the novell sound theme to a novell-sound-theme subpackage, + built only for SLE. +- Rework the packaging of dynamic wallpapers: + + Make all the dynamic wallpapers handling only happen if we + build the openSUSE package. + + Rename desktop-data-%{branding_name}-extra-gnome to + %{branding_name}-dynamic-wallpaper (with appropriate + %Provides/Obsoletes). + + Move the old dynamic wallpapers to + %{branding_name}-dynamic-wallpapers-old so that + %{branding_name}-dynamic-wallpaper is smaller and can be + installed by default. + + Add a Supplements on desktop-data-%{desktop_data} and + gnome-settings-daemon to %{branding_name}-dynamic-wallpaper to + automatically install it by default, and remove the previous + Enhances (gconf2-branding-%{branding_name}) and Supplements + (desktop-data-%{desktop_data}-extra). + +------------------------------------------------------------------- Sat Sep 4 22:29:42 CEST 2010 - vuntz(a)opensuse.org - Change notifications to appear at the bottom right since our ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -53,28 +56,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: %{branding_name} defaults for the GNOME configuration system -Version: 11.3 +Version: %{desktop_data_ver} Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -85,6 +96,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -95,40 +107,68 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-%{branding_name}-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides %{branding_name} defaults for configurations based on GConf -database system. +This package provides %{branding_name} defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n %{branding_name}-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with %{branding_name} Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-%{branding_name}-extra-gnome = %{version} +Obsoletes: desktop-data-%{branding_name}-extra-gnome < %{version} +%description -n %{branding_name}-dynamic-wallpaper +This package contains a dynamic wallpaper with %{branding_name} look. -%package -n desktop-data-%{branding_name}-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n %{branding_name}-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-%{branding_name} -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with %{branding_name} Look +Summary: Dynamic wallpapers for GNOME, from previous versions of %{branding_name} Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 1 +Enhances: %{branding_name}-dynamic-wallpaper + +%description -n %{branding_name}-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +%{branding_name}. -%description -n desktop-data-%{branding_name}-extra-gnome -This optional package contains nice dynamic wallpaper with %{branding_name} -look. +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif + +%if %build_SLED || %build_SLES +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop -It changes its color depending on day time - bright in daylight, dark -overnight. +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -139,11 +179,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml @@ -152,12 +193,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -280,33 +323,37 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-%{branding_name}-extra-gnome -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE +%triggerin -- %{branding_name}-dynamic-wallpaper +# If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-%{branding_name}-extra-gnome -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- %{branding_name}-dynamic-wallpaper +# If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then - gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" +if [ $1 == 1 ]; then + # If %{branding_name}-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -319,26 +366,36 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-%{branding_name}-extra-gnome +%if %build_openSUSE +%files -n %{branding_name}-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n %{branding_name}-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-menus-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package gnome-menus-branding-openSUSE for openSUSE:Factory checked in at Fri Sep 24 01:01:59 CEST 2010. -------- --- GNOME/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2010-01-18 17:02:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2010-09-24 01:01:29.661873000 +0200 @@ -1,0 +2,18 @@ +Tue Sep 21 17:23:27 CEST 2010 - vuntz(a)opensuse.org + +- Drop gnome-menus-branding-Hidden.directory: this is needed for + the applications.menu file from desktop-data-openSUSE. But it's + weird to have the file in a different package. Instead, we'll fix + desktop-data-openSUSE to use a file it already ships. + +------------------------------------------------------------------- +Mon Sep 13 14:35:55 CEST 2010 - vuntz(a)opensuse.org + +- Add gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: this + removes the desktop files with X-SuSE-ControlCenter-* categories + from the Applications menu. They should just appear in the + control center. +- Rename gnome-menus-branding.changes to + gnome-menus-branding.changes.in. + +------------------------------------------------------------------- gnome-menus-branding-openSUSE.changes: same change calling whatdependson for head-i586 Old: ---- gnome-menus-branding-Hidden.directory gnome-menus-branding.changes New: ---- gnome-menus-branding-remove-X-SuSE-ControlCenter.patch gnome-menus-branding.changes.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.AHPO1u/_old 2010-09-24 01:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.AHPO1u/_new 2010-09-24 01:01:33.000000000 +0200 @@ -18,17 +18,19 @@ %define build_openSUSE 0 %define build_SLED 1 + # Do not edit this auto generated file! Edit gnome-menus-branding.spec.in. Name: gnome-menus-branding-SLED Version: 11.3 -Release: 1 +Release: 6 Group: System/GUI/GNOME License: BSD3c Summary: SLED branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -Source2: gnome-menus-branding-Hidden.directory +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-SLED, you cannot # reuse build root. You have to build in a clean build root every time! @@ -47,18 +49,16 @@ %prep %setup -q -T -c %{name}-%{version} cp -a %{S:0} COPYING -cp -a %{S:2} Hidden.directory # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . # Override settings.menu with our version. It doesn't make sense to patch it, # they're just completely different cp -a %{S:1} settings.menu +%patch0 -p0 %build %install -install -d $RPM_BUILD_ROOT%{_datadir}/desktop-directories -install -m0644 *.directory $RPM_BUILD_ROOT%{_datadir}/desktop-directories/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/ @@ -68,7 +68,7 @@ %files %defattr (-, root, root) %doc COPYING -%{_datadir}/desktop-directories/*.directory -%{_sysconfdir}/xdg/menus/*.menu +%{_sysconfdir}/xdg/menus/gnome-applications.menu +%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++ gnome-menus-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.AHPO1u/_old 2010-09-24 01:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.AHPO1u/_new 2010-09-24 01:01:33.000000000 +0200 @@ -18,17 +18,19 @@ %define build_openSUSE 1 %define build_SLED 0 + # Do not edit this auto generated file! Edit gnome-menus-branding.spec.in. Name: gnome-menus-branding-openSUSE Version: 11.3 -Release: 1 +Release: 6 Group: System/GUI/GNOME License: BSD3c Summary: openSUSE branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -Source2: gnome-menus-branding-Hidden.directory +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! @@ -47,18 +49,16 @@ %prep %setup -q -T -c %{name}-%{version} cp -a %{S:0} COPYING -cp -a %{S:2} Hidden.directory # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . # Override settings.menu with our version. It doesn't make sense to patch it, # they're just completely different cp -a %{S:1} settings.menu +%patch0 -p0 %build %install -install -d $RPM_BUILD_ROOT%{_datadir}/desktop-directories -install -m0644 *.directory $RPM_BUILD_ROOT%{_datadir}/desktop-directories/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/ @@ -68,7 +68,7 @@ %files %defattr (-, root, root) %doc COPYING -%{_datadir}/desktop-directories/*.directory -%{_sysconfdir}/xdg/menus/*.menu +%{_sysconfdir}/xdg/menus/gnome-applications.menu +%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++ gnome-menus-branding-remove-X-SuSE-ControlCenter.patch ++++++ --- gnome-applications.menu 2010-09-13 14:35:10.868032788 +0200 +++ gnome-applications.menu.new 2010-09-13 14:34:56.248032229 +0200 @@ -147,6 +147,10 @@ <Not><Category>Core</Category></Not> <Not><Category>Settings</Category></Not> <Not><Category>Screensaver</Category></Not> + <Not><Category>X-SuSE-ControlCenter-Hardware</Category></Not> + <Not><Category>X-SuSE-ControlCenter-LookAndFeel</Category></Not> + <Not><Category>X-SuSE-ControlCenter-Personal</Category></Not> + <Not><Category>X-SuSE-ControlCenter-System</Category></Not> </And> </Include> </Menu>  ++++++ gnome-menus-branding.changes.in ++++++ ------------------------------------------------------------------- Tue Sep 21 17:23:27 CEST 2010 - vuntz(a)opensuse.org - Drop gnome-menus-branding-Hidden.directory: this is needed for the applications.menu file from desktop-data-openSUSE. But it's weird to have the file in a different package. Instead, we'll fix desktop-data-openSUSE to use a file it already ships. ------------------------------------------------------------------- Mon Sep 13 14:35:55 CEST 2010 - vuntz(a)opensuse.org - Add gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: this removes the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu. They should just appear in the control center. - Rename gnome-menus-branding.changes to gnome-menus-branding.changes.in. ------------------------------------------------------------------- Sat Jan 16 02:52:50 CET 2010 - vuntz(a)opensuse.org - Merge openSUSE and SLED branding packaging, and generate the packages from the same sources. - Change version to 11.3. - Rename gnome-menus-branding-openSUSE-COPYING to gnome-menus-branding-COPYING, gnome-menus-branding-openSUSE-Hidden.directory to gnome-menus-branding-Hidden.directory and gnome-menus-branding-openSUSE-settings.menu to gnome-menus-brandingsettings.menu. - Make sure to provide the right version of gnome-menus-branding, based on the version of the gnome-menus package. - Remove update-desktop-files BuildRequires. ------------------------------------------------------------------- Thu Jul 30 04:59:29 CEST 2009 - vuntz(a)novell.com - Update gnome-menus-branding-openSUSE-settings.menu: + make it closer to the gnomecc.menu from upstream + remove usage of old X-Ximian categories that are not in use anymore + remove some of the previously included YaST tools, they don't make sense most of the time there. ------------------------------------------------------------------- Sun Jan 25 12:54:31 CET 2009 - vuntz(a)novell.com - Remove duplicate category in settings.menu - Remove old hack to keep some preferences.menu compatibility file. It should not be needed anymore with the packages we have now. ------------------------------------------------------------------- Tue Nov 4 12:03:01 CET 2008 - vuntz(a)novell.com - Upstream has changed the way settings.menu is used for 2.24, so kill preferences.menu and just use settings.menu now. - Keep preferences.menu as a link to settings.menu, since we don't want to break anything because of this. - Conflicts with other branding providers. - Spec cleanup. ------------------------------------------------------------------- Thu Jul 31 17:02:20 CEST 2008 - sbrabec(a)suse.cz - New SuSE package (fate#303889). ++++++ gnome-menus-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.AHPO1u/_old 2010-09-24 01:01:34.000000000 +0200 +++ /var/tmp/diff_new_pack.AHPO1u/_new 2010-09-24 01:01:34.000000000 +0200 @@ -26,7 +26,8 @@ Summary: %{branding_name} branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -Source2: gnome-menus-branding-Hidden.directory +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz(a)opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-%{branding_name}, you cannot # reuse build root. You have to build in a clean build root every time! @@ -45,18 +46,16 @@ %prep %setup -q -T -c %{name}-%{version} cp -a %{S:0} COPYING -cp -a %{S:2} Hidden.directory # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . # Override settings.menu with our version. It doesn't make sense to patch it, # they're just completely different cp -a %{S:1} settings.menu +%patch0 -p0 %build %install -install -d $RPM_BUILD_ROOT%{_datadir}/desktop-directories -install -m0644 *.directory $RPM_BUILD_ROOT%{_datadir}/desktop-directories/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/ @@ -66,7 +65,7 @@ %files %defattr (-, root, root) %doc COPYING -%{_datadir}/desktop-directories/*.directory -%{_sysconfdir}/xdg/menus/*.menu +%{_sysconfdir}/xdg/menus/gnome-applications.menu +%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.AHPO1u/_old 2010-09-24 01:01:34.000000000 +0200 +++ /var/tmp/diff_new_pack.AHPO1u/_new 2010-09-24 01:01:34.000000000 +0200 @@ -8,7 +8,7 @@ for variant in openSUSE SLED ; do cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec - cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes + cp ${NAME}-branding.changes.in ${NAME}-branding-${variant}.changes sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec sed -i "s/$%define *build_${variant} *$0/\11/" ${NAME}-branding-${variant}.spec sed -i " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2-engine-murrine for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package gtk2-engine-murrine for openSUSE:Factory checked in at Fri Sep 24 01:01:27 CEST 2010. -------- --- GNOME/gtk2-engine-murrine/gtk2-engine-murrine.changes 2010-02-01 00:42:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk2-engine-murrine/gtk2-engine-murrine.changes 2010-09-22 15:37:00.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 22 15:31:31 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.98.0: + + Too many changes to list here, please see NEWS. + + New supported widgets: GtkExpander, GtkIconView, GtkInfoBar. + + Many new options. + + Improved rendering: + - rounded GtkScale trough + - disabled GtkScale trough + - contrast function in GtkButton + - better GtkTooltip theming + - and more. + + Various bug fixes. +- Drop gtk2-engine-murrine-0.90.3-nonvoid.patch: not needed + anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gtk2-engine-murrine-0.90.3-nonvoid.patch murrine-0.90.3.tar.bz2 New: ---- murrine-0.98.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-engine-murrine.spec ++++++ --- /var/tmp/diff_new_pack.p4HHwn/_old 2010-09-24 01:01:11.000000000 +0200 +++ /var/tmp/diff_new_pack.p4HHwn/_new 2010-09-24 01:01:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gtk2-engine-murrine (Version 0.90.3) +# spec file for package gtk2-engine-murrine (Version 0.98.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,37 +19,35 @@ Name: gtk2-engine-murrine -Version: 0.90.3 -Release: 4 -Url: http://ftp.gnome.org/pub/GNOME/sources/murrine/ +%define _name murrine +Summary: Murrine GTK Theme Engine +Version: 0.98.0 +Release: 1 License: GPLv2+ Group: System/GUI/XFCE -Summary: Murrine GTK Theme Engine -Source: http://ftp.gnome.org/pub/GNOME/sources/murrine/0.90/murrine-%{version}.tar.… +Url: http://ftp.gnome.org/pub/GNOME/sources/murrine/ +Source: http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/%{_name}-%{version}.tar… Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel >= 2.12.0 -BuildRequires: intltool pkg-config -Patch0: %{name}-%{version}-nonvoid.patch +BuildRequires: intltool +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Murrine is a GTK+ 2 theme engine, that uses the Cairo vector drawing library to render widgets. It features a modern glassy look, is elegant and clean on the eyes, and is extremely customizable. - - %prep -%setup -q -n murrine-%{version} -%patch0 +%setup -q -n %{_name}-%{version} %build %configure --enable-animation -make %{?jobs:-j%jobs} +%__make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/engines/*.la +%makeinstall +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %clean rm -rf $RPM_BUILD_ROOT ++++++ murrine-0.90.3.tar.bz2 -> murrine-0.98.0.tar.bz2 ++++++ ++++ 26660 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0