26 Mar '20
The package rpms/yices.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/yices.git/commit/?id=26ecb5e37f7ca9….
Change:
+%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 26ecb5e37f7ca9b6f55f7769242761890fb434bd
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Mar 26 15:26:59 2020 -0600
Disable tests on 32-bit platforms due to failures from overflowing integers.
diff --git a/yices-big-endian.patch b/yices-big-endian.patch
index 005e664..32c6441 100644
--- a/yices-big-endian.patch
+++ b/yices-big-endian.patch
@@ -61,3 +61,18 @@
} rat32_t;
typedef struct {
+--- a/tests/unit/Makefile
++++ b/tests/unit/Makefile
+@@ -84,6 +84,12 @@ static_tests := $(src_c:%.c=$(static_bin
+ libyices := $(libdir)/libyices.a
+ static_libyices := $(static_libdir)/libyices.a
+
++#
++# Whether we are building for a big endian architecture
++#
++ifeq ($(WORDS_BIGENDIAN),yes)
++ CPPFLAGS += -DWORDS_BIGENDIAN
++endif
+
+ #
+ # Whether we have support for mcsat
diff --git a/yices.spec b/yices.spec
index cec23a4..f9274c4 100644
--- a/yices.spec
+++ b/yices.spec
@@ -123,8 +123,10 @@ rm -f %{buildroot}%{_libdir}/libyices.a
mkdir -p %{buildroot}%{_mandir}/man1
cp -p doc/*.1 %{buildroot}%{_mandir}/man1
+%ifnarch %{ix86} %{arm}
%check
make check MODE=debug
+%endif
%files
%doc doc/SMT-LIB-LANGUAGE doc/YICES-LANGUAGE
@@ -152,6 +154,8 @@ make check MODE=debug
- Drop upstreamed -missing-typedef patch
- Add -big-endian patch to fix s390x build
- Add -cryptominisat5 patch to fix build with recent cryptominisat releases
+- Skip tests on 32-bit platforms; some tests fail due to the limited size of a
+ C integer
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
1
0
26 Mar '20
The package rpms/julia.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/julia.git/commit/?id=69efd44f74dec8….
Change:
+%ifarch %{arm} %{ix86}
Thanks.
Full change:
============
commit 69efd44f74dec8f8c689f3617ad6ff8242db68ec
Author: Milan Bouchet-Valat <nalimilan(a)club.fr>
Date: Fri Jan 3 22:12:32 2020 +0100
New upstream release 1.4.0
Also clean a few things, and fix installation of symlinks:
creating them in the build dir is not enough to get them installed.
diff --git a/.gitignore b/.gitignore
index 4627963..35ad49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,9 @@
/SuiteSparse-5.4.0.tar.gz
/pcre2-10.31.zip
/pcre2-10.31.tar.bz2
+/Pkg-5de608c7b1837a24ed84eaaa14dde017986cb460.tar.gz
+/libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz
+/julia-1.3.1.tar.gz
+/julia-1.4.0.tar.gz
+/Pkg-9419c70af69153cd5c4276bff90fbb135e0aa3f1.tar.gz
+/llvm-8.0.1.src.tar.xz
diff --git a/julia-Bump-libgit2-to-0.28.2-32806.patch b/julia-Bump-libgit2-to-0.28.2-32806.patch
deleted file mode 100644
index f7cfcc3..0000000
--- a/julia-Bump-libgit2-to-0.28.2-32806.patch
+++ /dev/null
@@ -1,1101 +0,0 @@
-From d0b5d9850fb7b51c7831d3897ad46e4d3478d322 Mon Sep 17 00:00:00 2001
-From: Milan Bouchet-Valat <nalimilan(a)club.fr>
-Date: Thu, 22 Aug 2019 11:55:11 +0200
-Subject: [PATCH] Bump libgit2 to 0.28.2 (#32806)
-
-This allows dropping MbedTLS patches which have been upstreamed.
-The order in which configuration options are returned has changed, making a test fail:
-make the code more robust by giving priority to more specific options over global ones.
----
- deps/Versions.make | 4 +-
- deps/libgit2.mk | 16 +-
- deps/libgit2.version | 4 +-
- deps/patches/libgit2-mbedtls.patch | 952 ----------------------------
- deps/patches/libgit2-mbedtls2.patch | 28 -
- stdlib/LibGit2/src/gitcredential.jl | 8 +-
- 6 files changed, 12 insertions(+), 1000 deletions(-)
- delete mode 100644 deps/patches/libgit2-mbedtls.patch
- delete mode 100644 deps/patches/libgit2-mbedtls2.patch
-
-diff --git a/deps/Versions.make b/deps/Versions.make
-index ff103cbbe1..0fac074998 100644
---- a/deps/Versions.make
-+++ b/deps/Versions.make
-@@ -25,7 +25,7 @@ LIBSSH2_VER = 1.8.2
- LIBSSH2_BB_REL = 0
- CURL_VER = 7.61.0
- CURL_BB_REL = 1
--LIBGIT2_VER = 0.27.7
-+LIBGIT2_VER = 0.28.2
- LIBGIT2_BB_REL = 1
- LIBUV_VER = 1.24.0
- LIBUV_BB_REL = 1
-diff --git a/deps/libgit2.mk b/deps/libgit2.mk
-index 845cfba273..ae634542b0 100644
---- a/deps/libgit2.mk
-+++ b/deps/libgit2.mk
-@@ -44,24 +44,12 @@ endif
-
- LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)
-
--$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted
-- cd $(LIBGIT2_SRC_PATH) && \
-- patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls.patch
-- echo 1 > $@
--
--$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
-- cd $(LIBGIT2_SRC_PATH) && \
-- patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls2.patch
-- echo 1 > $@
--
--$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
-+$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
- cd $(LIBGIT2_SRC_PATH) && \
- patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
- echo 1 > $@
-
- $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
-- $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
-- $(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied \
- $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \
-
- $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
-@@ -109,7 +97,7 @@ $(build_prefix)/manifest/libgit2: $(build_datarootdir)/julia/cert.pem # use libg
-
- else # USE_BINARYBUILDER_LIBGIT2
-
--LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LI…
-+LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LI…
- LIBGIT2_BB_NAME := LibGit2.v$(LIBGIT2_VER)
- $(eval $(call bb-install,libgit2,LIBGIT2,false))
-
-diff --git a/deps/libgit2.version b/deps/libgit2.version
-index d35b024233..f67bedc414 100644
---- a/deps/libgit2.version
-+++ b/deps/libgit2.version
-@@ -1,2 +1,2 @@
--LIBGIT2_BRANCH=v0.27.7
--LIBGIT2_SHA1=f23dc5b29f1394928a940d7ec447f4bfd53dad1f
-+LIBGIT2_BRANCH=v0.28.2
-+LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
-diff --git a/deps/patches/libgit2-mbedtls.patch b/deps/patches/libgit2-mbedtls.patch
-deleted file mode 100644
-index c54a7e78c1..0000000000
---- a/deps/patches/libgit2-mbedtls.patch
-+++ /dev/null
-@@ -1,952 +0,0 @@
--Enables MbedTLS support
--
--Upstream: https://github.com/libgit2/libgit2/pull/4173
--
--NOTE: libgit2 has switched its CI to Azure Pipelines. The aforementioned PR makes modifications
--to the Travis YAML file, which has since been removed, causing patch conflicts. That part of
--the diff has thus been removed here.
--
--git diff ca3b2234dc7f1bd0d0f81488d3e29980b47a85b4^..cb2da47e56159faaaf143943c74ffb8f60a988b1 > libgit2-mbedtls.patch
--
--mbedtls: initial support
--mbedtls: proper certificate verification
--mbedtls: use libmbedcrypto for hashing
--mbedtls: add global initialization
--mbedtls: default cipher list support
--mbedtls: fix libgit2 hanging due to incomplete writes
--mbedtls: enable Travis CI tests
--mbedtls: use our own certificate validation
--mbedtls: use mbedTLS certificate verification
--mbedtls: load default CA certificates
--mbedtls: display error codes as hex for consistency with mbedTLS docs
--tests: clarify comment
--cmake: make our preferred backend ordering consistent
--travis: just grab what we need from mbedtls
--travis: pass -fPIC when configuring mbedtls
--
--diff --git a/CMakeLists.txt b/CMakeLists.txt
--index 2ca5354a7..9176eee04 100644
----- a/CMakeLists.txt
--+++ b/CMakeLists.txt
--@@ -48,7 +48,7 @@ OPTION( PROFILE "Generate profiling information" OFF )
-- OPTION( ENABLE_TRACE "Enables tracing support" OFF )
-- OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF )
--
---SET(SHA1_BACKEND "CollisionDetection" CACHE STRING "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, CollisionDetection. ")
--+SET(SHA1_BACKEND "CollisionDetection" CACHE STRING "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, mbedTLS, CollisionDetection. ")
-- OPTION( USE_SSH "Link with libssh to enable SSH support" ON )
-- OPTION( USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON )
-- OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF )
--diff --git a/cmake/Modules/FindmbedTLS.cmake b/cmake/Modules/FindmbedTLS.cmake
--new file mode 100644
--index 000000000..93297555e
----- /dev/null
--+++ b/cmake/Modules/FindmbedTLS.cmake
--@@ -0,0 +1,93 @@
--+# - Try to find mbedTLS
--+# Once done this will define
--+#
--+# Read-Only variables
--+# MBEDTLS_FOUND - system has mbedTLS
--+# MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
--+# MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
--+# MBEDTLS_LIBRARIES - Link these to use mbedTLS
--+# MBEDTLS_LIBRARY - path to mbedTLS library
--+# MBEDX509_LIBRARY - path to mbedTLS X.509 library
--+# MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
--+#
--+# Hint
--+# MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
--+
--+SET(_MBEDTLS_ROOT_HINTS
--+ ${MBEDTLS_ROOT_DIR}
--+ ENV MBEDTLS_ROOT_DIR
--+)
--+
--+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
--+ HINTS ${_MBEDTLS_ROOT_HINTS}
--+ PATHS ${_MBEDTLS_ROOT_PATHS}
--+)
--+
--+FIND_PATH(MBEDTLS_INCLUDE_DIR
--+ NAMES mbedtls/version.h
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES include
--+)
--+
--+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
--+ # Already in cache, be silent
--+ SET(MBEDTLS_FIND_QUIETLY TRUE)
--+ENDIF()
--+
--+FIND_LIBRARY(MBEDTLS_LIBRARY
--+ NAMES mbedtls libmbedtls
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+FIND_LIBRARY(MBEDX509_LIBRARY
--+ NAMES mbedx509 libmbedx509
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
--+ NAMES mbedcrypto libmbedcrypto
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+
--+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
--+ SET(MBEDTLS_FOUND TRUE)
--+ENDIF()
--+
--+IF(MBEDTLS_FOUND)
--+ #split mbedTLS into -L and -l linker options, so we can set them for pkg-config
--+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
--+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
--+ GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
--+ GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
--+ STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
--+ STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
--+ STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
--+ SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
--+
--+ IF(NOT MBEDTLS_FIND_QUIETLY)
--+ MESSAGE(STATUS "Found mbedTLS:")
--+ FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
--+ STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
--+ IF (MBEDTLSMATCH)
--+ STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
--+ MESSAGE(STATUS " version ${MBEDTLS_VERSION}")
--+ ENDIF(MBEDTLSMATCH)
--+ MESSAGE(STATUS " TLS: ${MBEDTLS_LIBRARY}")
--+ MESSAGE(STATUS " X509: ${MBEDX509_LIBRARY}")
--+ MESSAGE(STATUS " Crypto: ${MBEDCRYPTO_LIBRARY}")
--+ ENDIF(NOT MBEDTLS_FIND_QUIETLY)
--+ELSE(MBEDTLS_FOUND)
--+ IF(MBEDTLS_FIND_REQUIRED)
--+ MESSAGE(FATAL_ERROR "Could not find mbedTLS")
--+ ENDIF(MBEDTLS_FIND_REQUIRED)
--+ENDIF(MBEDTLS_FOUND)
--+
--+MARK_AS_ADVANCED(
--+ MBEDTLS_INCLUDE_DIR
--+ MBEDTLS_LIBRARY_DIR
--+ MBEDTLS_LIBRARIES
--+ MBEDTLS_LIBRARY
--+ MBEDX509_LIBRARY
--+ MBEDCRYPTO_LIBRARY
--+)
--diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh
--new file mode 100755
--index 000000000..99cbde4e0
----- /dev/null
--+++ b/script/install-deps-linux.sh
--@@ -0,0 +1,13 @@
--+#!/bin/sh
--+
--+set -x
--+
--+if [ "$MBEDTLS" ]; then
--+ git clone --depth 10 --single-branch --branch mbedtls-2.6.1 https://github.com/ARMmbed/mbedtls.git ./deps/mbedtls
--+ cd ./deps/mbedtls
--+ # We pass -fPIC explicitely because we'll include it in libgit2.so
--+ CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON .
--+ cmake --build .
--+
--+ echo "mbedTLS built in `pwd`"
--+fi
--diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--index b03b96af9..0f5d78547 100644
----- a/src/CMakeLists.txt
--+++ b/src/CMakeLists.txt
--@@ -133,6 +133,9 @@ ELSE ()
-- ENDIF()
--
-- IF (USE_HTTPS)
--+ # We try to find any packages our backends might use
--+ FIND_PACKAGE(OpenSSL)
--+ FIND_PACKAGE(mbedTLS)
-- IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-- FIND_PACKAGE(Security)
-- FIND_PACKAGE(CoreFoundation)
--@@ -149,8 +152,13 @@ IF (USE_HTTPS)
-- ENDIF()
-- ELSEIF (WINHTTP)
-- SET(HTTPS_BACKEND "WinHTTP")
--- ELSE()
--+ ELSEIF(OPENSSL_FOUND)
-- SET(HTTPS_BACKEND "OpenSSL")
--+ ELSEIF(MBEDTLS_FOUND)
--+ SET(HTTPS_BACKEND "mbedTLS")
--+ ELSE()
--+ MESSAGE(FATAL_ERROR "Unable to autodetect a usable HTTPS backend."
--+ "Please pass the backend name explicitly (-DUSE_HTTPS=backend)")
-- ENDIF()
-- ELSE()
-- # Backend was explicitly set
--@@ -174,8 +182,6 @@ IF (USE_HTTPS)
-- LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES})
-- LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
-- ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
--- FIND_PACKAGE(OpenSSL)
---
-- IF (NOT OPENSSL_FOUND)
-- MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
-- ENDIF()
--@@ -185,6 +191,53 @@ IF (USE_HTTPS)
-- LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES})
-- LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
-- LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
--+ ELSEIF(HTTPS_BACKEND STREQUAL "mbedTLS")
--+ IF (NOT MBEDTLS_FOUND)
--+ MESSAGE(FATAL_ERROR "Asked for mbedTLS backend, but it wasn't found")
--+ ENDIF()
--+
--+ IF(NOT CERT_LOCATION)
--+ MESSAGE("Auto-detecting default certificates location")
--+ IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
--+ # Check for an Homebrew installation
--+ SET(OPENSSL_CMD "/usr/local/opt/openssl/bin/openssl")
--+ ELSE()
--+ SET(OPENSSL_CMD "openssl")
--+ ENDIF()
--+ EXECUTE_PROCESS(COMMAND ${OPENSSL_CMD} version -d OUTPUT_VARIABLE OPENSSL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
--+ IF(OPENSSL_DIR)
--+ STRING(REGEX REPLACE "^OPENSSLDIR: \"(.*)\"$" "\\1/" OPENSSL_DIR ${OPENSSL_DIR})
--+
--+ SET(OPENSSL_CA_LOCATIONS
--+ "ca-bundle.pem" # OpenSUSE Leap 42.1
--+ "cert.pem" # Ubuntu 14.04, FreeBSD
--+ "certs/ca-certificates.crt" # Ubuntu 16.04
--+ "certs/ca.pem" # Debian 7
--+ )
--+ FOREACH(SUFFIX IN LISTS OPENSSL_CA_LOCATIONS)
--+ SET(LOC "${OPENSSL_DIR}${SUFFIX}")
--+ IF(NOT CERT_LOCATION AND EXISTS "${OPENSSL_DIR}${SUFFIX}")
--+ SET(CERT_LOCATION ${LOC})
--+ ENDIF()
--+ ENDFOREACH()
--+ ELSE()
--+ MESSAGE("Unable to find OpenSSL executable. Please provide default certificate location via CERT_LOCATION")
--+ ENDIF()
--+ ENDIF()
--+
--+ IF(CERT_LOCATION)
--+ IF(NOT EXISTS ${CERT_LOCATION})
--+ MESSAGE(FATAL_ERROR "Cannot use CERT_LOCATION=${CERT_LOCATION} as it doesn't exist")
--+ ENDIF()
--+ ADD_FEATURE_INFO(CERT_LOCATION ON "using certificates from ${CERT_LOCATION}")
--+ ADD_DEFINITIONS(-DGIT_DEFAULT_CERT_LOCATION="${CERT_LOCATION}")
--+ ENDIF()
--+
--+ SET(GIT_MBEDTLS 1)
--+ LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR})
--+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
--+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LDFLAGS})
--+ LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
-- ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP")
-- # WinHTTP setup was handled in the WinHTTP-specific block above
-- ELSE()
--@@ -230,6 +283,11 @@ ELSEIF(SHA1_BACKEND STREQUAL "Win32")
-- ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
-- ADD_FEATURE_INFO(SHA ON "using CommonCrypto")
-- SET(GIT_SHA1_COMMON_CRYPTO 1)
--+ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS")
--+ ADD_FEATURE_INFO(SHA ON "using mbedTLS")
--+ SET(GIT_SHA1_MBEDTLS 1)
--+ FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c)
--+ LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
-- ELSE()
-- MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}")
-- ENDIF()
--diff --git a/src/features.h.in b/src/features.h.in
--index e03b7a251..f414c5843 100644
----- a/src/features.h.in
--+++ b/src/features.h.in
--@@ -27,10 +27,12 @@
-- #cmakedefine GIT_HTTPS 1
-- #cmakedefine GIT_OPENSSL 1
-- #cmakedefine GIT_SECURE_TRANSPORT 1
--+#cmakedefine GIT_MBEDTLS 1
--
-- #cmakedefine GIT_SHA1_COLLISIONDETECT 1
-- #cmakedefine GIT_SHA1_WIN32 1
-- #cmakedefine GIT_SHA1_COMMON_CRYPTO 1
-- #cmakedefine GIT_SHA1_OPENSSL 1
--+#cmakedefine GIT_SHA1_MBEDTLS 1
--
-- #endif
--diff --git a/src/global.c b/src/global.c
--index 2f9b45bcd..02aedf57d 100644
----- a/src/global.c
--+++ b/src/global.c
--@@ -12,6 +12,7 @@
-- #include "filter.h"
-- #include "merge_driver.h"
-- #include "streams/curl.h"
--+#include "streams/mbedtls.h"
-- #include "streams/openssl.h"
-- #include "thread-utils.h"
-- #include "git2/global.h"
--@@ -65,7 +66,8 @@ static int init_common(void)
-- (ret = git_merge_driver_global_init()) == 0 &&
-- (ret = git_transport_ssh_global_init()) == 0 &&
-- (ret = git_openssl_stream_global_init()) == 0 &&
--- (ret = git_curl_stream_global_init()) == 0)
--+ (ret = git_curl_stream_global_init()) == 0 &&
--+ (ret = git_mbedtls_stream_global_init()) == 0)
-- ret = git_mwindow_global_init();
--
-- GIT_MEMORY_BARRIER;
--diff --git a/src/hash.h b/src/hash.h
--index 31eaf8889..93765adf3 100644
----- a/src/hash.h
--+++ b/src/hash.h
--@@ -26,6 +26,8 @@ void git_hash_ctx_cleanup(git_hash_ctx *ctx);
-- # include "hash/hash_openssl.h"
-- #elif defined(GIT_SHA1_WIN32)
-- # include "hash/hash_win32.h"
--+#elif defined(GIT_SHA1_MBEDTLS)
--+# include "hash/hash_mbedtls.h"
-- #else
-- # include "hash/hash_generic.h"
-- #endif
--diff --git a/src/hash/hash_mbedtls.c b/src/hash/hash_mbedtls.c
--new file mode 100644
--index 000000000..a19d76308
----- /dev/null
--+++ b/src/hash/hash_mbedtls.c
--@@ -0,0 +1,38 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#include "common.h"
--+#include "hash.h"
--+#include "hash/hash_mbedtls.h"
--+
--+void git_hash_ctx_cleanup(git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_free(&ctx->c);
--+}
--+
--+int git_hash_init(git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_init(&ctx->c);
--+ mbedtls_sha1_starts(&ctx->c);
--+ return 0;
--+}
--+
--+int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_update(&ctx->c, data, len);
--+ return 0;
--+}
--+
--+int git_hash_final(git_oid *out, git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_finish(&ctx->c, out->id);
--+ return 0;
--+}
--diff --git a/src/hash/hash_mbedtls.h b/src/hash/hash_mbedtls.h
--new file mode 100644
--index 000000000..24196c5bf
----- /dev/null
--+++ b/src/hash/hash_mbedtls.h
--@@ -0,0 +1,20 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#ifndef INCLUDE_hash_mbedtld_h__
--+#define INCLUDE_hash_mbedtld_h__
--+
--+#include <mbedtls/sha1.h>
--+
--+struct git_hash_ctx {
--+ mbedtls_sha1_context c;
--+};
--+
--+#define git_hash_global_init() 0
--+#define git_hash_ctx_init(ctx) git_hash_init(ctx)
--+
--+#endif /* INCLUDE_hash_mbedtld_h__ */
--diff --git a/src/settings.c b/src/settings.c
--index 2a52ffbf6..f6bc5b270 100644
----- a/src/settings.c
--+++ b/src/settings.c
--@@ -11,6 +11,10 @@
-- # include <openssl/err.h>
-- #endif
--
--+#ifdef GIT_MBEDTLS
--+# include <mbedtls/error.h>
--+#endif
--+
-- #include <git2.h>
-- #include "sysdir.h"
-- #include "cache.h"
--@@ -20,6 +24,7 @@
-- #include "refs.h"
-- #include "transports/smart.h"
-- #include "streams/openssl.h"
--+#include "streams/mbedtls.h"
--
-- void git_libgit2_version(int *major, int *minor, int *rev)
-- {
--@@ -175,6 +180,15 @@ int git_libgit2_opts(int key, ...)
-- const char *path = va_arg(ap, const char *);
-- error = git_openssl__set_cert_location(file, path);
-- }
--+#elif defined(GIT_MBEDTLS)
--+ {
--+ const char *file = va_arg(ap, const char *);
--+ const char *path = va_arg(ap, const char *);
--+ if (file)
--+ error = git_mbedtls__set_cert_location(file, 0);
--+ if (error && path)
--+ error = git_mbedtls__set_cert_location(path, 1);
--+ }
-- #else
-- giterr_set(GITERR_SSL, "TLS backend doesn't support certificate locations");
-- error = -1;
--@@ -199,7 +213,7 @@ int git_libgit2_opts(int key, ...)
-- break;
--
-- case GIT_OPT_SET_SSL_CIPHERS:
---#ifdef GIT_OPENSSL
--+#if (GIT_OPENSSL || GIT_MBEDTLS)
-- {
-- git__free(git__ssl_ciphers);
-- git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
--diff --git a/src/streams/mbedtls.c b/src/streams/mbedtls.c
--new file mode 100644
--index 000000000..0a49a36a6
----- /dev/null
--+++ b/src/streams/mbedtls.c
--@@ -0,0 +1,452 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#include "streams/mbedtls.h"
--+
--+#ifdef GIT_MBEDTLS
--+
--+#include <ctype.h>
--+
--+#include "global.h"
--+#include "stream.h"
--+#include "streams/socket.h"
--+#include "netops.h"
--+#include "git2/transport.h"
--+#include "util.h"
--+
--+#ifdef GIT_CURL
--+# include "streams/curl.h"
--+#endif
--+
--+#ifndef GIT_DEFAULT_CERT_LOCATION
--+#define GIT_DEFAULT_CERT_LOCATION NULL
--+#endif
--+
--+#include <mbedtls/config.h>
--+#include <mbedtls/ssl.h>
--+#include <mbedtls/error.h>
--+#include <mbedtls/entropy.h>
--+#include <mbedtls/ctr_drbg.h>
--+
--+mbedtls_ssl_config *git__ssl_conf;
--+mbedtls_entropy_context *mbedtls_entropy;
--+
--+#define GIT_SSL_DEFAULT_CIPHERS "TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384:TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-DSS-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-DSS-WITH-AES-256-GCM-SHA384:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-128-CBC-SHA256:TLS-DHE-DSS-WITH-AES-256-CBC-SHA256:TLS-DHE-DSS-WITH-AES-128-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-128-GCM-SHA256:TLS-RSA-WITH-AES-256-GCM-SHA384:TLS-RSA-WITH-AES-128-CBC-SHA256:TLS-RSA-WITH-AES-256-CBC-SHA256:TLS-RSA-WITH-AES-128-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA"
--+#define GIT_SSL_DEFAULT_CIPHERS_COUNT 30
--+
--+/**
--+ * This function aims to clean-up the SSL context which
--+ * we allocated.
--+ */
--+static void shutdown_ssl(void)
--+{
--+ if (git__ssl_conf) {
--+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
--+ git__free(git__ssl_conf->ca_chain);
--+ mbedtls_ctr_drbg_free(git__ssl_conf->p_rng);
--+ git__free(git__ssl_conf->p_rng);
--+ mbedtls_ssl_config_free(git__ssl_conf);
--+ git__free(git__ssl_conf);
--+ git__ssl_conf = NULL;
--+ }
--+ if (mbedtls_entropy) {
--+ mbedtls_entropy_free(mbedtls_entropy);
--+ git__free(mbedtls_entropy);
--+ mbedtls_entropy = NULL;
--+ }
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir);
--+
--+int git_mbedtls_stream_global_init(void)
--+{
--+ int loaded = 0;
--+ char *crtpath = GIT_DEFAULT_CERT_LOCATION;
--+ struct stat statbuf;
--+ mbedtls_ctr_drbg_context *ctr_drbg = NULL;
--+
--+ int *ciphers_list = NULL;
--+ int ciphers_known = 0;
--+ char *cipher_name = NULL;
--+ char *cipher_string = NULL;
--+ char *cipher_string_tmp = NULL;
--+
--+ mbedtls_x509_crt *cacert = NULL;
--+
--+ git__ssl_conf = git__malloc(sizeof(mbedtls_ssl_config));
--+ mbedtls_ssl_config_init(git__ssl_conf);
--+ if (mbedtls_ssl_config_defaults(git__ssl_conf,
--+ MBEDTLS_SSL_IS_CLIENT,
--+ MBEDTLS_SSL_TRANSPORT_STREAM,
--+ MBEDTLS_SSL_PRESET_DEFAULT) != 0) {
--+ giterr_set(GITERR_SSL, "failed to initialize mbedTLS");
--+ goto cleanup;
--+ }
--+
--+ /* configure TLSv1 */
--+ mbedtls_ssl_conf_min_version(git__ssl_conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_0);
--+
--+ /* verify_server_cert is responsible for making the check.
--+ * OPTIONAL because REQUIRED drops the certificate as soon as the check
--+ * is made, so we can never see the certificate and override it. */
--+ mbedtls_ssl_conf_authmode(git__ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
--+
--+ /* set the list of allowed ciphersuites */
--+ ciphers_list = calloc(GIT_SSL_DEFAULT_CIPHERS_COUNT, sizeof(int));
--+ ciphers_known = 0;
--+ cipher_string = cipher_string_tmp = git__strdup(GIT_SSL_DEFAULT_CIPHERS);
--+ while ((cipher_name = git__strtok(&cipher_string_tmp, ":")) != NULL) {
--+ int cipherid = mbedtls_ssl_get_ciphersuite_id(cipher_name);
--+ if (cipherid == 0) continue;
--+
--+ ciphers_list[ciphers_known++] = cipherid;
--+ }
--+ git__free(cipher_string);
--+
--+ if (!ciphers_known) {
--+ giterr_set(GITERR_SSL, "no cipher could be enabled");
--+ goto cleanup;
--+ }
--+ mbedtls_ssl_conf_ciphersuites(git__ssl_conf, ciphers_list);
--+
--+ /* Seeding the random number generator */
--+ mbedtls_entropy = git__malloc(sizeof(mbedtls_entropy_context));
--+ mbedtls_entropy_init(mbedtls_entropy);
--+
--+ ctr_drbg = git__malloc(sizeof(mbedtls_ctr_drbg_context));
--+ mbedtls_ctr_drbg_init(ctr_drbg);
--+ if (mbedtls_ctr_drbg_seed(ctr_drbg,
--+ mbedtls_entropy_func,
--+ mbedtls_entropy, NULL, 0) != 0) {
--+ giterr_set(GITERR_SSL, "failed to initialize mbedTLS entropy pool");
--+ goto cleanup;
--+ }
--+
--+ mbedtls_ssl_conf_rng(git__ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
--+
--+ /* load default certificates */
--+ if (crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
--+ loaded = (git_mbedtls__set_cert_location(crtpath, 0) == 0);
--+ if (!loaded && crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
--+ loaded = (git_mbedtls__set_cert_location(crtpath, 1) == 0);
--+
--+ git__on_shutdown(shutdown_ssl);
--+
--+ return 0;
--+
--+cleanup:
--+ mbedtls_x509_crt_free(cacert);
--+ git__free(cacert);
--+ mbedtls_ctr_drbg_free(ctr_drbg);
--+ git__free(ctr_drbg);
--+ mbedtls_ssl_config_free(git__ssl_conf);
--+ git__free(git__ssl_conf);
--+ git__ssl_conf = NULL;
--+
--+ return -1;
--+}
--+
--+mbedtls_ssl_config *git__ssl_conf;
--+
--+static int bio_read(void *b, unsigned char *buf, size_t len)
--+{
--+ git_stream *io = (git_stream *) b;
--+ return (int) git_stream_read(io, buf, len);
--+}
--+
--+static int bio_write(void *b, const unsigned char *buf, size_t len)
--+{
--+ git_stream *io = (git_stream *) b;
--+ return (int) git_stream_write(io, (const char *)buf, len, 0);
--+}
--+
--+static int ssl_set_error(mbedtls_ssl_context *ssl, int error)
--+{
--+ char errbuf[512];
--+ int ret = -1;
--+
--+ assert(error != MBEDTLS_ERR_SSL_WANT_READ);
--+ assert(error != MBEDTLS_ERR_SSL_WANT_WRITE);
--+
--+ if (error != 0)
--+ mbedtls_strerror( error, errbuf, 512 );
--+
--+ switch(error) {
--+ case 0:
--+ giterr_set(GITERR_SSL, "SSL error: unknown error");
--+ break;
--+
--+ case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:
--+ giterr_set(GITERR_SSL, "SSL error: %#04x [%x] - %s", error, ssl->session_negotiate->verify_result, errbuf);
--+ ret = GIT_ECERTIFICATE;
--+ break;
--+
--+ default:
--+ giterr_set(GITERR_SSL, "SSL error: %#04x - %s", error, errbuf);
--+ }
--+
--+ return ret;
--+}
--+
--+static int ssl_teardown(mbedtls_ssl_context *ssl)
--+{
--+ int ret = 0;
--+
--+ ret = mbedtls_ssl_close_notify(ssl);
--+ if (ret < 0)
--+ ret = ssl_set_error(ssl, ret);
--+
--+ mbedtls_ssl_free(ssl);
--+ return ret;
--+}
--+
--+static int verify_server_cert(mbedtls_ssl_context *ssl)
--+{
--+ int ret = -1;
--+
--+ if ((ret = mbedtls_ssl_get_verify_result(ssl)) != 0) {
--+ char vrfy_buf[512];
--+ int len = mbedtls_x509_crt_verify_info(vrfy_buf, sizeof(vrfy_buf), "", ret);
--+ if (len >= 1) vrfy_buf[len - 1] = '\0'; /* Remove trailing \n */
--+ giterr_set(GITERR_SSL, "the SSL certificate is invalid: %#04x - %s", ret, vrfy_buf);
--+ return GIT_ECERTIFICATE;
--+ }
--+
--+ return 0;
--+}
--+
--+typedef struct {
--+ git_stream parent;
--+ git_stream *io;
--+ bool connected;
--+ char *host;
--+ mbedtls_ssl_context *ssl;
--+ git_cert_x509 cert_info;
--+} mbedtls_stream;
--+
--+
--+int mbedtls_connect(git_stream *stream)
--+{
--+ int ret;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ if ((ret = git_stream_connect(st->io)) < 0)
--+ return ret;
--+
--+ st->connected = true;
--+
--+ mbedtls_ssl_set_hostname(st->ssl, st->host);
--+
--+ mbedtls_ssl_set_bio(st->ssl, st->io, bio_write, bio_read, NULL);
--+
--+ if ((ret = mbedtls_ssl_handshake(st->ssl)) != 0)
--+ return ssl_set_error(st->ssl, ret);
--+
--+ return verify_server_cert(st->ssl);
--+}
--+
--+int mbedtls_certificate(git_cert **out, git_stream *stream)
--+{
--+ unsigned char *encoded_cert;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ const mbedtls_x509_crt *cert = mbedtls_ssl_get_peer_cert(st->ssl);
--+ if (!cert) {
--+ giterr_set(GITERR_SSL, "the server did not provide a certificate");
--+ return -1;
--+ }
--+
--+ /* Retrieve the length of the certificate first */
--+ if (cert->raw.len == 0) {
--+ giterr_set(GITERR_NET, "failed to retrieve certificate information");
--+ return -1;
--+ }
--+
--+ encoded_cert = git__malloc(cert->raw.len);
--+ GITERR_CHECK_ALLOC(encoded_cert);
--+ memcpy(encoded_cert, cert->raw.p, cert->raw.len);
--+
--+ st->cert_info.parent.cert_type = GIT_CERT_X509;
--+ st->cert_info.data = encoded_cert;
--+ st->cert_info.len = cert->raw.len;
--+
--+ *out = &st->cert_info.parent;
--+
--+ return 0;
--+}
--+
--+static int mbedtls_set_proxy(git_stream *stream, const git_proxy_options *proxy_options)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ return git_stream_set_proxy(st->io, proxy_options);
--+}
--+
--+ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t len, int flags)
--+{
--+ size_t read = 0;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ GIT_UNUSED(flags);
--+
--+ do {
--+ int error = mbedtls_ssl_write(st->ssl, (const unsigned char *)data + read, len - read);
--+ if (error <= 0) {
--+ return ssl_set_error(st->ssl, error);
--+ }
--+ read += error;
--+ } while (read < len);
--+
--+ return read;
--+}
--+
--+ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+ int ret;
--+
--+ if ((ret = mbedtls_ssl_read(st->ssl, (unsigned char *)data, len)) <= 0)
--+ ssl_set_error(st->ssl, ret);
--+
--+ return ret;
--+}
--+
--+int mbedtls_stream_close(git_stream *stream)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+ int ret = 0;
--+
--+ if (st->connected && (ret = ssl_teardown(st->ssl)) != 0)
--+ return -1;
--+
--+ st->connected = false;
--+
--+ return git_stream_close(st->io);
--+}
--+
--+void mbedtls_stream_free(git_stream *stream)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ git__free(st->host);
--+ git__free(st->cert_info.data);
--+ git_stream_free(st->io);
--+ git__free(st->ssl);
--+ git__free(st);
--+}
--+
--+int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port)
--+{
--+ int error;
--+ mbedtls_stream *st;
--+
--+ st = git__calloc(1, sizeof(mbedtls_stream));
--+ GITERR_CHECK_ALLOC(st);
--+
--+#ifdef GIT_CURL
--+ error = git_curl_stream_new(&st->io, host, port);
--+#else
--+ error = git_socket_stream_new(&st->io, host, port);
--+#endif
--+
--+ if (error < 0)
--+ goto out_err;
--+
--+ st->ssl = git__malloc(sizeof(mbedtls_ssl_context));
--+ GITERR_CHECK_ALLOC(st->ssl);
--+ mbedtls_ssl_init(st->ssl);
--+ if (mbedtls_ssl_setup(st->ssl, git__ssl_conf)) {
--+ giterr_set(GITERR_SSL, "failed to create ssl object");
--+ error = -1;
--+ goto out_err;
--+ }
--+
--+ st->host = git__strdup(host);
--+ GITERR_CHECK_ALLOC(st->host);
--+
--+ st->parent.version = GIT_STREAM_VERSION;
--+ st->parent.encrypted = 1;
--+ st->parent.proxy_support = git_stream_supports_proxy(st->io);
--+ st->parent.connect = mbedtls_connect;
--+ st->parent.certificate = mbedtls_certificate;
--+ st->parent.set_proxy = mbedtls_set_proxy;
--+ st->parent.read = mbedtls_stream_read;
--+ st->parent.write = mbedtls_stream_write;
--+ st->parent.close = mbedtls_stream_close;
--+ st->parent.free = mbedtls_stream_free;
--+
--+ *out = (git_stream *) st;
--+ return 0;
--+
--+out_err:
--+ mbedtls_ssl_free(st->ssl);
--+ git_stream_free(st->io);
--+ git__free(st);
--+
--+ return error;
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir)
--+{
--+ int ret = 0;
--+ char errbuf[512];
--+ mbedtls_x509_crt *cacert;
--+
--+ assert(path != NULL);
--+
--+ cacert = git__malloc(sizeof(mbedtls_x509_crt));
--+ mbedtls_x509_crt_init(cacert);
--+ if (is_dir) {
--+ ret = mbedtls_x509_crt_parse_path(cacert, path);
--+ } else {
--+ ret = mbedtls_x509_crt_parse_file(cacert, path);
--+ }
--+ /* mbedtls_x509_crt_parse_path returns the number of invalid certs on success */
--+ if (ret < 0) {
--+ mbedtls_x509_crt_free(cacert);
--+ git__free(cacert);
--+ mbedtls_strerror( ret, errbuf, 512 );
--+ giterr_set(GITERR_SSL, "failed to load CA certificates: %#04x - %s", ret, errbuf);
--+ return -1;
--+ }
--+
--+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
--+ git__free(git__ssl_conf->ca_chain);
--+ mbedtls_ssl_conf_ca_chain(git__ssl_conf, cacert, NULL);
--+
--+ return 0;
--+}
--+
--+#else
--+
--+#include "stream.h"
--+
--+int git_mbedtls_stream_global_init(void)
--+{
--+ return 0;
--+}
--+
--+int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port)
--+{
--+ GIT_UNUSED(out);
--+ GIT_UNUSED(host);
--+ GIT_UNUSED(port);
--+
--+ giterr_set(GITERR_SSL, "mbedTLS is not supported in this version");
--+ return -1;
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir)
--+{
--+ GIT_UNUSED(path);
--+ GIT_UNUSED(is_dir);
--+
--+ giterr_set(GITERR_SSL, "mbedTLS is not supported in this version");
--+ return -1;
--+}
--+
--+#endif
--diff --git a/src/streams/mbedtls.h b/src/streams/mbedtls.h
--new file mode 100644
--index 000000000..7283698ff
----- /dev/null
--+++ b/src/streams/mbedtls.h
--@@ -0,0 +1,20 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+#ifndef INCLUDE_steams_mbedtls_h__
--+#define INCLUDE_steams_mbedtls_h__
--+
--+#include "common.h"
--+
--+#include "git2/sys/stream.h"
--+
--+extern int git_mbedtls_stream_global_init(void);
--+
--+extern int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port);
--+
--+extern int git_mbedtls__set_cert_location(const char *path, int is_dir);
--+
--+#endif
--diff --git a/src/streams/tls.c b/src/streams/tls.c
--index d6ca7d40d..1bcb0d984 100644
----- a/src/streams/tls.c
--+++ b/src/streams/tls.c
--@@ -9,6 +9,7 @@
--
-- #include "git2/errors.h"
--
--+#include "streams/mbedtls.h"
-- #include "streams/openssl.h"
-- #include "streams/stransport.h"
--
--@@ -31,6 +32,8 @@ int git_tls_stream_new(git_stream **out, const char *host, const char *port)
-- return git_stransport_stream_new(out, host, port);
-- #elif defined(GIT_OPENSSL)
-- return git_openssl_stream_new(out, host, port);
--+#elif defined(GIT_MBEDTLS)
--+ return git_mbedtls_stream_new(out, host, port);
-- #else
-- GIT_UNUSED(out);
-- GIT_UNUSED(host);
--diff --git a/tests/core/stream.c b/tests/core/stream.c
--index 9bed4ae27..262888b10 100644
----- a/tests/core/stream.c
--+++ b/tests/core/stream.c
--@@ -33,9 +33,8 @@ void test_core_stream__register_tls(void)
-- cl_git_pass(git_stream_register_tls(NULL));
-- error = git_tls_stream_new(&stream, "localhost", "443");
--
--- /* We don't have arbitrary TLS stream support on Windows
--- * or when openssl support is disabled (except on OSX
--- * with Security framework).
--+ /* We don't have TLS support enabled, or we're on Windows,
--+ * which has no arbitrary TLS stream support.
-- */
-- #if defined(GIT_WIN32) || !defined(GIT_HTTPS)
-- cl_git_fail_with(-1, error);
-diff --git a/deps/patches/libgit2-mbedtls2.patch b/deps/patches/libgit2-mbedtls2.patch
-deleted file mode 100644
-index 2bc02a3725..0000000000
---- a/deps/patches/libgit2-mbedtls2.patch
-+++ /dev/null
-@@ -1,28 +0,0 @@
--Fixes mbedTLS support to link properly and not include libssl.so
--
--Tracked in upstream PR https://github.com/libgit2/libgit2/pull/4678
--
--NOTE: libgit2 has switched its CI to Azure Pipelines. The aforementioned PR makes modifications
--to the Travis YAML file, which has since been removed, causing patch conflicts. That part of
--the diff has thus been removed here.
--
--diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--index 2b82bb325..2deed5f87 100644
----- a/src/CMakeLists.txt
--+++ b/src/CMakeLists.txt
--@@ -284,8 +284,13 @@ ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
-- ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS")
-- ADD_FEATURE_INFO(SHA ON "using mbedTLS")
-- SET(GIT_SHA1_MBEDTLS 1)
--- FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c)
--- LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
--+ FILE(GLOB SRC_SHA1 hash/hash_mbedtls.c)
--+ LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR})
--+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
--+ # mbedTLS has no pkgconfig file, hence we can't require it
--+ # https://github.com/ARMmbed/mbedtls/issues/228
--+ # For now, pass its link flags as our own
--+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
-- ELSE()
-- MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}")
-- ENDIF()
-diff --git a/stdlib/LibGit2/src/gitcredential.jl b/stdlib/LibGit2/src/gitcredential.jl
-index 09c70d7d73..a0504b1c3d 100644
---- a/stdlib/LibGit2/src/gitcredential.jl
-+++ b/stdlib/LibGit2/src/gitcredential.jl
-@@ -263,6 +263,7 @@ function default_username(cfg::GitConfig, cred::GitCredential)
- end
-
- function use_http_path(cfg::GitConfig, cred::GitCredential)
-+ seen_specific = false
- use_path = false # Default is to ignore the path
-
- # https://git-scm.com/docs/gitcredentials#gitcredentials-useHttpPath
-@@ -272,8 +273,11 @@ function use_http_path(cfg::GitConfig, cred::GitCredential)
- for entry in GitConfigIter(cfg, r"credential.*\.usehttppath")
- section, url, name, value = split_cfg_entry(entry)
-
-- ismatch(url, cred) || continue
-- use_path = value == "true"
-+ # Ignore global configuration if we have already encountered more specific entry
-+ if ismatch(url, cred) && (!isempty(url) || !seen_specific)
-+ seen_specific = !isempty(url)
-+ use_path = value == "true"
-+ end
- end
-
- return use_path
---
-2.20.1
-
diff --git a/julia-Bump-libgit2-to-0.99.1.patch b/julia-Bump-libgit2-to-0.99.1.patch
new file mode 100644
index 0000000..89243c1
--- /dev/null
+++ b/julia-Bump-libgit2-to-0.99.1.patch
@@ -0,0 +1,197 @@
+From fa4481b0ef8ff668da71d64ea41cc8d209775bee Mon Sep 17 00:00:00 2001
+From: Milan Bouchet-Valat <nalimilan(a)club.fr>
+Date: Mon, 23 Mar 2020 10:20:58 +0100
+Subject: [PATCH] Bump libgit2 to 0.99.1
+
+---
+ deps/libgit2.version | 4 ++--
+ stdlib/LibGit2/src/LibGit2.jl | 2 +-
+ stdlib/LibGit2/src/blob.jl | 2 +-
+ stdlib/LibGit2/src/error.jl | 15 ++++++++++++---
+ stdlib/LibGit2/src/oid.jl | 3 ++-
+ stdlib/LibGit2/src/repository.jl | 2 +-
+ stdlib/LibGit2/src/types.jl | 11 ++++-------
+ stdlib/LibGit2/src/utils.jl | 4 ++--
+ stdlib/LibGit2/src/walker.jl | 2 +-
+ stdlib/LibGit2/test/libgit2.jl | 2 +-
+ 10 files changed, 27 insertions(+), 20 deletions(-)
+
+diff --git a/deps/libgit2.version b/deps/libgit2.version
+index f67bedc414..dc3c50c9c6 100644
+--- a/deps/libgit2.version
++++ b/deps/libgit2.version
+@@ -1,2 +1,2 @@
+-LIBGIT2_BRANCH=v0.28.2
+-LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
++LIBGIT2_BRANCH=v0.99.0
++LIBGIT2_SHA1=172239021f7ba04fe7327647b213799853a9eb89
+diff --git a/stdlib/LibGit2/src/LibGit2.jl b/stdlib/LibGit2/src/LibGit2.jl
+index 627922e138..b890a0c42f 100644
+--- a/stdlib/LibGit2/src/LibGit2.jl
++++ b/stdlib/LibGit2/src/LibGit2.jl
+@@ -18,10 +18,10 @@ const REFCOUNT = Threads.Atomic{Int}(0)
+
+ function ensure_initialized end
+
++include("error.jl")
+ include("utils.jl")
+ include("consts.jl")
+ include("types.jl")
+-include("error.jl")
+ include("signature.jl")
+ include("oid.jl")
+ include("reference.jl")
+diff --git a/stdlib/LibGit2/src/blob.jl b/stdlib/LibGit2/src/blob.jl
+index b416fac732..efd7a14c9c 100644
+--- a/stdlib/LibGit2/src/blob.jl
++++ b/stdlib/LibGit2/src/blob.jl
+@@ -67,7 +67,7 @@ id = LibGit2.addblob!(repo, blob_file)
+ function addblob!(repo::GitRepo, path::AbstractString)
+ ensure_initialized()
+ id_ref = Ref{GitHash}()
+- @check ccall((:git_blob_create_fromdisk, :libgit2), Cint,
++ @check ccall((:git_blob_create_from_disk, :libgit2), Cint,
+ (Ptr{GitHash}, Ptr{Cvoid}, Cstring),
+ id_ref, repo.ptr, path)
+ return id_ref[]
+diff --git a/stdlib/LibGit2/src/error.jl b/stdlib/LibGit2/src/error.jl
+index 4d1e915cef..3e56999d5a 100644
+--- a/stdlib/LibGit2/src/error.jl
++++ b/stdlib/LibGit2/src/error.jl
+@@ -25,9 +25,13 @@ export GitError
+ ECERTIFICATE = Cint(-17), # server certificate is invalid
+ EAPPLIED = Cint(-18), # patch/merge has already been applied
+ EPEEL = Cint(-19), # the requested peel operation is not possible
+- EEOF = Cint(-20), # Unexpted EOF
++ EEOF = Cint(-20), # unexpected EOF
+ PASSTHROUGH = Cint(-30), # internal only
+- ITEROVER = Cint(-31)) # signals end of iteration
++ ITEROVER = Cint(-31), # signals end of iteration
++ RETRY = Cint(-32), # internal only
++ EMISMATCH = Cint(-33), # hashsum mismatch in object
++ EINDEXDIRTY = Cint(-34), # unsaved changes in the index would be overwritten
++ EAPPLYFAIL = Cint(-35)) # patch application failed
+
+ @enum(Class, None,
+ NoMemory,
+@@ -58,7 +62,12 @@ export GitError
+ Callback,
+ CherryPick,
+ Describe,
+- Rebase)
++ Rebase,
++ Filesystem,
++ Patch,
++ WorkTree,
++ SHA1,
++ HTTP)
+
+ struct ErrorStruct
+ message::Ptr{UInt8}
+diff --git a/stdlib/LibGit2/src/oid.jl b/stdlib/LibGit2/src/oid.jl
+index 069d725685..1074f003eb 100644
+--- a/stdlib/LibGit2/src/oid.jl
++++ b/stdlib/LibGit2/src/oid.jl
+@@ -13,7 +13,8 @@ function GitHash(ptr::Ptr{UInt8})
+ end
+ ensure_initialized()
+ oid_ptr = Ref(GitHash())
+- ccall((:git_oid_fromraw, :libgit2), Cvoid, (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr)
++ @check ccall((:git_oid_fromraw, :libgit2), Cint,
++ (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr)
+ return oid_ptr[]
+ end
+
+diff --git a/stdlib/LibGit2/src/repository.jl b/stdlib/LibGit2/src/repository.jl
+index 96249bd9f6..8c858b1f8f 100644
+--- a/stdlib/LibGit2/src/repository.jl
++++ b/stdlib/LibGit2/src/repository.jl
+@@ -32,7 +32,7 @@ end
+ function cleanup(r::GitRepo)
+ if r.ptr != C_NULL
+ ensure_initialized()
+- ccall((:git_repository__cleanup, :libgit2), Cvoid, (Ptr{Cvoid},), r.ptr)
++ @check ccall((:git_repository__cleanup, :libgit2), Cint, (Ptr{Cvoid},), r.ptr)
+ end
+ end
+
+diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
+index 6ffbe67ea2..3edb76a73d 100644
+--- a/stdlib/LibGit2/src/types.jl
++++ b/stdlib/LibGit2/src/types.jl
+@@ -197,7 +197,7 @@ end
+ LibGit2.TransferProgress
+
+ Transfer progress information used by the `transfer_progress` remote callback.
+-Matches the [`git_transfer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_transfer_progress) struct.
++Matches the [`git_indexer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_indexer_progress) struct.
+ """
+ @kwdef struct TransferProgress
+ total_objects::Cuint = Cuint(0)
+@@ -223,6 +223,7 @@ end
+ push_negotiation::Ptr{Cvoid} = C_NULL
+ transport::Ptr{Cvoid} = C_NULL
+ payload::Ptr{Cvoid} = C_NULL
++ resolve_url::Ptr{Cvoid} = C_NULL
+ end
+
+ """
+@@ -325,12 +326,8 @@ end
+ prune::Cint = Consts.FETCH_PRUNE_UNSPECIFIED
+ update_fetchhead::Cint = Cint(1)
+ download_tags::Cint = Consts.REMOTE_DOWNLOAD_TAGS_AUTO
+- @static if LibGit2.VERSION >= v"0.25.0"
+- proxy_opts::ProxyOptions = ProxyOptions()
+- end
+- @static if LibGit2.VERSION >= v"0.24.0"
+- custom_headers::StrArrayStruct = StrArrayStruct()
+- end
++ proxy_opts::ProxyOptions = ProxyOptions()
++ custom_headers::StrArrayStruct = StrArrayStruct()
+ end
+
+ """
+diff --git a/stdlib/LibGit2/src/utils.jl b/stdlib/LibGit2/src/utils.jl
+index 147b0949f7..b601ea4efe 100644
+--- a/stdlib/LibGit2/src/utils.jl
++++ b/stdlib/LibGit2/src/utils.jl
+@@ -37,8 +37,8 @@ function version()
+ major = Ref{Cint}(0)
+ minor = Ref{Cint}(0)
+ patch = Ref{Cint}(0)
+- ccall((:git_libgit2_version, :libgit2), Cvoid,
+- (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch)
++ @check ccall((:git_libgit2_version, :libgit2), Cint,
++ (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch)
+ return VersionNumber(major[], minor[], patch[])
+ end
+ const VERSION = version()
+diff --git a/stdlib/LibGit2/src/walker.jl b/stdlib/LibGit2/src/walker.jl
+index 1d2fbcb52f..e977590eaf 100644
+--- a/stdlib/LibGit2/src/walker.jl
++++ b/stdlib/LibGit2/src/walker.jl
+@@ -77,7 +77,7 @@ end
+ function Base.sort!(w::GitRevWalker; by::Cint = Consts.SORT_NONE, rev::Bool=false)
+ ensure_initialized()
+ rev && (by |= Consts.SORT_REVERSE)
+- ccall((:git_revwalk_sorting, :libgit2), Cvoid, (Ptr{Cvoid}, Cint), w.ptr, by)
++ @check ccall((:git_revwalk_sorting, :libgit2), Cint, (Ptr{Cvoid}, Cint), w.ptr, by)
+ return w
+ end
+
+diff --git a/stdlib/LibGit2/test/libgit2.jl b/stdlib/LibGit2/test/libgit2.jl
+index b7ecd31d5f..c1418f5ad6 100644
+--- a/stdlib/LibGit2/test/libgit2.jl
++++ b/stdlib/LibGit2/test/libgit2.jl
+@@ -3043,7 +3043,7 @@ mktempdir() do dir
+ deserialize(f)
+ end
+ @test err.code == LibGit2.Error.ERROR
+- @test lowercase(err.msg) == lowercase("invalid Content-Type: text/plain")
++ @test lowercase(err.msg) == lowercase("invalid Content-Type: 'text/plain'")
+ end
+
+ # OpenSSL s_server should still be running
+--
+2.24.1
+
diff --git a/julia.spec b/julia.spec
index 0bc28dc..39d2095 100644
--- a/julia.spec
+++ b/julia.spec
@@ -1,11 +1,11 @@
-%global uvcommit 2348256acf5759a544e5ca7935f638d2bc091d60
+%global uvcommit 35b1504507a7a4168caae3d78db54d1121b121e1
%global uvversion 2.0.0
-%global llvmversion 6.0.1
+%global llvmversion 8.0.1
%global libwhichcommit 81e9723c0273d78493dc8c8ed570f68d9ce7e89e
-%global pkgcommit 394e7c5d55d3722f5b2ab660ca0a694ea0041974
+%global pkgcommit 9419c70af69153cd5c4276bff90fbb135e0aa3f1
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
# List all bundled libraries here
@@ -15,8 +15,8 @@
%global __requires_exclude ^(%{_privatelibs})$
Name: julia
-Version: 1.2.0
-Release: 6%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: High-level, high-performance dynamic language for technical computing
# Julia itself is MIT, with a few LGPLv2+ and GPLv2+ files
# libuv is MIT
@@ -25,12 +25,14 @@ URL: http://julialang.org/
Source0: https://github.com/JuliaLang/julia/releases/download/v%{version}/julia-%{ve…
# Julia currently uses a custom version of libuv, patches are not yet upstream
Source1: https://api.github.com/repos/JuliaLang/libuv/tarball/%{uvcommit}#/libuv-%{u…
-Source2: http://releases.llvm.org/%{llvmversion}/llvm-%{llvmversion}.src.tar.xz
+Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{llvmversio…
Source3: https://api.github.com/repos/vtjnash/libwhich/tarball/%{libwhichcommit}#/li…
Source4: https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/%{pkgcommit}#/Pkg-%{p…
Patch0: julia_unwind_version.patch
Patch1: llvm-julia-installdirs-64.patch
-Patch2: julia-Bump-libgit2-to-0.28.2-32806.patch
+# Fix build with GCC10: https://reviews.llvm.org/D64937
+Patch2: llvm-D64937.patch
+Patch3: julia-Bump-libgit2-to-0.99.1.patch
Provides: bundled(libuv) = %{uvversion}
Provides: bundled(llvm) = %{llvmversion}
BuildRequires: desktop-file-utils
@@ -67,6 +69,7 @@ BuildRequires: suitesparse-devel >= 4.1
BuildRequires: utf8proc-devel >= 2.1
BuildRequires: zlib-devel
Requires: julia-common = %{version}-%{release}
+Requires: p7zip-plugins
# https://bugzilla.redhat.com/show_bug.cgi?id=1158026
# https://github.com/JuliaLang/julia/issues/30087
ExcludeArch: s390x ppc64le %{arm} aarch64
@@ -121,7 +124,7 @@ Julia into external programs or debugging Julia itself.
patch -p1 < %PATCH1
%endif
-%patch2 -p1
+patch -p1 < %PATCH3
mkdir -p deps/srccache stdlib/srccache
@@ -191,16 +194,22 @@ popd
%endif
# About build, build_libdir and build_bindir, see https://github.com/JuliaLang/julia/issues/5063#issuecomment-32628111
-%global julia_builddir "$(pwd)"
+%global julia_builddir %{_builddir}/%{name}/build
-%global commonopts USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_DSFMT=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_UTF8PROC=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_CURL=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0 USE_SYSTEM_OPENLIBM=1 USE_BINARYBUILDER=0 BUNDLE_DEBUG_LIBS=1 JULIA_SPLITDEBUG=1 TAGGED_RELEASE_BANNER="Fedora %{fedora} build" VERBOSE=1 %{march} %{cpu_target} %{blas} %{suitesparse_lib} prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir}%{_prefix} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir} JULIA_CPU_THREADS=$(echo %{?_smp_mflags} | sed s/-j//)
+%global commonopts USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_DSFMT=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_UTF8PROC=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_CURL=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0 USE_SYSTEM_OPENLIBM=1 USE_BINARYBUILDER=0 USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 BUNDLE_DEBUG_LIBS=1 JULIA_SPLITDEBUG=1 TAGGED_RELEASE_BANNER="Fedora %{fedora} build" VERBOSE=1 %{march} %{cpu_target} %{blas} %{suitesparse_lib} prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir}%{_prefix} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir} JULIA_CPU_THREADS=$(echo %{?_smp_mflags} | sed s/-j//)
+
+# Need to extract LLVM to apply patch
+make CFLAGS="%optflags" CXXFLAGS="%optflags" %{commonopts} -C deps extract-llvm
+pushd deps/srccache/llvm-%{llvmversion}
+ patch -p1 < %PATCH2
+popd
%build
# Temporary workaround for https://github.com/JuliaLang/julia/issues/27118
%global optflags %(echo %{optflags} | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS //')
-%ifarch %{arm}
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
+%ifarch %{arm} %{ix86}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
@@ -214,34 +223,6 @@ popd
# If debug is not built here, it is built during make install
make %{?_smp_mflags} %{buildflags} %{commonopts} release debug
-# Do this before running tests so that they fail if a link is incorrect
-pushd %{julia_builddir}%{_libdir}/julia
- %if 0%{?__isa_bits} == 64
- rm -f libopenblas64_.so libopenblas64_.so.0
- ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so
- ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so.0
- # Raise an error in case of failure
- realpath -e libopenblas64_.so
- realpath -e libopenblas64_.so.0
-
- # Julia creates symlinks to SuiteSparse libraries linking to libopenblas rather than libopenblas64_
- for LIB in spqr umfpack colamd cholmod ccolamd camd amd suitesparseconfig
- do
- rm -f lib${LIB}.so
- ln -s %{_libdir}/$(readelf -d %{_libdir}/lib${LIB}64_.so | sed -n '/SONAME/s/.*\(lib[^ ]*\.so\.[0-9]*\).*/\1/p') lib${LIB}.so
- # Raise an error in case of failure
- realpath -e lib${LIB}.so
- done
- %else
- rm -f libopenblas.so libopenblas.so.0
- ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so
- ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so.0
- # Raise an error in case of failure
- realpath -e libopenblas.so
- realpath -e libopenblas.so.0
- %endif
-popd
-
%check
# Disable tests known to fail currently
@@ -268,6 +249,33 @@ make %{commonopts} test
%install
make %{commonopts} DESTDIR=%{buildroot} install
+pushd %{buildroot}%{_libdir}/julia
+ %if 0%{?__isa_bits} == 64
+ rm -f libopenblas64_.so
+ ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so
+ ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so.0
+ # Raise an error in case of failure
+ realpath -e libopenblas64_.so
+ realpath -e libopenblas64_.so.0
+
+ # Julia creates symlinks to SuiteSparse libraries linking to libopenblas rather than libopenblas64_
+ for LIB in spqr umfpack colamd cholmod ccolamd camd amd suitesparseconfig
+ do
+ rm -f lib${LIB}.so
+ ln -s %{_libdir}/$(readelf -d %{_libdir}/lib${LIB}64_.so | sed -n '/SONAME/s/.*\(lib[^ ]*\.so\.[0-9]*\).*/\1/p') lib${LIB}.so
+ # Raise an error in case of failure
+ realpath -e lib${LIB}.so
+ done
+ %else
+ rm -f libopenblas.so
+ ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so
+ ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so.0
+ # Raise an error in case of failure
+ realpath -e libopenblas.so
+ realpath -e libopenblas.so.0
+ %endif
+popd
+
cp -p CONTRIBUTING.md LICENSE.md NEWS.md README.md %{buildroot}%{_docdir}/julia/
pushd %{buildroot}%{_prefix}/share/man/man1/
@@ -302,7 +310,7 @@ convert -scale 256x256 -extent 256x256 -gravity center -background transparent \
contrib/julia.svg %{buildroot}%{_datarootdir}/icons/hicolor/256x256/apps/%{name}.png
desktop-file-validate %{buildroot}%{_datarootdir}/applications/%{name}.desktop
-rm %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
+rm -f %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
%files
%dir %{_docdir}/julia/
@@ -353,6 +361,9 @@ rm %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
exit 0
%changelog
+* Tue Mar 24 2020 Milan Bouchet-Valat <nalimilan(a)club.fr> - 1.4.0-0
+- New upstream release.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/llvm-D64937.patch b/llvm-D64937.patch
new file mode 100644
index 0000000..bd1f9cf
--- /dev/null
+++ b/llvm-D64937.patch
@@ -0,0 +1,11 @@
+--- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
++++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
+@@ -16,6 +16,8 @@
+ #include "llvm/Demangle/DemangleConfig.h"
+ #include "llvm/Demangle/StringView.h"
+ #include <array>
++#include <cstdint>
++#include <string>
+
+ namespace llvm {
+ namespace itanium_demangle {
diff --git a/sources b/sources
index 471681e..afbe9b0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
+SHA512 (julia-1.4.0.tar.gz) = f8152a595f13932f6cad186cf2fdf2fb0bd64cc49bbb11a76d8299f4745ca6428823ead0e73a7bae1347f1b99bf1181d1f457587d13a7bfc7324ca81afc35cc1
SHA512 (libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz) = c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
-SHA512 (llvm-6.0.1.src.tar.xz) = cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-SHA512 (julia-1.2.0.tar.gz) = c99b0b744508b43df4ee334f588dbb57a633969d7cb164d41b76d552c1d14f5ff6f06a8d0da7f7a48fd1e3a3b3c2379998c5af1bfdff4b0c17045132b82a40b8
-SHA512 (Pkg-394e7c5d55d3722f5b2ab660ca0a694ea0041974.tar.gz) = 6b5324ee3efad2bf1af6ed4503509c6297e710040ccd7d5c67263625f24eab9a88f28ad56cb77ca04ccc976c051f2fbf2bb2019df442ab4823e5a7aff977b825
SHA512 (libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz) = 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
+SHA512 (llvm-8.0.1.src.tar.xz) = 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+SHA512 (Pkg-9419c70af69153cd5c4276bff90fbb135e0aa3f1.tar.gz) = beab318b1cf96a2f0957f26d33f2d06e6dfabed405778f3945caf6372cc62ed74ff069e912475f3e553cf3013db73a2c73f2a758a3e3b1ba21db0471b7182dbe
1
0
26 Mar '20
The package rpms/julia.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/julia.git/commit/?id=aaecb0f11c0719….
Change:
+%ifarch %{arm} %{ix86}
Thanks.
Full change:
============
commit aaecb0f11c071966200ef772c69ef5f73f9b2c3c
Author: Milan Bouchet-Valat <nalimilan(a)club.fr>
Date: Fri Jan 3 22:12:32 2020 +0100
New upstream release 1.4.0
Also clean a few things, and fix installation of symlinks:
creating them in the build dir is not enough to get them installed.
diff --git a/.gitignore b/.gitignore
index 4627963..35ad49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,9 @@
/SuiteSparse-5.4.0.tar.gz
/pcre2-10.31.zip
/pcre2-10.31.tar.bz2
+/Pkg-5de608c7b1837a24ed84eaaa14dde017986cb460.tar.gz
+/libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz
+/julia-1.3.1.tar.gz
+/julia-1.4.0.tar.gz
+/Pkg-9419c70af69153cd5c4276bff90fbb135e0aa3f1.tar.gz
+/llvm-8.0.1.src.tar.xz
diff --git a/julia-Bump-libgit2-to-0.28.2-32806.patch b/julia-Bump-libgit2-to-0.28.2-32806.patch
deleted file mode 100644
index f7cfcc3..0000000
--- a/julia-Bump-libgit2-to-0.28.2-32806.patch
+++ /dev/null
@@ -1,1101 +0,0 @@
-From d0b5d9850fb7b51c7831d3897ad46e4d3478d322 Mon Sep 17 00:00:00 2001
-From: Milan Bouchet-Valat <nalimilan(a)club.fr>
-Date: Thu, 22 Aug 2019 11:55:11 +0200
-Subject: [PATCH] Bump libgit2 to 0.28.2 (#32806)
-
-This allows dropping MbedTLS patches which have been upstreamed.
-The order in which configuration options are returned has changed, making a test fail:
-make the code more robust by giving priority to more specific options over global ones.
----
- deps/Versions.make | 4 +-
- deps/libgit2.mk | 16 +-
- deps/libgit2.version | 4 +-
- deps/patches/libgit2-mbedtls.patch | 952 ----------------------------
- deps/patches/libgit2-mbedtls2.patch | 28 -
- stdlib/LibGit2/src/gitcredential.jl | 8 +-
- 6 files changed, 12 insertions(+), 1000 deletions(-)
- delete mode 100644 deps/patches/libgit2-mbedtls.patch
- delete mode 100644 deps/patches/libgit2-mbedtls2.patch
-
-diff --git a/deps/Versions.make b/deps/Versions.make
-index ff103cbbe1..0fac074998 100644
---- a/deps/Versions.make
-+++ b/deps/Versions.make
-@@ -25,7 +25,7 @@ LIBSSH2_VER = 1.8.2
- LIBSSH2_BB_REL = 0
- CURL_VER = 7.61.0
- CURL_BB_REL = 1
--LIBGIT2_VER = 0.27.7
-+LIBGIT2_VER = 0.28.2
- LIBGIT2_BB_REL = 1
- LIBUV_VER = 1.24.0
- LIBUV_BB_REL = 1
-diff --git a/deps/libgit2.mk b/deps/libgit2.mk
-index 845cfba273..ae634542b0 100644
---- a/deps/libgit2.mk
-+++ b/deps/libgit2.mk
-@@ -44,24 +44,12 @@ endif
-
- LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)
-
--$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted
-- cd $(LIBGIT2_SRC_PATH) && \
-- patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls.patch
-- echo 1 > $@
--
--$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
-- cd $(LIBGIT2_SRC_PATH) && \
-- patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls2.patch
-- echo 1 > $@
--
--$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
-+$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
- cd $(LIBGIT2_SRC_PATH) && \
- patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
- echo 1 > $@
-
- $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
-- $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
-- $(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied \
- $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \
-
- $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
-@@ -109,7 +97,7 @@ $(build_prefix)/manifest/libgit2: $(build_datarootdir)/julia/cert.pem # use libg
-
- else # USE_BINARYBUILDER_LIBGIT2
-
--LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LI…
-+LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LI…
- LIBGIT2_BB_NAME := LibGit2.v$(LIBGIT2_VER)
- $(eval $(call bb-install,libgit2,LIBGIT2,false))
-
-diff --git a/deps/libgit2.version b/deps/libgit2.version
-index d35b024233..f67bedc414 100644
---- a/deps/libgit2.version
-+++ b/deps/libgit2.version
-@@ -1,2 +1,2 @@
--LIBGIT2_BRANCH=v0.27.7
--LIBGIT2_SHA1=f23dc5b29f1394928a940d7ec447f4bfd53dad1f
-+LIBGIT2_BRANCH=v0.28.2
-+LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
-diff --git a/deps/patches/libgit2-mbedtls.patch b/deps/patches/libgit2-mbedtls.patch
-deleted file mode 100644
-index c54a7e78c1..0000000000
---- a/deps/patches/libgit2-mbedtls.patch
-+++ /dev/null
-@@ -1,952 +0,0 @@
--Enables MbedTLS support
--
--Upstream: https://github.com/libgit2/libgit2/pull/4173
--
--NOTE: libgit2 has switched its CI to Azure Pipelines. The aforementioned PR makes modifications
--to the Travis YAML file, which has since been removed, causing patch conflicts. That part of
--the diff has thus been removed here.
--
--git diff ca3b2234dc7f1bd0d0f81488d3e29980b47a85b4^..cb2da47e56159faaaf143943c74ffb8f60a988b1 > libgit2-mbedtls.patch
--
--mbedtls: initial support
--mbedtls: proper certificate verification
--mbedtls: use libmbedcrypto for hashing
--mbedtls: add global initialization
--mbedtls: default cipher list support
--mbedtls: fix libgit2 hanging due to incomplete writes
--mbedtls: enable Travis CI tests
--mbedtls: use our own certificate validation
--mbedtls: use mbedTLS certificate verification
--mbedtls: load default CA certificates
--mbedtls: display error codes as hex for consistency with mbedTLS docs
--tests: clarify comment
--cmake: make our preferred backend ordering consistent
--travis: just grab what we need from mbedtls
--travis: pass -fPIC when configuring mbedtls
--
--diff --git a/CMakeLists.txt b/CMakeLists.txt
--index 2ca5354a7..9176eee04 100644
----- a/CMakeLists.txt
--+++ b/CMakeLists.txt
--@@ -48,7 +48,7 @@ OPTION( PROFILE "Generate profiling information" OFF )
-- OPTION( ENABLE_TRACE "Enables tracing support" OFF )
-- OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF )
--
---SET(SHA1_BACKEND "CollisionDetection" CACHE STRING "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, CollisionDetection. ")
--+SET(SHA1_BACKEND "CollisionDetection" CACHE STRING "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, mbedTLS, CollisionDetection. ")
-- OPTION( USE_SSH "Link with libssh to enable SSH support" ON )
-- OPTION( USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON )
-- OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF )
--diff --git a/cmake/Modules/FindmbedTLS.cmake b/cmake/Modules/FindmbedTLS.cmake
--new file mode 100644
--index 000000000..93297555e
----- /dev/null
--+++ b/cmake/Modules/FindmbedTLS.cmake
--@@ -0,0 +1,93 @@
--+# - Try to find mbedTLS
--+# Once done this will define
--+#
--+# Read-Only variables
--+# MBEDTLS_FOUND - system has mbedTLS
--+# MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
--+# MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
--+# MBEDTLS_LIBRARIES - Link these to use mbedTLS
--+# MBEDTLS_LIBRARY - path to mbedTLS library
--+# MBEDX509_LIBRARY - path to mbedTLS X.509 library
--+# MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
--+#
--+# Hint
--+# MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
--+
--+SET(_MBEDTLS_ROOT_HINTS
--+ ${MBEDTLS_ROOT_DIR}
--+ ENV MBEDTLS_ROOT_DIR
--+)
--+
--+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
--+ HINTS ${_MBEDTLS_ROOT_HINTS}
--+ PATHS ${_MBEDTLS_ROOT_PATHS}
--+)
--+
--+FIND_PATH(MBEDTLS_INCLUDE_DIR
--+ NAMES mbedtls/version.h
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES include
--+)
--+
--+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
--+ # Already in cache, be silent
--+ SET(MBEDTLS_FIND_QUIETLY TRUE)
--+ENDIF()
--+
--+FIND_LIBRARY(MBEDTLS_LIBRARY
--+ NAMES mbedtls libmbedtls
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+FIND_LIBRARY(MBEDX509_LIBRARY
--+ NAMES mbedx509 libmbedx509
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
--+ NAMES mbedcrypto libmbedcrypto
--+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
--+ PATH_SUFFIXES library
--+)
--+
--+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
--+ SET(MBEDTLS_FOUND TRUE)
--+ENDIF()
--+
--+IF(MBEDTLS_FOUND)
--+ #split mbedTLS into -L and -l linker options, so we can set them for pkg-config
--+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
--+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
--+ GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
--+ GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
--+ STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
--+ STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
--+ STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
--+ SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
--+
--+ IF(NOT MBEDTLS_FIND_QUIETLY)
--+ MESSAGE(STATUS "Found mbedTLS:")
--+ FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
--+ STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
--+ IF (MBEDTLSMATCH)
--+ STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
--+ MESSAGE(STATUS " version ${MBEDTLS_VERSION}")
--+ ENDIF(MBEDTLSMATCH)
--+ MESSAGE(STATUS " TLS: ${MBEDTLS_LIBRARY}")
--+ MESSAGE(STATUS " X509: ${MBEDX509_LIBRARY}")
--+ MESSAGE(STATUS " Crypto: ${MBEDCRYPTO_LIBRARY}")
--+ ENDIF(NOT MBEDTLS_FIND_QUIETLY)
--+ELSE(MBEDTLS_FOUND)
--+ IF(MBEDTLS_FIND_REQUIRED)
--+ MESSAGE(FATAL_ERROR "Could not find mbedTLS")
--+ ENDIF(MBEDTLS_FIND_REQUIRED)
--+ENDIF(MBEDTLS_FOUND)
--+
--+MARK_AS_ADVANCED(
--+ MBEDTLS_INCLUDE_DIR
--+ MBEDTLS_LIBRARY_DIR
--+ MBEDTLS_LIBRARIES
--+ MBEDTLS_LIBRARY
--+ MBEDX509_LIBRARY
--+ MBEDCRYPTO_LIBRARY
--+)
--diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh
--new file mode 100755
--index 000000000..99cbde4e0
----- /dev/null
--+++ b/script/install-deps-linux.sh
--@@ -0,0 +1,13 @@
--+#!/bin/sh
--+
--+set -x
--+
--+if [ "$MBEDTLS" ]; then
--+ git clone --depth 10 --single-branch --branch mbedtls-2.6.1 https://github.com/ARMmbed/mbedtls.git ./deps/mbedtls
--+ cd ./deps/mbedtls
--+ # We pass -fPIC explicitely because we'll include it in libgit2.so
--+ CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON .
--+ cmake --build .
--+
--+ echo "mbedTLS built in `pwd`"
--+fi
--diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--index b03b96af9..0f5d78547 100644
----- a/src/CMakeLists.txt
--+++ b/src/CMakeLists.txt
--@@ -133,6 +133,9 @@ ELSE ()
-- ENDIF()
--
-- IF (USE_HTTPS)
--+ # We try to find any packages our backends might use
--+ FIND_PACKAGE(OpenSSL)
--+ FIND_PACKAGE(mbedTLS)
-- IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-- FIND_PACKAGE(Security)
-- FIND_PACKAGE(CoreFoundation)
--@@ -149,8 +152,13 @@ IF (USE_HTTPS)
-- ENDIF()
-- ELSEIF (WINHTTP)
-- SET(HTTPS_BACKEND "WinHTTP")
--- ELSE()
--+ ELSEIF(OPENSSL_FOUND)
-- SET(HTTPS_BACKEND "OpenSSL")
--+ ELSEIF(MBEDTLS_FOUND)
--+ SET(HTTPS_BACKEND "mbedTLS")
--+ ELSE()
--+ MESSAGE(FATAL_ERROR "Unable to autodetect a usable HTTPS backend."
--+ "Please pass the backend name explicitly (-DUSE_HTTPS=backend)")
-- ENDIF()
-- ELSE()
-- # Backend was explicitly set
--@@ -174,8 +182,6 @@ IF (USE_HTTPS)
-- LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES})
-- LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
-- ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
--- FIND_PACKAGE(OpenSSL)
---
-- IF (NOT OPENSSL_FOUND)
-- MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
-- ENDIF()
--@@ -185,6 +191,53 @@ IF (USE_HTTPS)
-- LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES})
-- LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
-- LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
--+ ELSEIF(HTTPS_BACKEND STREQUAL "mbedTLS")
--+ IF (NOT MBEDTLS_FOUND)
--+ MESSAGE(FATAL_ERROR "Asked for mbedTLS backend, but it wasn't found")
--+ ENDIF()
--+
--+ IF(NOT CERT_LOCATION)
--+ MESSAGE("Auto-detecting default certificates location")
--+ IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
--+ # Check for an Homebrew installation
--+ SET(OPENSSL_CMD "/usr/local/opt/openssl/bin/openssl")
--+ ELSE()
--+ SET(OPENSSL_CMD "openssl")
--+ ENDIF()
--+ EXECUTE_PROCESS(COMMAND ${OPENSSL_CMD} version -d OUTPUT_VARIABLE OPENSSL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
--+ IF(OPENSSL_DIR)
--+ STRING(REGEX REPLACE "^OPENSSLDIR: \"(.*)\"$" "\\1/" OPENSSL_DIR ${OPENSSL_DIR})
--+
--+ SET(OPENSSL_CA_LOCATIONS
--+ "ca-bundle.pem" # OpenSUSE Leap 42.1
--+ "cert.pem" # Ubuntu 14.04, FreeBSD
--+ "certs/ca-certificates.crt" # Ubuntu 16.04
--+ "certs/ca.pem" # Debian 7
--+ )
--+ FOREACH(SUFFIX IN LISTS OPENSSL_CA_LOCATIONS)
--+ SET(LOC "${OPENSSL_DIR}${SUFFIX}")
--+ IF(NOT CERT_LOCATION AND EXISTS "${OPENSSL_DIR}${SUFFIX}")
--+ SET(CERT_LOCATION ${LOC})
--+ ENDIF()
--+ ENDFOREACH()
--+ ELSE()
--+ MESSAGE("Unable to find OpenSSL executable. Please provide default certificate location via CERT_LOCATION")
--+ ENDIF()
--+ ENDIF()
--+
--+ IF(CERT_LOCATION)
--+ IF(NOT EXISTS ${CERT_LOCATION})
--+ MESSAGE(FATAL_ERROR "Cannot use CERT_LOCATION=${CERT_LOCATION} as it doesn't exist")
--+ ENDIF()
--+ ADD_FEATURE_INFO(CERT_LOCATION ON "using certificates from ${CERT_LOCATION}")
--+ ADD_DEFINITIONS(-DGIT_DEFAULT_CERT_LOCATION="${CERT_LOCATION}")
--+ ENDIF()
--+
--+ SET(GIT_MBEDTLS 1)
--+ LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR})
--+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
--+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LDFLAGS})
--+ LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
-- ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP")
-- # WinHTTP setup was handled in the WinHTTP-specific block above
-- ELSE()
--@@ -230,6 +283,11 @@ ELSEIF(SHA1_BACKEND STREQUAL "Win32")
-- ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
-- ADD_FEATURE_INFO(SHA ON "using CommonCrypto")
-- SET(GIT_SHA1_COMMON_CRYPTO 1)
--+ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS")
--+ ADD_FEATURE_INFO(SHA ON "using mbedTLS")
--+ SET(GIT_SHA1_MBEDTLS 1)
--+ FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c)
--+ LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
-- ELSE()
-- MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}")
-- ENDIF()
--diff --git a/src/features.h.in b/src/features.h.in
--index e03b7a251..f414c5843 100644
----- a/src/features.h.in
--+++ b/src/features.h.in
--@@ -27,10 +27,12 @@
-- #cmakedefine GIT_HTTPS 1
-- #cmakedefine GIT_OPENSSL 1
-- #cmakedefine GIT_SECURE_TRANSPORT 1
--+#cmakedefine GIT_MBEDTLS 1
--
-- #cmakedefine GIT_SHA1_COLLISIONDETECT 1
-- #cmakedefine GIT_SHA1_WIN32 1
-- #cmakedefine GIT_SHA1_COMMON_CRYPTO 1
-- #cmakedefine GIT_SHA1_OPENSSL 1
--+#cmakedefine GIT_SHA1_MBEDTLS 1
--
-- #endif
--diff --git a/src/global.c b/src/global.c
--index 2f9b45bcd..02aedf57d 100644
----- a/src/global.c
--+++ b/src/global.c
--@@ -12,6 +12,7 @@
-- #include "filter.h"
-- #include "merge_driver.h"
-- #include "streams/curl.h"
--+#include "streams/mbedtls.h"
-- #include "streams/openssl.h"
-- #include "thread-utils.h"
-- #include "git2/global.h"
--@@ -65,7 +66,8 @@ static int init_common(void)
-- (ret = git_merge_driver_global_init()) == 0 &&
-- (ret = git_transport_ssh_global_init()) == 0 &&
-- (ret = git_openssl_stream_global_init()) == 0 &&
--- (ret = git_curl_stream_global_init()) == 0)
--+ (ret = git_curl_stream_global_init()) == 0 &&
--+ (ret = git_mbedtls_stream_global_init()) == 0)
-- ret = git_mwindow_global_init();
--
-- GIT_MEMORY_BARRIER;
--diff --git a/src/hash.h b/src/hash.h
--index 31eaf8889..93765adf3 100644
----- a/src/hash.h
--+++ b/src/hash.h
--@@ -26,6 +26,8 @@ void git_hash_ctx_cleanup(git_hash_ctx *ctx);
-- # include "hash/hash_openssl.h"
-- #elif defined(GIT_SHA1_WIN32)
-- # include "hash/hash_win32.h"
--+#elif defined(GIT_SHA1_MBEDTLS)
--+# include "hash/hash_mbedtls.h"
-- #else
-- # include "hash/hash_generic.h"
-- #endif
--diff --git a/src/hash/hash_mbedtls.c b/src/hash/hash_mbedtls.c
--new file mode 100644
--index 000000000..a19d76308
----- /dev/null
--+++ b/src/hash/hash_mbedtls.c
--@@ -0,0 +1,38 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#include "common.h"
--+#include "hash.h"
--+#include "hash/hash_mbedtls.h"
--+
--+void git_hash_ctx_cleanup(git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_free(&ctx->c);
--+}
--+
--+int git_hash_init(git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_init(&ctx->c);
--+ mbedtls_sha1_starts(&ctx->c);
--+ return 0;
--+}
--+
--+int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_update(&ctx->c, data, len);
--+ return 0;
--+}
--+
--+int git_hash_final(git_oid *out, git_hash_ctx *ctx)
--+{
--+ assert(ctx);
--+ mbedtls_sha1_finish(&ctx->c, out->id);
--+ return 0;
--+}
--diff --git a/src/hash/hash_mbedtls.h b/src/hash/hash_mbedtls.h
--new file mode 100644
--index 000000000..24196c5bf
----- /dev/null
--+++ b/src/hash/hash_mbedtls.h
--@@ -0,0 +1,20 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#ifndef INCLUDE_hash_mbedtld_h__
--+#define INCLUDE_hash_mbedtld_h__
--+
--+#include <mbedtls/sha1.h>
--+
--+struct git_hash_ctx {
--+ mbedtls_sha1_context c;
--+};
--+
--+#define git_hash_global_init() 0
--+#define git_hash_ctx_init(ctx) git_hash_init(ctx)
--+
--+#endif /* INCLUDE_hash_mbedtld_h__ */
--diff --git a/src/settings.c b/src/settings.c
--index 2a52ffbf6..f6bc5b270 100644
----- a/src/settings.c
--+++ b/src/settings.c
--@@ -11,6 +11,10 @@
-- # include <openssl/err.h>
-- #endif
--
--+#ifdef GIT_MBEDTLS
--+# include <mbedtls/error.h>
--+#endif
--+
-- #include <git2.h>
-- #include "sysdir.h"
-- #include "cache.h"
--@@ -20,6 +24,7 @@
-- #include "refs.h"
-- #include "transports/smart.h"
-- #include "streams/openssl.h"
--+#include "streams/mbedtls.h"
--
-- void git_libgit2_version(int *major, int *minor, int *rev)
-- {
--@@ -175,6 +180,15 @@ int git_libgit2_opts(int key, ...)
-- const char *path = va_arg(ap, const char *);
-- error = git_openssl__set_cert_location(file, path);
-- }
--+#elif defined(GIT_MBEDTLS)
--+ {
--+ const char *file = va_arg(ap, const char *);
--+ const char *path = va_arg(ap, const char *);
--+ if (file)
--+ error = git_mbedtls__set_cert_location(file, 0);
--+ if (error && path)
--+ error = git_mbedtls__set_cert_location(path, 1);
--+ }
-- #else
-- giterr_set(GITERR_SSL, "TLS backend doesn't support certificate locations");
-- error = -1;
--@@ -199,7 +213,7 @@ int git_libgit2_opts(int key, ...)
-- break;
--
-- case GIT_OPT_SET_SSL_CIPHERS:
---#ifdef GIT_OPENSSL
--+#if (GIT_OPENSSL || GIT_MBEDTLS)
-- {
-- git__free(git__ssl_ciphers);
-- git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
--diff --git a/src/streams/mbedtls.c b/src/streams/mbedtls.c
--new file mode 100644
--index 000000000..0a49a36a6
----- /dev/null
--+++ b/src/streams/mbedtls.c
--@@ -0,0 +1,452 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+
--+#include "streams/mbedtls.h"
--+
--+#ifdef GIT_MBEDTLS
--+
--+#include <ctype.h>
--+
--+#include "global.h"
--+#include "stream.h"
--+#include "streams/socket.h"
--+#include "netops.h"
--+#include "git2/transport.h"
--+#include "util.h"
--+
--+#ifdef GIT_CURL
--+# include "streams/curl.h"
--+#endif
--+
--+#ifndef GIT_DEFAULT_CERT_LOCATION
--+#define GIT_DEFAULT_CERT_LOCATION NULL
--+#endif
--+
--+#include <mbedtls/config.h>
--+#include <mbedtls/ssl.h>
--+#include <mbedtls/error.h>
--+#include <mbedtls/entropy.h>
--+#include <mbedtls/ctr_drbg.h>
--+
--+mbedtls_ssl_config *git__ssl_conf;
--+mbedtls_entropy_context *mbedtls_entropy;
--+
--+#define GIT_SSL_DEFAULT_CIPHERS "TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384:TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-DSS-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-DSS-WITH-AES-256-GCM-SHA384:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-128-CBC-SHA256:TLS-DHE-DSS-WITH-AES-256-CBC-SHA256:TLS-DHE-DSS-WITH-AES-128-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-128-GCM-SHA256:TLS-RSA-WITH-AES-256-GCM-SHA384:TLS-RSA-WITH-AES-128-CBC-SHA256:TLS-RSA-WITH-AES-256-CBC-SHA256:TLS-RSA-WITH-AES-128-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA"
--+#define GIT_SSL_DEFAULT_CIPHERS_COUNT 30
--+
--+/**
--+ * This function aims to clean-up the SSL context which
--+ * we allocated.
--+ */
--+static void shutdown_ssl(void)
--+{
--+ if (git__ssl_conf) {
--+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
--+ git__free(git__ssl_conf->ca_chain);
--+ mbedtls_ctr_drbg_free(git__ssl_conf->p_rng);
--+ git__free(git__ssl_conf->p_rng);
--+ mbedtls_ssl_config_free(git__ssl_conf);
--+ git__free(git__ssl_conf);
--+ git__ssl_conf = NULL;
--+ }
--+ if (mbedtls_entropy) {
--+ mbedtls_entropy_free(mbedtls_entropy);
--+ git__free(mbedtls_entropy);
--+ mbedtls_entropy = NULL;
--+ }
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir);
--+
--+int git_mbedtls_stream_global_init(void)
--+{
--+ int loaded = 0;
--+ char *crtpath = GIT_DEFAULT_CERT_LOCATION;
--+ struct stat statbuf;
--+ mbedtls_ctr_drbg_context *ctr_drbg = NULL;
--+
--+ int *ciphers_list = NULL;
--+ int ciphers_known = 0;
--+ char *cipher_name = NULL;
--+ char *cipher_string = NULL;
--+ char *cipher_string_tmp = NULL;
--+
--+ mbedtls_x509_crt *cacert = NULL;
--+
--+ git__ssl_conf = git__malloc(sizeof(mbedtls_ssl_config));
--+ mbedtls_ssl_config_init(git__ssl_conf);
--+ if (mbedtls_ssl_config_defaults(git__ssl_conf,
--+ MBEDTLS_SSL_IS_CLIENT,
--+ MBEDTLS_SSL_TRANSPORT_STREAM,
--+ MBEDTLS_SSL_PRESET_DEFAULT) != 0) {
--+ giterr_set(GITERR_SSL, "failed to initialize mbedTLS");
--+ goto cleanup;
--+ }
--+
--+ /* configure TLSv1 */
--+ mbedtls_ssl_conf_min_version(git__ssl_conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_0);
--+
--+ /* verify_server_cert is responsible for making the check.
--+ * OPTIONAL because REQUIRED drops the certificate as soon as the check
--+ * is made, so we can never see the certificate and override it. */
--+ mbedtls_ssl_conf_authmode(git__ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
--+
--+ /* set the list of allowed ciphersuites */
--+ ciphers_list = calloc(GIT_SSL_DEFAULT_CIPHERS_COUNT, sizeof(int));
--+ ciphers_known = 0;
--+ cipher_string = cipher_string_tmp = git__strdup(GIT_SSL_DEFAULT_CIPHERS);
--+ while ((cipher_name = git__strtok(&cipher_string_tmp, ":")) != NULL) {
--+ int cipherid = mbedtls_ssl_get_ciphersuite_id(cipher_name);
--+ if (cipherid == 0) continue;
--+
--+ ciphers_list[ciphers_known++] = cipherid;
--+ }
--+ git__free(cipher_string);
--+
--+ if (!ciphers_known) {
--+ giterr_set(GITERR_SSL, "no cipher could be enabled");
--+ goto cleanup;
--+ }
--+ mbedtls_ssl_conf_ciphersuites(git__ssl_conf, ciphers_list);
--+
--+ /* Seeding the random number generator */
--+ mbedtls_entropy = git__malloc(sizeof(mbedtls_entropy_context));
--+ mbedtls_entropy_init(mbedtls_entropy);
--+
--+ ctr_drbg = git__malloc(sizeof(mbedtls_ctr_drbg_context));
--+ mbedtls_ctr_drbg_init(ctr_drbg);
--+ if (mbedtls_ctr_drbg_seed(ctr_drbg,
--+ mbedtls_entropy_func,
--+ mbedtls_entropy, NULL, 0) != 0) {
--+ giterr_set(GITERR_SSL, "failed to initialize mbedTLS entropy pool");
--+ goto cleanup;
--+ }
--+
--+ mbedtls_ssl_conf_rng(git__ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
--+
--+ /* load default certificates */
--+ if (crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
--+ loaded = (git_mbedtls__set_cert_location(crtpath, 0) == 0);
--+ if (!loaded && crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
--+ loaded = (git_mbedtls__set_cert_location(crtpath, 1) == 0);
--+
--+ git__on_shutdown(shutdown_ssl);
--+
--+ return 0;
--+
--+cleanup:
--+ mbedtls_x509_crt_free(cacert);
--+ git__free(cacert);
--+ mbedtls_ctr_drbg_free(ctr_drbg);
--+ git__free(ctr_drbg);
--+ mbedtls_ssl_config_free(git__ssl_conf);
--+ git__free(git__ssl_conf);
--+ git__ssl_conf = NULL;
--+
--+ return -1;
--+}
--+
--+mbedtls_ssl_config *git__ssl_conf;
--+
--+static int bio_read(void *b, unsigned char *buf, size_t len)
--+{
--+ git_stream *io = (git_stream *) b;
--+ return (int) git_stream_read(io, buf, len);
--+}
--+
--+static int bio_write(void *b, const unsigned char *buf, size_t len)
--+{
--+ git_stream *io = (git_stream *) b;
--+ return (int) git_stream_write(io, (const char *)buf, len, 0);
--+}
--+
--+static int ssl_set_error(mbedtls_ssl_context *ssl, int error)
--+{
--+ char errbuf[512];
--+ int ret = -1;
--+
--+ assert(error != MBEDTLS_ERR_SSL_WANT_READ);
--+ assert(error != MBEDTLS_ERR_SSL_WANT_WRITE);
--+
--+ if (error != 0)
--+ mbedtls_strerror( error, errbuf, 512 );
--+
--+ switch(error) {
--+ case 0:
--+ giterr_set(GITERR_SSL, "SSL error: unknown error");
--+ break;
--+
--+ case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:
--+ giterr_set(GITERR_SSL, "SSL error: %#04x [%x] - %s", error, ssl->session_negotiate->verify_result, errbuf);
--+ ret = GIT_ECERTIFICATE;
--+ break;
--+
--+ default:
--+ giterr_set(GITERR_SSL, "SSL error: %#04x - %s", error, errbuf);
--+ }
--+
--+ return ret;
--+}
--+
--+static int ssl_teardown(mbedtls_ssl_context *ssl)
--+{
--+ int ret = 0;
--+
--+ ret = mbedtls_ssl_close_notify(ssl);
--+ if (ret < 0)
--+ ret = ssl_set_error(ssl, ret);
--+
--+ mbedtls_ssl_free(ssl);
--+ return ret;
--+}
--+
--+static int verify_server_cert(mbedtls_ssl_context *ssl)
--+{
--+ int ret = -1;
--+
--+ if ((ret = mbedtls_ssl_get_verify_result(ssl)) != 0) {
--+ char vrfy_buf[512];
--+ int len = mbedtls_x509_crt_verify_info(vrfy_buf, sizeof(vrfy_buf), "", ret);
--+ if (len >= 1) vrfy_buf[len - 1] = '\0'; /* Remove trailing \n */
--+ giterr_set(GITERR_SSL, "the SSL certificate is invalid: %#04x - %s", ret, vrfy_buf);
--+ return GIT_ECERTIFICATE;
--+ }
--+
--+ return 0;
--+}
--+
--+typedef struct {
--+ git_stream parent;
--+ git_stream *io;
--+ bool connected;
--+ char *host;
--+ mbedtls_ssl_context *ssl;
--+ git_cert_x509 cert_info;
--+} mbedtls_stream;
--+
--+
--+int mbedtls_connect(git_stream *stream)
--+{
--+ int ret;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ if ((ret = git_stream_connect(st->io)) < 0)
--+ return ret;
--+
--+ st->connected = true;
--+
--+ mbedtls_ssl_set_hostname(st->ssl, st->host);
--+
--+ mbedtls_ssl_set_bio(st->ssl, st->io, bio_write, bio_read, NULL);
--+
--+ if ((ret = mbedtls_ssl_handshake(st->ssl)) != 0)
--+ return ssl_set_error(st->ssl, ret);
--+
--+ return verify_server_cert(st->ssl);
--+}
--+
--+int mbedtls_certificate(git_cert **out, git_stream *stream)
--+{
--+ unsigned char *encoded_cert;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ const mbedtls_x509_crt *cert = mbedtls_ssl_get_peer_cert(st->ssl);
--+ if (!cert) {
--+ giterr_set(GITERR_SSL, "the server did not provide a certificate");
--+ return -1;
--+ }
--+
--+ /* Retrieve the length of the certificate first */
--+ if (cert->raw.len == 0) {
--+ giterr_set(GITERR_NET, "failed to retrieve certificate information");
--+ return -1;
--+ }
--+
--+ encoded_cert = git__malloc(cert->raw.len);
--+ GITERR_CHECK_ALLOC(encoded_cert);
--+ memcpy(encoded_cert, cert->raw.p, cert->raw.len);
--+
--+ st->cert_info.parent.cert_type = GIT_CERT_X509;
--+ st->cert_info.data = encoded_cert;
--+ st->cert_info.len = cert->raw.len;
--+
--+ *out = &st->cert_info.parent;
--+
--+ return 0;
--+}
--+
--+static int mbedtls_set_proxy(git_stream *stream, const git_proxy_options *proxy_options)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ return git_stream_set_proxy(st->io, proxy_options);
--+}
--+
--+ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t len, int flags)
--+{
--+ size_t read = 0;
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ GIT_UNUSED(flags);
--+
--+ do {
--+ int error = mbedtls_ssl_write(st->ssl, (const unsigned char *)data + read, len - read);
--+ if (error <= 0) {
--+ return ssl_set_error(st->ssl, error);
--+ }
--+ read += error;
--+ } while (read < len);
--+
--+ return read;
--+}
--+
--+ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+ int ret;
--+
--+ if ((ret = mbedtls_ssl_read(st->ssl, (unsigned char *)data, len)) <= 0)
--+ ssl_set_error(st->ssl, ret);
--+
--+ return ret;
--+}
--+
--+int mbedtls_stream_close(git_stream *stream)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+ int ret = 0;
--+
--+ if (st->connected && (ret = ssl_teardown(st->ssl)) != 0)
--+ return -1;
--+
--+ st->connected = false;
--+
--+ return git_stream_close(st->io);
--+}
--+
--+void mbedtls_stream_free(git_stream *stream)
--+{
--+ mbedtls_stream *st = (mbedtls_stream *) stream;
--+
--+ git__free(st->host);
--+ git__free(st->cert_info.data);
--+ git_stream_free(st->io);
--+ git__free(st->ssl);
--+ git__free(st);
--+}
--+
--+int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port)
--+{
--+ int error;
--+ mbedtls_stream *st;
--+
--+ st = git__calloc(1, sizeof(mbedtls_stream));
--+ GITERR_CHECK_ALLOC(st);
--+
--+#ifdef GIT_CURL
--+ error = git_curl_stream_new(&st->io, host, port);
--+#else
--+ error = git_socket_stream_new(&st->io, host, port);
--+#endif
--+
--+ if (error < 0)
--+ goto out_err;
--+
--+ st->ssl = git__malloc(sizeof(mbedtls_ssl_context));
--+ GITERR_CHECK_ALLOC(st->ssl);
--+ mbedtls_ssl_init(st->ssl);
--+ if (mbedtls_ssl_setup(st->ssl, git__ssl_conf)) {
--+ giterr_set(GITERR_SSL, "failed to create ssl object");
--+ error = -1;
--+ goto out_err;
--+ }
--+
--+ st->host = git__strdup(host);
--+ GITERR_CHECK_ALLOC(st->host);
--+
--+ st->parent.version = GIT_STREAM_VERSION;
--+ st->parent.encrypted = 1;
--+ st->parent.proxy_support = git_stream_supports_proxy(st->io);
--+ st->parent.connect = mbedtls_connect;
--+ st->parent.certificate = mbedtls_certificate;
--+ st->parent.set_proxy = mbedtls_set_proxy;
--+ st->parent.read = mbedtls_stream_read;
--+ st->parent.write = mbedtls_stream_write;
--+ st->parent.close = mbedtls_stream_close;
--+ st->parent.free = mbedtls_stream_free;
--+
--+ *out = (git_stream *) st;
--+ return 0;
--+
--+out_err:
--+ mbedtls_ssl_free(st->ssl);
--+ git_stream_free(st->io);
--+ git__free(st);
--+
--+ return error;
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir)
--+{
--+ int ret = 0;
--+ char errbuf[512];
--+ mbedtls_x509_crt *cacert;
--+
--+ assert(path != NULL);
--+
--+ cacert = git__malloc(sizeof(mbedtls_x509_crt));
--+ mbedtls_x509_crt_init(cacert);
--+ if (is_dir) {
--+ ret = mbedtls_x509_crt_parse_path(cacert, path);
--+ } else {
--+ ret = mbedtls_x509_crt_parse_file(cacert, path);
--+ }
--+ /* mbedtls_x509_crt_parse_path returns the number of invalid certs on success */
--+ if (ret < 0) {
--+ mbedtls_x509_crt_free(cacert);
--+ git__free(cacert);
--+ mbedtls_strerror( ret, errbuf, 512 );
--+ giterr_set(GITERR_SSL, "failed to load CA certificates: %#04x - %s", ret, errbuf);
--+ return -1;
--+ }
--+
--+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
--+ git__free(git__ssl_conf->ca_chain);
--+ mbedtls_ssl_conf_ca_chain(git__ssl_conf, cacert, NULL);
--+
--+ return 0;
--+}
--+
--+#else
--+
--+#include "stream.h"
--+
--+int git_mbedtls_stream_global_init(void)
--+{
--+ return 0;
--+}
--+
--+int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port)
--+{
--+ GIT_UNUSED(out);
--+ GIT_UNUSED(host);
--+ GIT_UNUSED(port);
--+
--+ giterr_set(GITERR_SSL, "mbedTLS is not supported in this version");
--+ return -1;
--+}
--+
--+int git_mbedtls__set_cert_location(const char *path, int is_dir)
--+{
--+ GIT_UNUSED(path);
--+ GIT_UNUSED(is_dir);
--+
--+ giterr_set(GITERR_SSL, "mbedTLS is not supported in this version");
--+ return -1;
--+}
--+
--+#endif
--diff --git a/src/streams/mbedtls.h b/src/streams/mbedtls.h
--new file mode 100644
--index 000000000..7283698ff
----- /dev/null
--+++ b/src/streams/mbedtls.h
--@@ -0,0 +1,20 @@
--+/*
--+ * Copyright (C) the libgit2 contributors. All rights reserved.
--+ *
--+ * This file is part of libgit2, distributed under the GNU GPL v2 with
--+ * a Linking Exception. For full terms see the included COPYING file.
--+ */
--+#ifndef INCLUDE_steams_mbedtls_h__
--+#define INCLUDE_steams_mbedtls_h__
--+
--+#include "common.h"
--+
--+#include "git2/sys/stream.h"
--+
--+extern int git_mbedtls_stream_global_init(void);
--+
--+extern int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port);
--+
--+extern int git_mbedtls__set_cert_location(const char *path, int is_dir);
--+
--+#endif
--diff --git a/src/streams/tls.c b/src/streams/tls.c
--index d6ca7d40d..1bcb0d984 100644
----- a/src/streams/tls.c
--+++ b/src/streams/tls.c
--@@ -9,6 +9,7 @@
--
-- #include "git2/errors.h"
--
--+#include "streams/mbedtls.h"
-- #include "streams/openssl.h"
-- #include "streams/stransport.h"
--
--@@ -31,6 +32,8 @@ int git_tls_stream_new(git_stream **out, const char *host, const char *port)
-- return git_stransport_stream_new(out, host, port);
-- #elif defined(GIT_OPENSSL)
-- return git_openssl_stream_new(out, host, port);
--+#elif defined(GIT_MBEDTLS)
--+ return git_mbedtls_stream_new(out, host, port);
-- #else
-- GIT_UNUSED(out);
-- GIT_UNUSED(host);
--diff --git a/tests/core/stream.c b/tests/core/stream.c
--index 9bed4ae27..262888b10 100644
----- a/tests/core/stream.c
--+++ b/tests/core/stream.c
--@@ -33,9 +33,8 @@ void test_core_stream__register_tls(void)
-- cl_git_pass(git_stream_register_tls(NULL));
-- error = git_tls_stream_new(&stream, "localhost", "443");
--
--- /* We don't have arbitrary TLS stream support on Windows
--- * or when openssl support is disabled (except on OSX
--- * with Security framework).
--+ /* We don't have TLS support enabled, or we're on Windows,
--+ * which has no arbitrary TLS stream support.
-- */
-- #if defined(GIT_WIN32) || !defined(GIT_HTTPS)
-- cl_git_fail_with(-1, error);
-diff --git a/deps/patches/libgit2-mbedtls2.patch b/deps/patches/libgit2-mbedtls2.patch
-deleted file mode 100644
-index 2bc02a3725..0000000000
---- a/deps/patches/libgit2-mbedtls2.patch
-+++ /dev/null
-@@ -1,28 +0,0 @@
--Fixes mbedTLS support to link properly and not include libssl.so
--
--Tracked in upstream PR https://github.com/libgit2/libgit2/pull/4678
--
--NOTE: libgit2 has switched its CI to Azure Pipelines. The aforementioned PR makes modifications
--to the Travis YAML file, which has since been removed, causing patch conflicts. That part of
--the diff has thus been removed here.
--
--diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--index 2b82bb325..2deed5f87 100644
----- a/src/CMakeLists.txt
--+++ b/src/CMakeLists.txt
--@@ -284,8 +284,13 @@ ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
-- ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS")
-- ADD_FEATURE_INFO(SHA ON "using mbedTLS")
-- SET(GIT_SHA1_MBEDTLS 1)
--- FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c)
--- LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls")
--+ FILE(GLOB SRC_SHA1 hash/hash_mbedtls.c)
--+ LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR})
--+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
--+ # mbedTLS has no pkgconfig file, hence we can't require it
--+ # https://github.com/ARMmbed/mbedtls/issues/228
--+ # For now, pass its link flags as our own
--+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
-- ELSE()
-- MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}")
-- ENDIF()
-diff --git a/stdlib/LibGit2/src/gitcredential.jl b/stdlib/LibGit2/src/gitcredential.jl
-index 09c70d7d73..a0504b1c3d 100644
---- a/stdlib/LibGit2/src/gitcredential.jl
-+++ b/stdlib/LibGit2/src/gitcredential.jl
-@@ -263,6 +263,7 @@ function default_username(cfg::GitConfig, cred::GitCredential)
- end
-
- function use_http_path(cfg::GitConfig, cred::GitCredential)
-+ seen_specific = false
- use_path = false # Default is to ignore the path
-
- # https://git-scm.com/docs/gitcredentials#gitcredentials-useHttpPath
-@@ -272,8 +273,11 @@ function use_http_path(cfg::GitConfig, cred::GitCredential)
- for entry in GitConfigIter(cfg, r"credential.*\.usehttppath")
- section, url, name, value = split_cfg_entry(entry)
-
-- ismatch(url, cred) || continue
-- use_path = value == "true"
-+ # Ignore global configuration if we have already encountered more specific entry
-+ if ismatch(url, cred) && (!isempty(url) || !seen_specific)
-+ seen_specific = !isempty(url)
-+ use_path = value == "true"
-+ end
- end
-
- return use_path
---
-2.20.1
-
diff --git a/julia-Bump-libgit2-to-0.99.1.patch b/julia-Bump-libgit2-to-0.99.1.patch
new file mode 100644
index 0000000..89243c1
--- /dev/null
+++ b/julia-Bump-libgit2-to-0.99.1.patch
@@ -0,0 +1,197 @@
+From fa4481b0ef8ff668da71d64ea41cc8d209775bee Mon Sep 17 00:00:00 2001
+From: Milan Bouchet-Valat <nalimilan(a)club.fr>
+Date: Mon, 23 Mar 2020 10:20:58 +0100
+Subject: [PATCH] Bump libgit2 to 0.99.1
+
+---
+ deps/libgit2.version | 4 ++--
+ stdlib/LibGit2/src/LibGit2.jl | 2 +-
+ stdlib/LibGit2/src/blob.jl | 2 +-
+ stdlib/LibGit2/src/error.jl | 15 ++++++++++++---
+ stdlib/LibGit2/src/oid.jl | 3 ++-
+ stdlib/LibGit2/src/repository.jl | 2 +-
+ stdlib/LibGit2/src/types.jl | 11 ++++-------
+ stdlib/LibGit2/src/utils.jl | 4 ++--
+ stdlib/LibGit2/src/walker.jl | 2 +-
+ stdlib/LibGit2/test/libgit2.jl | 2 +-
+ 10 files changed, 27 insertions(+), 20 deletions(-)
+
+diff --git a/deps/libgit2.version b/deps/libgit2.version
+index f67bedc414..dc3c50c9c6 100644
+--- a/deps/libgit2.version
++++ b/deps/libgit2.version
+@@ -1,2 +1,2 @@
+-LIBGIT2_BRANCH=v0.28.2
+-LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3
++LIBGIT2_BRANCH=v0.99.0
++LIBGIT2_SHA1=172239021f7ba04fe7327647b213799853a9eb89
+diff --git a/stdlib/LibGit2/src/LibGit2.jl b/stdlib/LibGit2/src/LibGit2.jl
+index 627922e138..b890a0c42f 100644
+--- a/stdlib/LibGit2/src/LibGit2.jl
++++ b/stdlib/LibGit2/src/LibGit2.jl
+@@ -18,10 +18,10 @@ const REFCOUNT = Threads.Atomic{Int}(0)
+
+ function ensure_initialized end
+
++include("error.jl")
+ include("utils.jl")
+ include("consts.jl")
+ include("types.jl")
+-include("error.jl")
+ include("signature.jl")
+ include("oid.jl")
+ include("reference.jl")
+diff --git a/stdlib/LibGit2/src/blob.jl b/stdlib/LibGit2/src/blob.jl
+index b416fac732..efd7a14c9c 100644
+--- a/stdlib/LibGit2/src/blob.jl
++++ b/stdlib/LibGit2/src/blob.jl
+@@ -67,7 +67,7 @@ id = LibGit2.addblob!(repo, blob_file)
+ function addblob!(repo::GitRepo, path::AbstractString)
+ ensure_initialized()
+ id_ref = Ref{GitHash}()
+- @check ccall((:git_blob_create_fromdisk, :libgit2), Cint,
++ @check ccall((:git_blob_create_from_disk, :libgit2), Cint,
+ (Ptr{GitHash}, Ptr{Cvoid}, Cstring),
+ id_ref, repo.ptr, path)
+ return id_ref[]
+diff --git a/stdlib/LibGit2/src/error.jl b/stdlib/LibGit2/src/error.jl
+index 4d1e915cef..3e56999d5a 100644
+--- a/stdlib/LibGit2/src/error.jl
++++ b/stdlib/LibGit2/src/error.jl
+@@ -25,9 +25,13 @@ export GitError
+ ECERTIFICATE = Cint(-17), # server certificate is invalid
+ EAPPLIED = Cint(-18), # patch/merge has already been applied
+ EPEEL = Cint(-19), # the requested peel operation is not possible
+- EEOF = Cint(-20), # Unexpted EOF
++ EEOF = Cint(-20), # unexpected EOF
+ PASSTHROUGH = Cint(-30), # internal only
+- ITEROVER = Cint(-31)) # signals end of iteration
++ ITEROVER = Cint(-31), # signals end of iteration
++ RETRY = Cint(-32), # internal only
++ EMISMATCH = Cint(-33), # hashsum mismatch in object
++ EINDEXDIRTY = Cint(-34), # unsaved changes in the index would be overwritten
++ EAPPLYFAIL = Cint(-35)) # patch application failed
+
+ @enum(Class, None,
+ NoMemory,
+@@ -58,7 +62,12 @@ export GitError
+ Callback,
+ CherryPick,
+ Describe,
+- Rebase)
++ Rebase,
++ Filesystem,
++ Patch,
++ WorkTree,
++ SHA1,
++ HTTP)
+
+ struct ErrorStruct
+ message::Ptr{UInt8}
+diff --git a/stdlib/LibGit2/src/oid.jl b/stdlib/LibGit2/src/oid.jl
+index 069d725685..1074f003eb 100644
+--- a/stdlib/LibGit2/src/oid.jl
++++ b/stdlib/LibGit2/src/oid.jl
+@@ -13,7 +13,8 @@ function GitHash(ptr::Ptr{UInt8})
+ end
+ ensure_initialized()
+ oid_ptr = Ref(GitHash())
+- ccall((:git_oid_fromraw, :libgit2), Cvoid, (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr)
++ @check ccall((:git_oid_fromraw, :libgit2), Cint,
++ (Ptr{GitHash}, Ptr{UInt8}), oid_ptr, ptr)
+ return oid_ptr[]
+ end
+
+diff --git a/stdlib/LibGit2/src/repository.jl b/stdlib/LibGit2/src/repository.jl
+index 96249bd9f6..8c858b1f8f 100644
+--- a/stdlib/LibGit2/src/repository.jl
++++ b/stdlib/LibGit2/src/repository.jl
+@@ -32,7 +32,7 @@ end
+ function cleanup(r::GitRepo)
+ if r.ptr != C_NULL
+ ensure_initialized()
+- ccall((:git_repository__cleanup, :libgit2), Cvoid, (Ptr{Cvoid},), r.ptr)
++ @check ccall((:git_repository__cleanup, :libgit2), Cint, (Ptr{Cvoid},), r.ptr)
+ end
+ end
+
+diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
+index 6ffbe67ea2..3edb76a73d 100644
+--- a/stdlib/LibGit2/src/types.jl
++++ b/stdlib/LibGit2/src/types.jl
+@@ -197,7 +197,7 @@ end
+ LibGit2.TransferProgress
+
+ Transfer progress information used by the `transfer_progress` remote callback.
+-Matches the [`git_transfer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_transfer_progress) struct.
++Matches the [`git_indexer_progress`](https://libgit2.org/libgit2/#HEAD/type/git_indexer_progress) struct.
+ """
+ @kwdef struct TransferProgress
+ total_objects::Cuint = Cuint(0)
+@@ -223,6 +223,7 @@ end
+ push_negotiation::Ptr{Cvoid} = C_NULL
+ transport::Ptr{Cvoid} = C_NULL
+ payload::Ptr{Cvoid} = C_NULL
++ resolve_url::Ptr{Cvoid} = C_NULL
+ end
+
+ """
+@@ -325,12 +326,8 @@ end
+ prune::Cint = Consts.FETCH_PRUNE_UNSPECIFIED
+ update_fetchhead::Cint = Cint(1)
+ download_tags::Cint = Consts.REMOTE_DOWNLOAD_TAGS_AUTO
+- @static if LibGit2.VERSION >= v"0.25.0"
+- proxy_opts::ProxyOptions = ProxyOptions()
+- end
+- @static if LibGit2.VERSION >= v"0.24.0"
+- custom_headers::StrArrayStruct = StrArrayStruct()
+- end
++ proxy_opts::ProxyOptions = ProxyOptions()
++ custom_headers::StrArrayStruct = StrArrayStruct()
+ end
+
+ """
+diff --git a/stdlib/LibGit2/src/utils.jl b/stdlib/LibGit2/src/utils.jl
+index 147b0949f7..b601ea4efe 100644
+--- a/stdlib/LibGit2/src/utils.jl
++++ b/stdlib/LibGit2/src/utils.jl
+@@ -37,8 +37,8 @@ function version()
+ major = Ref{Cint}(0)
+ minor = Ref{Cint}(0)
+ patch = Ref{Cint}(0)
+- ccall((:git_libgit2_version, :libgit2), Cvoid,
+- (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch)
++ @check ccall((:git_libgit2_version, :libgit2), Cint,
++ (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch)
+ return VersionNumber(major[], minor[], patch[])
+ end
+ const VERSION = version()
+diff --git a/stdlib/LibGit2/src/walker.jl b/stdlib/LibGit2/src/walker.jl
+index 1d2fbcb52f..e977590eaf 100644
+--- a/stdlib/LibGit2/src/walker.jl
++++ b/stdlib/LibGit2/src/walker.jl
+@@ -77,7 +77,7 @@ end
+ function Base.sort!(w::GitRevWalker; by::Cint = Consts.SORT_NONE, rev::Bool=false)
+ ensure_initialized()
+ rev && (by |= Consts.SORT_REVERSE)
+- ccall((:git_revwalk_sorting, :libgit2), Cvoid, (Ptr{Cvoid}, Cint), w.ptr, by)
++ @check ccall((:git_revwalk_sorting, :libgit2), Cint, (Ptr{Cvoid}, Cint), w.ptr, by)
+ return w
+ end
+
+diff --git a/stdlib/LibGit2/test/libgit2.jl b/stdlib/LibGit2/test/libgit2.jl
+index b7ecd31d5f..c1418f5ad6 100644
+--- a/stdlib/LibGit2/test/libgit2.jl
++++ b/stdlib/LibGit2/test/libgit2.jl
+@@ -3043,7 +3043,7 @@ mktempdir() do dir
+ deserialize(f)
+ end
+ @test err.code == LibGit2.Error.ERROR
+- @test lowercase(err.msg) == lowercase("invalid Content-Type: text/plain")
++ @test lowercase(err.msg) == lowercase("invalid Content-Type: 'text/plain'")
+ end
+
+ # OpenSSL s_server should still be running
+--
+2.24.1
+
diff --git a/julia.spec b/julia.spec
index 0bc28dc..39d2095 100644
--- a/julia.spec
+++ b/julia.spec
@@ -1,11 +1,11 @@
-%global uvcommit 2348256acf5759a544e5ca7935f638d2bc091d60
+%global uvcommit 35b1504507a7a4168caae3d78db54d1121b121e1
%global uvversion 2.0.0
-%global llvmversion 6.0.1
+%global llvmversion 8.0.1
%global libwhichcommit 81e9723c0273d78493dc8c8ed570f68d9ce7e89e
-%global pkgcommit 394e7c5d55d3722f5b2ab660ca0a694ea0041974
+%global pkgcommit 9419c70af69153cd5c4276bff90fbb135e0aa3f1
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
# List all bundled libraries here
@@ -15,8 +15,8 @@
%global __requires_exclude ^(%{_privatelibs})$
Name: julia
-Version: 1.2.0
-Release: 6%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: High-level, high-performance dynamic language for technical computing
# Julia itself is MIT, with a few LGPLv2+ and GPLv2+ files
# libuv is MIT
@@ -25,12 +25,14 @@ URL: http://julialang.org/
Source0: https://github.com/JuliaLang/julia/releases/download/v%{version}/julia-%{ve…
# Julia currently uses a custom version of libuv, patches are not yet upstream
Source1: https://api.github.com/repos/JuliaLang/libuv/tarball/%{uvcommit}#/libuv-%{u…
-Source2: http://releases.llvm.org/%{llvmversion}/llvm-%{llvmversion}.src.tar.xz
+Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{llvmversio…
Source3: https://api.github.com/repos/vtjnash/libwhich/tarball/%{libwhichcommit}#/li…
Source4: https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/%{pkgcommit}#/Pkg-%{p…
Patch0: julia_unwind_version.patch
Patch1: llvm-julia-installdirs-64.patch
-Patch2: julia-Bump-libgit2-to-0.28.2-32806.patch
+# Fix build with GCC10: https://reviews.llvm.org/D64937
+Patch2: llvm-D64937.patch
+Patch3: julia-Bump-libgit2-to-0.99.1.patch
Provides: bundled(libuv) = %{uvversion}
Provides: bundled(llvm) = %{llvmversion}
BuildRequires: desktop-file-utils
@@ -67,6 +69,7 @@ BuildRequires: suitesparse-devel >= 4.1
BuildRequires: utf8proc-devel >= 2.1
BuildRequires: zlib-devel
Requires: julia-common = %{version}-%{release}
+Requires: p7zip-plugins
# https://bugzilla.redhat.com/show_bug.cgi?id=1158026
# https://github.com/JuliaLang/julia/issues/30087
ExcludeArch: s390x ppc64le %{arm} aarch64
@@ -121,7 +124,7 @@ Julia into external programs or debugging Julia itself.
patch -p1 < %PATCH1
%endif
-%patch2 -p1
+patch -p1 < %PATCH3
mkdir -p deps/srccache stdlib/srccache
@@ -191,16 +194,22 @@ popd
%endif
# About build, build_libdir and build_bindir, see https://github.com/JuliaLang/julia/issues/5063#issuecomment-32628111
-%global julia_builddir "$(pwd)"
+%global julia_builddir %{_builddir}/%{name}/build
-%global commonopts USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_DSFMT=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_UTF8PROC=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_CURL=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0 USE_SYSTEM_OPENLIBM=1 USE_BINARYBUILDER=0 BUNDLE_DEBUG_LIBS=1 JULIA_SPLITDEBUG=1 TAGGED_RELEASE_BANNER="Fedora %{fedora} build" VERBOSE=1 %{march} %{cpu_target} %{blas} %{suitesparse_lib} prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir}%{_prefix} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir} JULIA_CPU_THREADS=$(echo %{?_smp_mflags} | sed s/-j//)
+%global commonopts USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_DSFMT=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_UTF8PROC=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_CURL=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0 USE_SYSTEM_OPENLIBM=1 USE_BINARYBUILDER=0 USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 BUNDLE_DEBUG_LIBS=1 JULIA_SPLITDEBUG=1 TAGGED_RELEASE_BANNER="Fedora %{fedora} build" VERBOSE=1 %{march} %{cpu_target} %{blas} %{suitesparse_lib} prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir}%{_prefix} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir} JULIA_CPU_THREADS=$(echo %{?_smp_mflags} | sed s/-j//)
+
+# Need to extract LLVM to apply patch
+make CFLAGS="%optflags" CXXFLAGS="%optflags" %{commonopts} -C deps extract-llvm
+pushd deps/srccache/llvm-%{llvmversion}
+ patch -p1 < %PATCH2
+popd
%build
# Temporary workaround for https://github.com/JuliaLang/julia/issues/27118
%global optflags %(echo %{optflags} | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS //')
-%ifarch %{arm}
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
+%ifarch %{arm} %{ix86}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
@@ -214,34 +223,6 @@ popd
# If debug is not built here, it is built during make install
make %{?_smp_mflags} %{buildflags} %{commonopts} release debug
-# Do this before running tests so that they fail if a link is incorrect
-pushd %{julia_builddir}%{_libdir}/julia
- %if 0%{?__isa_bits} == 64
- rm -f libopenblas64_.so libopenblas64_.so.0
- ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so
- ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so.0
- # Raise an error in case of failure
- realpath -e libopenblas64_.so
- realpath -e libopenblas64_.so.0
-
- # Julia creates symlinks to SuiteSparse libraries linking to libopenblas rather than libopenblas64_
- for LIB in spqr umfpack colamd cholmod ccolamd camd amd suitesparseconfig
- do
- rm -f lib${LIB}.so
- ln -s %{_libdir}/$(readelf -d %{_libdir}/lib${LIB}64_.so | sed -n '/SONAME/s/.*\(lib[^ ]*\.so\.[0-9]*\).*/\1/p') lib${LIB}.so
- # Raise an error in case of failure
- realpath -e lib${LIB}.so
- done
- %else
- rm -f libopenblas.so libopenblas.so.0
- ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so
- ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so.0
- # Raise an error in case of failure
- realpath -e libopenblas.so
- realpath -e libopenblas.so.0
- %endif
-popd
-
%check
# Disable tests known to fail currently
@@ -268,6 +249,33 @@ make %{commonopts} test
%install
make %{commonopts} DESTDIR=%{buildroot} install
+pushd %{buildroot}%{_libdir}/julia
+ %if 0%{?__isa_bits} == 64
+ rm -f libopenblas64_.so
+ ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so
+ ln -s %{_libdir}/libopenblasp64_.so.0 libopenblas64_.so.0
+ # Raise an error in case of failure
+ realpath -e libopenblas64_.so
+ realpath -e libopenblas64_.so.0
+
+ # Julia creates symlinks to SuiteSparse libraries linking to libopenblas rather than libopenblas64_
+ for LIB in spqr umfpack colamd cholmod ccolamd camd amd suitesparseconfig
+ do
+ rm -f lib${LIB}.so
+ ln -s %{_libdir}/$(readelf -d %{_libdir}/lib${LIB}64_.so | sed -n '/SONAME/s/.*\(lib[^ ]*\.so\.[0-9]*\).*/\1/p') lib${LIB}.so
+ # Raise an error in case of failure
+ realpath -e lib${LIB}.so
+ done
+ %else
+ rm -f libopenblas.so
+ ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so
+ ln -s %{_libdir}/libopenblasp.so.0 libopenblas.so.0
+ # Raise an error in case of failure
+ realpath -e libopenblas.so
+ realpath -e libopenblas.so.0
+ %endif
+popd
+
cp -p CONTRIBUTING.md LICENSE.md NEWS.md README.md %{buildroot}%{_docdir}/julia/
pushd %{buildroot}%{_prefix}/share/man/man1/
@@ -302,7 +310,7 @@ convert -scale 256x256 -extent 256x256 -gravity center -background transparent \
contrib/julia.svg %{buildroot}%{_datarootdir}/icons/hicolor/256x256/apps/%{name}.png
desktop-file-validate %{buildroot}%{_datarootdir}/applications/%{name}.desktop
-rm %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
+rm -f %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
%files
%dir %{_docdir}/julia/
@@ -353,6 +361,9 @@ rm %{buildroot}%{_datarootdir}/icons/hicolor/icon-theme.cache
exit 0
%changelog
+* Tue Mar 24 2020 Milan Bouchet-Valat <nalimilan(a)club.fr> - 1.4.0-0
+- New upstream release.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/llvm-D64937.patch b/llvm-D64937.patch
new file mode 100644
index 0000000..bd1f9cf
--- /dev/null
+++ b/llvm-D64937.patch
@@ -0,0 +1,11 @@
+--- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
++++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
+@@ -16,6 +16,8 @@
+ #include "llvm/Demangle/DemangleConfig.h"
+ #include "llvm/Demangle/StringView.h"
+ #include <array>
++#include <cstdint>
++#include <string>
+
+ namespace llvm {
+ namespace itanium_demangle {
diff --git a/sources b/sources
index 471681e..afbe9b0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
+SHA512 (julia-1.4.0.tar.gz) = f8152a595f13932f6cad186cf2fdf2fb0bd64cc49bbb11a76d8299f4745ca6428823ead0e73a7bae1347f1b99bf1181d1f457587d13a7bfc7324ca81afc35cc1
SHA512 (libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz) = c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
-SHA512 (llvm-6.0.1.src.tar.xz) = cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-SHA512 (julia-1.2.0.tar.gz) = c99b0b744508b43df4ee334f588dbb57a633969d7cb164d41b76d552c1d14f5ff6f06a8d0da7f7a48fd1e3a3b3c2379998c5af1bfdff4b0c17045132b82a40b8
-SHA512 (Pkg-394e7c5d55d3722f5b2ab660ca0a694ea0041974.tar.gz) = 6b5324ee3efad2bf1af6ed4503509c6297e710040ccd7d5c67263625f24eab9a88f28ad56cb77ca04ccc976c051f2fbf2bb2019df442ab4823e5a7aff977b825
SHA512 (libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz) = 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
+SHA512 (llvm-8.0.1.src.tar.xz) = 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+SHA512 (Pkg-9419c70af69153cd5c4276bff90fbb135e0aa3f1.tar.gz) = beab318b1cf96a2f0957f26d33f2d06e6dfabed405778f3945caf6372cc62ed74ff069e912475f3e553cf3013db73a2c73f2a758a3e3b1ba21db0471b7182dbe
1
0
26 Mar '20
The package rpms/libpoly.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libpoly.git/commit/?id=c4925e46faea….
Change:
+%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit c4925e46faeab2d48e93235163d4cb78f38eec3d
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Mar 26 12:20:40 2020 -0600
Do not run the tests on 32-bit platforms; the tests fail due to the
limited size of a C integer.
diff --git a/libpoly.spec b/libpoly.spec
index 0d80d96..9f7998b 100644
--- a/libpoly.spec
+++ b/libpoly.spec
@@ -61,10 +61,12 @@ cd build
mkdir -p %{buildroot}%{python3_sitearch}
cp -p python/polypy.so %{buildroot}%{python3_sitearch}
+%ifnarch %{ix86} %{arm}
%check
export LD_LIBRARY_PATH=$PWD/build/src
cd build
make check
+%endif
%files
%license LICENCE
@@ -83,7 +85,8 @@ make check
- Version 0.1.8
- Add sympy BR for the tests
- Add the python3 interface
-- Bring back the check script
+- Bring back the check script for 64-bit platforms; 32-bit platforms cannot
+ run all tests due to the limited size of a C integer
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.1.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
1
0
26 Mar '20
The package rpms/non-daw.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=06b3bccd5af7…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=4f5ca32ff1b6…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=47007462be1d…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=010ea05a9581….
Change:
+%ifarch %{ix86} x86_64
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64
+ExcludeArch: %{arm}
Thanks.
Full change:
============
commit 699d9f3be4813d96ce3d07327bc96d3c8a412286
Author: Erich Eickmeyer <erich(a)ericheickmeyer.com>
Date: Thu Mar 26 10:18:21 2020 -0700
Unretired, new import
diff --git a/.gitignore b/.gitignore
index 5b36417..d5a32dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/non-daw-20130902-git9fba8a8.tar.bz2
/non-daw-20131026-git13c3ca8.tar.bz2
/non-20160405-git16885e69.tar.bz2
+/non-bbe8386499621c8e60eebb06d80e966f13a69a95.tar.gz
diff --git a/fix-fsf-address.patch b/fix-fsf-address.patch
new file mode 100644
index 0000000..537e254
--- /dev/null
+++ b/fix-fsf-address.patch
@@ -0,0 +1,3246 @@
+From 1daedbec4b3a185f444aedf63e03dd65d684aea9 Mon Sep 17 00:00:00 2001
+Message-Id: <1daedbec4b3a185f444aedf63e03dd65d684aea9.1584816930.git.erich(a)ericheickmeyer.com>
+From: Erich Eickmeyer <erich(a)ericheickmeyer.com>
+Date: Sat, 21 Mar 2020 11:55:13 -0700
+Subject: [PATCH] fix-fsf-address
+
+---
+ FL/About_Dialog.fl | 2 +-
+ FL/Fl_Blink_Button.H | 2 +-
+ FL/Fl_DialX.C | 2 +-
+ FL/Fl_DialX.H | 2 +-
+ FL/Fl_Flip_Button.H | 2 +-
+ FL/Fl_Flowpack.H | 2 +-
+ FL/Fl_Labelpad_Group.H | 2 +-
+ FL/Fl_Menu_Settings.C | 2 +-
+ FL/Fl_Menu_Settings.H | 2 +-
+ FL/Fl_Packscroller.H | 2 +-
+ FL/Fl_Scalepack.C | 2 +-
+ FL/Fl_Scalepack.H | 2 +-
+ FL/Fl_SliderX.C | 2 +-
+ FL/Fl_SliderX.H | 2 +-
+ FL/Fl_Sometimes_Input.H | 2 +-
+ FL/Fl_Sometimes_Pack.H | 2 +-
+ FL/Fl_Value_SliderX.C | 2 +-
+ FL/Fl_Value_SliderX.H | 2 +-
+ FL/New_Project_Dialog.fl | 2 +-
+ FL/event_name.C | 2 +-
+ FL/event_name.H | 2 +-
+ FL/focus_frame.C | 2 +-
+ FL/focus_frame.H | 2 +-
+ FL/img_io_input_connector_10x10_png.h | 2 +-
+ FL/img_io_output_connector_10x10_png.h | 2 +-
+ FL/menu_popup.C | 2 +-
+ FL/menu_popup.H | 2 +-
+ FL/test_press.C | 2 +-
+ FL/test_press.H | 2 +-
+ FL/util/ntk-perf.C | 2 +-
+ mixer/src/AUX_Module.C | 2 +-
+ mixer/src/AUX_Module.H | 2 +-
+ mixer/src/Chain.C | 2 +-
+ mixer/src/Chain.H | 2 +-
+ mixer/src/Controller_Module.C | 2 +-
+ mixer/src/Controller_Module.H | 2 +-
+ mixer/src/DPM.C | 2 +-
+ mixer/src/DPM.H | 2 +-
+ mixer/src/Gain_Module.C | 2 +-
+ mixer/src/Gain_Module.H | 2 +-
+ mixer/src/Group.C | 2 +-
+ mixer/src/Group.H | 2 +-
+ mixer/src/JACK_Module.C | 2 +-
+ mixer/src/JACK_Module.H | 2 +-
+ mixer/src/LADSPAInfo.C | 2 +-
+ mixer/src/LADSPAInfo.h | 2 +-
+ mixer/src/Meter.H | 2 +-
+ mixer/src/Meter_Indicator_Module.C | 2 +-
+ mixer/src/Meter_Indicator_Module.H | 2 +-
+ mixer/src/Meter_Module.C | 2 +-
+ mixer/src/Meter_Module.H | 2 +-
+ mixer/src/Mixer.C | 2 +-
+ mixer/src/Mixer.H | 2 +-
+ mixer/src/Mixer_Strip.C | 2 +-
+ mixer/src/Mixer_Strip.H | 2 +-
+ mixer/src/Module.C | 2 +-
+ mixer/src/Module.H | 2 +-
+ mixer/src/Module_Parameter_Editor.C | 2 +-
+ mixer/src/Module_Parameter_Editor.H | 2 +-
+ mixer/src/Mono_Pan_Module.C | 2 +-
+ mixer/src/Mono_Pan_Module.H | 2 +-
+ mixer/src/NSM.C | 2 +-
+ mixer/src/NSM.H | 2 +-
+ mixer/src/Panner.C | 2 +-
+ mixer/src/Panner.H | 2 +-
+ mixer/src/Plugin_Chooser.C | 2 +-
+ mixer/src/Plugin_Chooser.H | 2 +-
+ mixer/src/Plugin_Module.C | 2 +-
+ mixer/src/Plugin_Module.H | 2 +-
+ mixer/src/Project.C | 2 +-
+ mixer/src/Project.H | 2 +-
+ mixer/src/Spatialization_Console.C | 2 +-
+ mixer/src/Spatialization_Console.H | 2 +-
+ mixer/src/Spatializer_Module.C | 2 +-
+ mixer/src/Spatializer_Module.H | 2 +-
+ mixer/src/SpectrumView.C | 2 +-
+ mixer/src/SpectrumView.H | 2 +-
+ mixer/src/const.h | 2 +-
+ mixer/src/main.C | 2 +-
+ mixer/src/midi-mapper.C | 2 +-
+ nonlib/Block_Timer.H | 2 +-
+ nonlib/JACK/Client.C | 2 +-
+ nonlib/JACK/Client.H | 2 +-
+ nonlib/JACK/Port.C | 2 +-
+ nonlib/JACK/Port.H | 2 +-
+ nonlib/Log_Entry.C | 2 +-
+ nonlib/Log_Entry.H | 2 +-
+ nonlib/Loggable.C | 2 +-
+ nonlib/Loggable.H | 2 +-
+ nonlib/MIDI/event.C | 2 +-
+ nonlib/MIDI/event.H | 2 +-
+ nonlib/MIDI/event_list.C | 2 +-
+ nonlib/MIDI/event_list.H | 2 +-
+ nonlib/MIDI/midievent.C | 2 +-
+ nonlib/MIDI/midievent.H | 2 +-
+ nonlib/MIDI/types.h | 2 +-
+ nonlib/Mutex.H | 2 +-
+ nonlib/NSM/Client.C | 2 +-
+ nonlib/NSM/Client.H | 2 +-
+ nonlib/OSC/Endpoint.C | 2 +-
+ nonlib/OSC/Endpoint.H | 2 +-
+ nonlib/Thread.C | 2 +-
+ nonlib/Thread.H | 2 +-
+ nonlib/debug.C | 2 +-
+ nonlib/debug.h | 2 +-
+ nonlib/dsp.C | 2 +-
+ nonlib/dsp.h | 2 +-
+ nonlib/file.C | 2 +-
+ nonlib/file.h | 2 +-
+ nonlib/string_util.C | 2 +-
+ nonlib/string_util.h | 2 +-
+ nonlib/types.h | 2 +-
+ sequencer/src/NSM.C | 2 +-
+ sequencer/src/NSM.H | 2 +-
+ sequencer/src/NSM/Client.C | 2 +-
+ sequencer/src/NSM/Client.H | 2 +-
+ sequencer/src/canvas.C | 2 +-
+ sequencer/src/canvas.H | 2 +-
+ sequencer/src/common.h | 2 +-
+ sequencer/src/const.h | 2 +-
+ sequencer/src/debug.C | 2 +-
+ sequencer/src/debug.h | 2 +-
+ sequencer/src/grid.C | 2 +-
+ sequencer/src/grid.H | 2 +-
+ sequencer/src/gui/event_edit.fl | 2 +-
+ sequencer/src/gui/ui.fl | 2 +-
+ sequencer/src/instrument.C | 2 +-
+ sequencer/src/instrument.H | 2 +-
+ sequencer/src/jack.C | 2 +-
+ sequencer/src/main.C | 2 +-
+ sequencer/src/mapping.C | 2 +-
+ sequencer/src/mapping.H | 2 +-
+ sequencer/src/non.H | 2 +-
+ sequencer/src/pattern.C | 2 +-
+ sequencer/src/pattern.H | 2 +-
+ sequencer/src/phrase.C | 2 +-
+ sequencer/src/phrase.H | 2 +-
+ sequencer/src/scale.C | 2 +-
+ sequencer/src/scale.H | 2 +-
+ sequencer/src/sequence.C | 2 +-
+ sequencer/src/sequence.H | 2 +-
+ sequencer/src/smf.C | 2 +-
+ sequencer/src/smf.H | 2 +-
+ sequencer/src/transport.C | 2 +-
+ sequencer/src/transport.H | 2 +-
+ session-manager/src/jackpatch.c | 2 +-
+ session-manager/src/nsm-proxy-gui.C | 2 +-
+ session-manager/src/nsm-proxy.C | 2 +-
+ session-manager/src/nsmd.C | 2 +-
+ session-manager/src/send_osc.C | 2 +-
+ session-manager/src/session-manager.C | 2 +-
+ timeline/bin/import-ardour-session | 2 +-
+ timeline/bin/import-external-sources | 2 +-
+ timeline/bin/remove-unused-sources | 2 +-
+ timeline/src/Annotation_Point.H | 2 +-
+ timeline/src/Annotation_Region.C | 2 +-
+ timeline/src/Annotation_Region.H | 2 +-
+ timeline/src/Annotation_Sequence.H | 2 +-
+ timeline/src/Audio_Region.C | 2 +-
+ timeline/src/Audio_Region.H | 2 +-
+ timeline/src/Audio_Sequence.C | 2 +-
+ timeline/src/Audio_Sequence.H | 2 +-
+ timeline/src/Clock.H | 2 +-
+ timeline/src/Control_Point.C | 2 +-
+ timeline/src/Control_Point.H | 2 +-
+ timeline/src/Control_Sequence.C | 2 +-
+ timeline/src/Control_Sequence.H | 2 +-
+ timeline/src/Cursor_Point.C | 2 +-
+ timeline/src/Cursor_Point.H | 2 +-
+ timeline/src/Cursor_Region.C | 2 +-
+ timeline/src/Cursor_Region.H | 2 +-
+ timeline/src/Cursor_Sequence.C | 2 +-
+ timeline/src/Cursor_Sequence.H | 2 +-
+ timeline/src/Engine/Audio_File.C | 2 +-
+ timeline/src/Engine/Audio_File.H | 2 +-
+ timeline/src/Engine/Audio_File_Dummy.C | 2 +-
+ timeline/src/Engine/Audio_File_Dummy.H | 2 +-
+ timeline/src/Engine/Audio_File_SF.C | 2 +-
+ timeline/src/Engine/Audio_File_SF.H | 2 +-
+ timeline/src/Engine/Audio_Region.C | 2 +-
+ timeline/src/Engine/Audio_Sequence.C | 2 +-
+ timeline/src/Engine/Control_Sequence.C | 2 +-
+ timeline/src/Engine/Disk_Stream.C | 2 +-
+ timeline/src/Engine/Disk_Stream.H | 2 +-
+ timeline/src/Engine/Engine.C | 2 +-
+ timeline/src/Engine/Engine.H | 2 +-
+ timeline/src/Engine/Peak.H | 2 +-
+ timeline/src/Engine/Peaks.C | 2 +-
+ timeline/src/Engine/Peaks.H | 2 +-
+ timeline/src/Engine/Playback_DS.C | 2 +-
+ timeline/src/Engine/Playback_DS.H | 2 +-
+ timeline/src/Engine/Record_DS.C | 2 +-
+ timeline/src/Engine/Record_DS.H | 2 +-
+ timeline/src/Engine/Timeline.C | 2 +-
+ timeline/src/Engine/Track.C | 2 +-
+ timeline/src/Engine/const.h | 2 +-
+ timeline/src/Engine/types.h | 2 +-
+ timeline/src/NSM.C | 2 +-
+ timeline/src/OSC_Thread.C | 2 +-
+ timeline/src/OSC_Thread.H | 2 +-
+ timeline/src/Project.C | 2 +-
+ timeline/src/Project.H | 2 +-
+ timeline/src/RWLock.H | 2 +-
+ timeline/src/Sequence.C | 2 +-
+ timeline/src/Sequence.H | 2 +-
+ timeline/src/Sequence_Point.C | 2 +-
+ timeline/src/Sequence_Point.H | 2 +-
+ timeline/src/Sequence_Region.C | 2 +-
+ timeline/src/Sequence_Region.H | 2 +-
+ timeline/src/Sequence_Widget.C | 2 +-
+ timeline/src/Sequence_Widget.H | 2 +-
+ timeline/src/TLE.fl | 2 +-
+ timeline/src/Tempo_Point.C | 2 +-
+ timeline/src/Tempo_Point.H | 2 +-
+ timeline/src/Tempo_Sequence.C | 2 +-
+ timeline/src/Tempo_Sequence.H | 2 +-
+ timeline/src/Time_Point.C | 2 +-
+ timeline/src/Time_Point.H | 2 +-
+ timeline/src/Time_Sequence.C | 2 +-
+ timeline/src/Time_Sequence.H | 2 +-
+ timeline/src/Timeline.C | 2 +-
+ timeline/src/Timeline.H | 2 +-
+ timeline/src/Track.C | 2 +-
+ timeline/src/Track.H | 2 +-
+ timeline/src/Transport.C | 2 +-
+ timeline/src/Transport.H | 2 +-
+ timeline/src/Waveform.C | 2 +-
+ timeline/src/Waveform.H | 2 +-
+ timeline/src/const.h | 2 +-
+ timeline/src/main.C | 2 +-
+ timeline/src/types.h | 2 +-
+ 231 files changed, 231 insertions(+), 231 deletions(-)
+
+diff --git a/FL/About_Dialog.fl b/FL/About_Dialog.fl
+index 2504854..5f191ae 100644
+--- a/FL/About_Dialog.fl
++++ b/FL/About_Dialog.fl
+@@ -70,7 +70,7 @@ if ( logo_box->image() )
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.}
++You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.}
+ xywh {10 414 535 225} box ROUNDED_BOX color 46 labelfont 1 labelsize 12 labelcolor 53 align 144
+ }
+ }
+diff --git a/FL/Fl_Blink_Button.H b/FL/Fl_Blink_Button.H
+index bc81303..bc4c7a7 100644
+--- a/FL/Fl_Blink_Button.H
++++ b/FL/Fl_Blink_Button.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_DialX.C b/FL/Fl_DialX.C
+index 64973b5..6dfdc05 100644
+--- a/FL/Fl_DialX.C
++++ b/FL/Fl_DialX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_DialX.H"
+diff --git a/FL/Fl_DialX.H b/FL/Fl_DialX.H
+index d27da3c..8bde176 100644
+--- a/FL/Fl_DialX.H
++++ b/FL/Fl_DialX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Flip_Button.H b/FL/Fl_Flip_Button.H
+index d3e0b1e..b1b8be0 100644
+--- a/FL/Fl_Flip_Button.H
++++ b/FL/Fl_Flip_Button.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Simple extension of Fl_Button to support different lables for the
+diff --git a/FL/Fl_Flowpack.H b/FL/Fl_Flowpack.H
+index cdb3779..0edfc6d 100644
+--- a/FL/Fl_Flowpack.H
++++ b/FL/Fl_Flowpack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Labelpad_Group.H b/FL/Fl_Labelpad_Group.H
+index bf7e641..7750c19 100644
+--- a/FL/Fl_Labelpad_Group.H
++++ b/FL/Fl_Labelpad_Group.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* wrap a widget in a group as wide as the widget's label. This is
+diff --git a/FL/Fl_Menu_Settings.C b/FL/Fl_Menu_Settings.C
+index a2f513e..e47b4a1 100644
+--- a/FL/Fl_Menu_Settings.C
++++ b/FL/Fl_Menu_Settings.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_Menu_Settings.H"
+diff --git a/FL/Fl_Menu_Settings.H b/FL/Fl_Menu_Settings.H
+index 7a94697..416d909 100644
+--- a/FL/Fl_Menu_Settings.H
++++ b/FL/Fl_Menu_Settings.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Packscroller.H b/FL/Fl_Packscroller.H
+index 0661b48..1b75d01 100644
+--- a/FL/Fl_Packscroller.H
++++ b/FL/Fl_Packscroller.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Scrolling group suitable for containing a single child (a
+diff --git a/FL/Fl_Scalepack.C b/FL/Fl_Scalepack.C
+index c253838..bab54e1 100644
+--- a/FL/Fl_Scalepack.C
++++ b/FL/Fl_Scalepack.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Scalepack.H b/FL/Fl_Scalepack.H
+index 9974bba..b1e278e 100644
+--- a/FL/Fl_Scalepack.H
++++ b/FL/Fl_Scalepack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_SliderX.C b/FL/Fl_SliderX.C
+index 582b02a..1596bab 100644
+--- a/FL/Fl_SliderX.C
++++ b/FL/Fl_SliderX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_SliderX.H"
+diff --git a/FL/Fl_SliderX.H b/FL/Fl_SliderX.H
+index bc56605..629d824 100644
+--- a/FL/Fl_SliderX.H
++++ b/FL/Fl_SliderX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Sometimes_Input.H b/FL/Fl_Sometimes_Input.H
+index ef5be75..d001382 100644
+--- a/FL/Fl_Sometimes_Input.H
++++ b/FL/Fl_Sometimes_Input.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Sometimes_Pack.H b/FL/Fl_Sometimes_Pack.H
+index d20a035..1974f7d 100644
+--- a/FL/Fl_Sometimes_Pack.H
++++ b/FL/Fl_Sometimes_Pack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Value_SliderX.C b/FL/Fl_Value_SliderX.C
+index 0e8821f..069c57b 100644
+--- a/FL/Fl_Value_SliderX.C
++++ b/FL/Fl_Value_SliderX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Value_SliderX.H b/FL/Fl_Value_SliderX.H
+index 39492b0..0a5ac0b 100644
+--- a/FL/Fl_Value_SliderX.H
++++ b/FL/Fl_Value_SliderX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #ifndef Fl_Value_SliderX_H
+diff --git a/FL/New_Project_Dialog.fl b/FL/New_Project_Dialog.fl
+index 14be033..8e19a0e 100644
+--- a/FL/New_Project_Dialog.fl
++++ b/FL/New_Project_Dialog.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/FL/event_name.C b/FL/event_name.C
+index d53ab98..96503b7 100644
+--- a/FL/event_name.C
++++ b/FL/event_name.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static const char *event_names[] =
+diff --git a/FL/event_name.H b/FL/event_name.H
+index 28d58d6..741393e 100644
+--- a/FL/event_name.H
++++ b/FL/event_name.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char *event_name ( int m );
+diff --git a/FL/focus_frame.C b/FL/focus_frame.C
+index 0cabb7e..50c6848 100644
+--- a/FL/focus_frame.C
++++ b/FL/focus_frame.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/FL/focus_frame.H b/FL/focus_frame.H
+index e48e540..73338a4 100644
+--- a/FL/focus_frame.H
++++ b/FL/focus_frame.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ void draw_focus_frame ( int x, int y, int w, int h, Fl_Color c );
+diff --git a/FL/img_io_input_connector_10x10_png.h b/FL/img_io_input_connector_10x10_png.h
+index c58f485..36f1c88 100644
+--- a/FL/img_io_input_connector_10x10_png.h
++++ b/FL/img_io_input_connector_10x10_png.h
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static unsigned char img_io_input_connector_10x10_png[] = {
+diff --git a/FL/img_io_output_connector_10x10_png.h b/FL/img_io_output_connector_10x10_png.h
+index 1a0503f..1625a54 100644
+--- a/FL/img_io_output_connector_10x10_png.h
++++ b/FL/img_io_output_connector_10x10_png.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static unsigned char img_io_output_connector_10x10_png[] = {
+diff --git a/FL/menu_popup.C b/FL/menu_popup.C
+index afe3b95..0eb7b0d 100644
+--- a/FL/menu_popup.C
++++ b/FL/menu_popup.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/FL/menu_popup.H b/FL/menu_popup.H
+index 67c5b78..2c282e6 100644
+--- a/FL/menu_popup.H
++++ b/FL/menu_popup.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ class Fl_Menu_;
+diff --git a/FL/test_press.C b/FL/test_press.C
+index 0a79238..7356516 100644
+--- a/FL/test_press.C
++++ b/FL/test_press.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Fl::test_shortcut() is broken for use in FL_PUSH handlers etc,
+diff --git a/FL/test_press.H b/FL/test_press.H
+index 3b0fe55..1f5a427 100644
+--- a/FL/test_press.H
++++ b/FL/test_press.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ int test_press ( unsigned long e );
+diff --git a/FL/util/ntk-perf.C b/FL/util/ntk-perf.C
+index ca32236..b24ed01 100644
+--- a/FL/util/ntk-perf.C
++++ b/FL/util/ntk-perf.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/AUX_Module.C b/mixer/src/AUX_Module.C
+index d8aa58e..d0e2ce8 100644
+--- a/mixer/src/AUX_Module.C
++++ b/mixer/src/AUX_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/mixer/src/AUX_Module.H b/mixer/src/AUX_Module.H
+index e422a54..1838b0d 100644
+--- a/mixer/src/AUX_Module.H
++++ b/mixer/src/AUX_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Chain.C b/mixer/src/Chain.C
+index d0b173a..e1d0678 100644
+--- a/mixer/src/Chain.C
++++ b/mixer/src/Chain.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Filter chain. This would all be much simpler if we chose not to
+diff --git a/mixer/src/Chain.H b/mixer/src/Chain.H
+index c11cdad..c6c8261 100644
+--- a/mixer/src/Chain.H
++++ b/mixer/src/Chain.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Controller_Module.C b/mixer/src/Controller_Module.C
+index 74eaca9..9d9df7f 100644
+--- a/mixer/src/Controller_Module.C
++++ b/mixer/src/Controller_Module.C
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Controller_Module.H b/mixer/src/Controller_Module.H
+index 83973ba..2bc095a 100644
+--- a/mixer/src/Controller_Module.H
++++ b/mixer/src/Controller_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C
+index 35edf23..978feda 100644
+--- a/mixer/src/DPM.C
++++ b/mixer/src/DPM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* a Digital Peak Meter, either horizontal or vertical. Color is a
+diff --git a/mixer/src/DPM.H b/mixer/src/DPM.H
+index 03f24bb..ed56651 100644
+--- a/mixer/src/DPM.H
++++ b/mixer/src/DPM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Gain_Module.C b/mixer/src/Gain_Module.C
+index ecd5fe1..f35ce30 100644
+--- a/mixer/src/Gain_Module.C
++++ b/mixer/src/Gain_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <math.h>
+diff --git a/mixer/src/Gain_Module.H b/mixer/src/Gain_Module.H
+index a8bf764..5e4a322 100644
+--- a/mixer/src/Gain_Module.H
++++ b/mixer/src/Gain_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Group.C b/mixer/src/Group.C
+index 1f57642..24ec09c 100644
+--- a/mixer/src/Group.C
++++ b/mixer/src/Group.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <Mixer.H>
+diff --git a/mixer/src/Group.H b/mixer/src/Group.H
+index 5d3dd3d..cd93080 100644
+--- a/mixer/src/Group.H
++++ b/mixer/src/Group.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/JACK_Module.C b/mixer/src/JACK_Module.C
+index 199f75c..c33be0e 100644
+--- a/mixer/src/JACK_Module.C
++++ b/mixer/src/JACK_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/JACK_Module.H b/mixer/src/JACK_Module.H
+index 25e3d97..0ec1f82 100644
+--- a/mixer/src/JACK_Module.H
++++ b/mixer/src/JACK_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..e3cb345 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ //
+
+ // #include <config.h>
+diff --git a/mixer/src/LADSPAInfo.h b/mixer/src/LADSPAInfo.h
+index fbda43d..6083b83 100644
+--- a/mixer/src/LADSPAInfo.h
++++ b/mixer/src/LADSPAInfo.h
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ //
+
+ #ifndef __ladspa_info_h__
+diff --git a/mixer/src/Meter.H b/mixer/src/Meter.H
+index ce61263..0de7491 100644
+--- a/mixer/src/Meter.H
++++ b/mixer/src/Meter.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/mixer/src/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C
+index df23d3b..3e4fc49 100644
+--- a/mixer/src/Meter_Indicator_Module.C
++++ b/mixer/src/Meter_Indicator_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Meter_Indicator_Module.H"
+diff --git a/mixer/src/Meter_Indicator_Module.H b/mixer/src/Meter_Indicator_Module.H
+index 960d17c..441372d 100644
+--- a/mixer/src/Meter_Indicator_Module.H
++++ b/mixer/src/Meter_Indicator_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Meter_Module.C b/mixer/src/Meter_Module.C
+index 30876b3..1b19e5d 100644
+--- a/mixer/src/Meter_Module.C
++++ b/mixer/src/Meter_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Meter_Module.H b/mixer/src/Meter_Module.H
+index 2b3e72b..ac100b5 100644
+--- a/mixer/src/Meter_Module.H
++++ b/mixer/src/Meter_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C
+index 0969a9e..6812aef 100644
+--- a/mixer/src/Mixer.C
++++ b/mixer/src/Mixer.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is the main mixer group. It contains and manages Mixer_Strips. */
+diff --git a/mixer/src/Mixer.H b/mixer/src/Mixer.H
+index c86109b..1dc9eaa 100644
+--- a/mixer/src/Mixer.H
++++ b/mixer/src/Mixer.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C
+index 88dffa0..f4c63e8 100644
+--- a/mixer/src/Mixer_Strip.C
++++ b/mixer/src/Mixer_Strip.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Mixer strip control. Handles GUI and control I/O for this strip. */
+diff --git a/mixer/src/Mixer_Strip.H b/mixer/src/Mixer_Strip.H
+index ce7967a..c50f293 100644
+--- a/mixer/src/Mixer_Strip.H
++++ b/mixer/src/Mixer_Strip.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Module.C b/mixer/src/Module.C
+index ea712d3..b147750 100644
+--- a/mixer/src/Module.C
++++ b/mixer/src/Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Module.H"
+diff --git a/mixer/src/Module.H b/mixer/src/Module.H
+index 8eebc82..dc5931f 100644
+--- a/mixer/src/Module.H
++++ b/mixer/src/Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Module_Parameter_Editor.C b/mixer/src/Module_Parameter_Editor.C
+index fbd3e72..a2531ce 100644
+--- a/mixer/src/Module_Parameter_Editor.C
++++ b/mixer/src/Module_Parameter_Editor.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Module_Parameter_Editor.H b/mixer/src/Module_Parameter_Editor.H
+index ab3f2fb..e504e54 100644
+--- a/mixer/src/Module_Parameter_Editor.H
++++ b/mixer/src/Module_Parameter_Editor.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mono_Pan_Module.C b/mixer/src/Mono_Pan_Module.C
+index 9eac660..63be94e 100644
+--- a/mixer/src/Mono_Pan_Module.C
++++ b/mixer/src/Mono_Pan_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Mono_Pan_Module.H b/mixer/src/Mono_Pan_Module.H
+index 7ede987..474bdfb 100644
+--- a/mixer/src/Mono_Pan_Module.H
++++ b/mixer/src/Mono_Pan_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/NSM.C b/mixer/src/NSM.C
+index b1083f6..74b95d6 100644
+--- a/mixer/src/NSM.C
++++ b/mixer/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/NSM.H b/mixer/src/NSM.H
+index b289c00..315ce27 100644
+--- a/mixer/src/NSM.H
++++ b/mixer/src/NSM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Panner.C b/mixer/src/Panner.C
+index c48e852..3c4ff6a 100644
+--- a/mixer/src/Panner.C
++++ b/mixer/src/Panner.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Panner.H"
+diff --git a/mixer/src/Panner.H b/mixer/src/Panner.H
+index 8bb8e5e..42351eb 100644
+--- a/mixer/src/Panner.H
++++ b/mixer/src/Panner.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Plugin_Chooser.C b/mixer/src/Plugin_Chooser.C
+index ea50226..c25f8dd 100644
+--- a/mixer/src/Plugin_Chooser.C
++++ b/mixer/src/Plugin_Chooser.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Plugin_Chooser.H b/mixer/src/Plugin_Chooser.H
+index ce67564..46581af 100644
+--- a/mixer/src/Plugin_Chooser.H
++++ b/mixer/src/Plugin_Chooser.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Plugin_Module.C b/mixer/src/Plugin_Module.C
+index f281c39..2cfcf0a 100644
+--- a/mixer/src/Plugin_Module.C
++++ b/mixer/src/Plugin_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Filter module. Can host LADPSA Plugins, or can be inherited from to make internal
+diff --git a/mixer/src/Plugin_Module.H b/mixer/src/Plugin_Module.H
+index 7409e8d..557f230 100644
+--- a/mixer/src/Plugin_Module.H
++++ b/mixer/src/Plugin_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Project.C b/mixer/src/Project.C
+index 777704c..bf8f83f 100644
+--- a/mixer/src/Project.C
++++ b/mixer/src/Project.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Routings for opening/closing/creation of projects. All the actual
+diff --git a/mixer/src/Project.H b/mixer/src/Project.H
+index 42328dc..b5dc18a 100644
+--- a/mixer/src/Project.H
++++ b/mixer/src/Project.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char template_dir[] = "share/non-daw/templates";
+diff --git a/mixer/src/Spatialization_Console.C b/mixer/src/Spatialization_Console.C
+index e82527a..2345f81 100644
+--- a/mixer/src/Spatialization_Console.C
++++ b/mixer/src/Spatialization_Console.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Spatialization_Console.H b/mixer/src/Spatialization_Console.H
+index 5ca0274..bde5caf 100644
+--- a/mixer/src/Spatialization_Console.H
++++ b/mixer/src/Spatialization_Console.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Spatializer_Module.C b/mixer/src/Spatializer_Module.C
+index 5649053..1f0a06c 100644
+--- a/mixer/src/Spatializer_Module.C
++++ b/mixer/src/Spatializer_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/mixer/src/Spatializer_Module.H b/mixer/src/Spatializer_Module.H
+index 45a4699..5dd9ac4 100644
+--- a/mixer/src/Spatializer_Module.H
++++ b/mixer/src/Spatializer_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/SpectrumView.C b/mixer/src/SpectrumView.C
+index bfd5792..70f7bbc 100644
+--- a/mixer/src/SpectrumView.C
++++ b/mixer/src/SpectrumView.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "SpectrumView.H"
+diff --git a/mixer/src/SpectrumView.H b/mixer/src/SpectrumView.H
+index 21200a5..4a83f93 100644
+--- a/mixer/src/SpectrumView.H
++++ b/mixer/src/SpectrumView.H
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Box.H>
+diff --git a/mixer/src/const.h b/mixer/src/const.h
+index 1cccaee..f64913e 100644
+--- a/mixer/src/const.h
++++ b/mixer/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/main.C b/mixer/src/main.C
+index 4e56e02..7a738d7 100644
+--- a/mixer/src/main.C
++++ b/mixer/src/main.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/midi-mapper.C b/mixer/src/midi-mapper.C
+index bd2f31a..64e1bd6 100644
+--- a/mixer/src/midi-mapper.C
++++ b/mixer/src/midi-mapper.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <JACK/Client.H>
+diff --git a/nonlib/Block_Timer.H b/nonlib/Block_Timer.H
+index 006ce02..e7f306f 100644
+--- a/nonlib/Block_Timer.H
++++ b/nonlib/Block_Timer.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/JACK/Client.C b/nonlib/JACK/Client.C
+index 9cc1375..db9eee9 100644
+--- a/nonlib/JACK/Client.C
++++ b/nonlib/JACK/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Client.H"
+diff --git a/nonlib/JACK/Client.H b/nonlib/JACK/Client.H
+index cffadc6..98fa251 100644
+--- a/nonlib/JACK/Client.H
++++ b/nonlib/JACK/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/JACK/Port.C b/nonlib/JACK/Port.C
+index e60e6d5..aadf0b7 100644
+--- a/nonlib/JACK/Port.C
++++ b/nonlib/JACK/Port.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Wrapper for a JACK audio port */
+diff --git a/nonlib/JACK/Port.H b/nonlib/JACK/Port.H
+index 202f77f..c253b11 100644
+--- a/nonlib/JACK/Port.H
++++ b/nonlib/JACK/Port.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Log_Entry.C b/nonlib/Log_Entry.C
+index 5857e4e..dee89d7 100644
+--- a/nonlib/Log_Entry.C
++++ b/nonlib/Log_Entry.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Log_Entry.H"
+diff --git a/nonlib/Log_Entry.H b/nonlib/Log_Entry.H
+index a7b7c57..085049c 100644
+--- a/nonlib/Log_Entry.H
++++ b/nonlib/Log_Entry.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Loggable.C b/nonlib/Loggable.C
+index e89c7d7..02707c9 100644
+--- a/nonlib/Loggable.C
++++ b/nonlib/Loggable.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This class handles all journaling. All journaled objects must
+diff --git a/nonlib/Loggable.H b/nonlib/Loggable.H
+index 2b1242c..33349b7 100644
+--- a/nonlib/Loggable.H
++++ b/nonlib/Loggable.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/nonlib/MIDI/event.C b/nonlib/MIDI/event.C
+index 6e488f2..2d2eb6d 100644
+--- a/nonlib/MIDI/event.C
++++ b/nonlib/MIDI/event.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "event.H"
+diff --git a/nonlib/MIDI/event.H b/nonlib/MIDI/event.H
+index d45d059..014f080 100644
+--- a/nonlib/MIDI/event.H
++++ b/nonlib/MIDI/event.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Higher level event interface than midievent, supporting
+diff --git a/nonlib/MIDI/event_list.C b/nonlib/MIDI/event_list.C
+index ced374c..9af1cc4 100644
+--- a/nonlib/MIDI/event_list.C
++++ b/nonlib/MIDI/event_list.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/nonlib/MIDI/event_list.H b/nonlib/MIDI/event_list.H
+index 88c05c1..8a7d0d9 100644
+--- a/nonlib/MIDI/event_list.H
++++ b/nonlib/MIDI/event_list.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/MIDI/midievent.C b/nonlib/MIDI/midievent.C
+index a8d5716..0de3323 100644
+--- a/nonlib/MIDI/midievent.C
++++ b/nonlib/MIDI/midievent.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "midievent.H"
+diff --git a/nonlib/MIDI/midievent.H b/nonlib/MIDI/midievent.H
+index a4e203b..1fb02e2 100644
+--- a/nonlib/MIDI/midievent.H
++++ b/nonlib/MIDI/midievent.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* this class represents a single raw MIDI event plus a timestamp */
+diff --git a/nonlib/MIDI/types.h b/nonlib/MIDI/types.h
+index 192647f..ca89f0d 100644
+--- a/nonlib/MIDI/types.h
++++ b/nonlib/MIDI/types.h
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Mutex.H b/nonlib/Mutex.H
+index ba7d7fc..0ab5f65 100644
+--- a/nonlib/Mutex.H
++++ b/nonlib/Mutex.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/NSM/Client.C b/nonlib/NSM/Client.C
+index fae4b9c..0b91193 100644
+--- a/nonlib/NSM/Client.C
++++ b/nonlib/NSM/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../debug.h"
+diff --git a/nonlib/NSM/Client.H b/nonlib/NSM/Client.H
+index f417944..eedb40b 100644
+--- a/nonlib/NSM/Client.H
++++ b/nonlib/NSM/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/OSC/Endpoint.C b/nonlib/OSC/Endpoint.C
+index cb8c822..661cd39 100644
+--- a/nonlib/OSC/Endpoint.C
++++ b/nonlib/OSC/Endpoint.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <lo/lo.h>
+diff --git a/nonlib/OSC/Endpoint.H b/nonlib/OSC/Endpoint.H
+index 4e56960..53f376f 100644
+--- a/nonlib/OSC/Endpoint.H
++++ b/nonlib/OSC/Endpoint.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Thread.C b/nonlib/Thread.C
+index 6e5b953..e413ac1 100644
+--- a/nonlib/Thread.C
++++ b/nonlib/Thread.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Thread.H"
+diff --git a/nonlib/Thread.H b/nonlib/Thread.H
+index ad405ad..87a3f8d 100644
+--- a/nonlib/Thread.H
++++ b/nonlib/Thread.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/debug.C b/nonlib/debug.C
+index fe64e7e..080a501 100644
+--- a/nonlib/debug.C
++++ b/nonlib/debug.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/nonlib/debug.h b/nonlib/debug.h
+index d125246..fb43536 100644
+--- a/nonlib/debug.h
++++ b/nonlib/debug.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* debug.h
+diff --git a/nonlib/dsp.C b/nonlib/dsp.C
+index e77ae45..86dd231 100644
+--- a/nonlib/dsp.C
++++ b/nonlib/dsp.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* General DSP related functions. */
+diff --git a/nonlib/dsp.h b/nonlib/dsp.h
+index 20c684e..699a25c 100644
+--- a/nonlib/dsp.h
++++ b/nonlib/dsp.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/file.C b/nonlib/file.C
+index f52a481..f766b93 100644
+--- a/nonlib/file.C
++++ b/nonlib/file.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <fcntl.h>
+diff --git a/nonlib/file.h b/nonlib/file.h
+index a5de6e2..7eb34fd 100644
+--- a/nonlib/file.h
++++ b/nonlib/file.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdio.h>
+diff --git a/nonlib/string_util.C b/nonlib/string_util.C
+index e26b696..334ad3e 100644
+--- a/nonlib/string_util.C
++++ b/nonlib/string_util.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <string.h>
+diff --git a/nonlib/string_util.h b/nonlib/string_util.h
+index 1a43254..12ff155 100644
+--- a/nonlib/string_util.h
++++ b/nonlib/string_util.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ void unescape_url ( char *url );
+diff --git a/nonlib/types.h b/nonlib/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/nonlib/types.h
++++ b/nonlib/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/NSM.C b/sequencer/src/NSM.C
+index 8d4c26e..8785c1f 100644
+--- a/sequencer/src/NSM.C
++++ b/sequencer/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "NSM.H"
+diff --git a/sequencer/src/NSM.H b/sequencer/src/NSM.H
+index 0f787d8..7383971 100644
+--- a/sequencer/src/NSM.H
++++ b/sequencer/src/NSM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/NSM/Client.C b/sequencer/src/NSM/Client.C
+index fae4b9c..0b91193 100644
+--- a/sequencer/src/NSM/Client.C
++++ b/sequencer/src/NSM/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../debug.h"
+diff --git a/sequencer/src/NSM/Client.H b/sequencer/src/NSM/Client.H
+index f417944..eedb40b 100644
+--- a/sequencer/src/NSM/Client.H
++++ b/sequencer/src/NSM/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/canvas.C b/sequencer/src/canvas.C
+index ba3509a..8075c35 100644
+--- a/sequencer/src/canvas.C
++++ b/sequencer/src/canvas.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is a generic double-buffering, optimizing canvas interface to
+diff --git a/sequencer/src/canvas.H b/sequencer/src/canvas.H
+index b715f17..24a4a0e 100644
+--- a/sequencer/src/canvas.H
++++ b/sequencer/src/canvas.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/common.h b/sequencer/src/common.h
+index 7c179a8..dbdbfff 100644
+--- a/sequencer/src/common.h
++++ b/sequencer/src/common.h
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ // #pragma once
+diff --git a/sequencer/src/const.h b/sequencer/src/const.h
+index 0eeb0d6..5f592da 100644
+--- a/sequencer/src/const.h
++++ b/sequencer/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/debug.C b/sequencer/src/debug.C
+index 47e46fe..19c52de 100644
+--- a/sequencer/src/debug.C
++++ b/sequencer/src/debug.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/sequencer/src/debug.h b/sequencer/src/debug.h
+index 126d6fc..0ca41e6 100644
+--- a/sequencer/src/debug.h
++++ b/sequencer/src/debug.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* debug.h
+diff --git a/sequencer/src/grid.C b/sequencer/src/grid.C
+index 121f14b..7a3fc1c 100644
+--- a/sequencer/src/grid.C
++++ b/sequencer/src/grid.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "grid.H"
+diff --git a/sequencer/src/grid.H b/sequencer/src/grid.H
+index ca39d43..9bb3822 100644
+--- a/sequencer/src/grid.H
++++ b/sequencer/src/grid.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/gui/event_edit.fl b/sequencer/src/gui/event_edit.fl
+index d4c924b..c871502 100644
+--- a/sequencer/src/gui/event_edit.fl
++++ b/sequencer/src/gui/event_edit.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/sequencer/src/gui/ui.fl b/sequencer/src/gui/ui.fl
+index b46abc9..f727fb3 100644
+--- a/sequencer/src/gui/ui.fl
++++ b/sequencer/src/gui/ui.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/sequencer/src/instrument.C b/sequencer/src/instrument.C
+index ef14f24..3735569 100644
+--- a/sequencer/src/instrument.C
++++ b/sequencer/src/instrument.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/instrument.H b/sequencer/src/instrument.H
+index 350b644..5ec2cdb 100644
+--- a/sequencer/src/instrument.H
++++ b/sequencer/src/instrument.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/jack.C b/sequencer/src/jack.C
+index a42d241..49e2fc6 100644
+--- a/sequencer/src/jack.C
++++ b/sequencer/src/jack.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/main.C b/sequencer/src/main.C
+index a89cd96..c7a4378 100644
+--- a/sequencer/src/main.C
++++ b/sequencer/src/main.C
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software ; */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /**********************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/mapping.C b/sequencer/src/mapping.C
+index 47c9b8e..6caa221 100644
+--- a/sequencer/src/mapping.C
++++ b/sequencer/src/mapping.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "mapping.H"
+diff --git a/sequencer/src/mapping.H b/sequencer/src/mapping.H
+index e00cece..a937922 100644
+--- a/sequencer/src/mapping.H
++++ b/sequencer/src/mapping.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/non.H b/sequencer/src/non.H
+index 98453be..9941b80 100644
+--- a/sequencer/src/non.H
++++ b/sequencer/src/non.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/pattern.C b/sequencer/src/pattern.C
+index c21f7d9..30b3092 100644
+--- a/sequencer/src/pattern.C
++++ b/sequencer/src/pattern.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "pattern.H"
+diff --git a/sequencer/src/pattern.H b/sequencer/src/pattern.H
+index 3d2dab6..e317773 100644
+--- a/sequencer/src/pattern.H
++++ b/sequencer/src/pattern.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/phrase.C b/sequencer/src/phrase.C
+index 2d5ba68..072670d 100644
+--- a/sequencer/src/phrase.C
++++ b/sequencer/src/phrase.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "phrase.H"
+diff --git a/sequencer/src/phrase.H b/sequencer/src/phrase.H
+index 24cdd03..10b4858 100644
+--- a/sequencer/src/phrase.H
++++ b/sequencer/src/phrase.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/scale.C b/sequencer/src/scale.C
+index a14323b..43984e1 100644
+--- a/sequencer/src/scale.C
++++ b/sequencer/src/scale.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "scale.H"
+diff --git a/sequencer/src/scale.H b/sequencer/src/scale.H
+index 61f0ffb..e6f6a74 100644
+--- a/sequencer/src/scale.H
++++ b/sequencer/src/scale.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/sequence.C b/sequencer/src/sequence.C
+index c6a0c38..50bc264 100644
+--- a/sequencer/src/sequence.C
++++ b/sequencer/src/sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "sequence.H"
+diff --git a/sequencer/src/sequence.H b/sequencer/src/sequence.H
+index 321abd4..24925b5 100644
+--- a/sequencer/src/sequence.H
++++ b/sequencer/src/sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/smf.C b/sequencer/src/smf.C
+index 4ae2fb3..2aad8a4 100644
+--- a/sequencer/src/smf.C
++++ b/sequencer/src/smf.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "smf.H"
+diff --git a/sequencer/src/smf.H b/sequencer/src/smf.H
+index ad96db9..201b1da 100644
+--- a/sequencer/src/smf.H
++++ b/sequencer/src/smf.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/transport.C b/sequencer/src/transport.C
+index e00ab67..02ece07 100644
+--- a/sequencer/src/transport.C
++++ b/sequencer/src/transport.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <jack/jack.h>
+diff --git a/sequencer/src/transport.H b/sequencer/src/transport.H
+index 68d7584..70afb24 100644
+--- a/sequencer/src/transport.H
++++ b/sequencer/src/transport.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/session-manager/src/jackpatch.c b/session-manager/src/jackpatch.c
+index fdb11b3..dfc8141 100644
+--- a/session-manager/src/jackpatch.c
++++ b/session-manager/src/jackpatch.c
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* jackpatch.c
+diff --git a/session-manager/src/nsm-proxy-gui.C b/session-manager/src/nsm-proxy-gui.C
+index ef02972..97269e5 100644
+--- a/session-manager/src/nsm-proxy-gui.C
++++ b/session-manager/src/nsm-proxy-gui.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+diff --git a/session-manager/src/nsm-proxy.C b/session-manager/src/nsm-proxy.C
+index 981c798..d02ac3f 100644
+--- a/session-manager/src/nsm-proxy.C
++++ b/session-manager/src/nsm-proxy.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+diff --git a/session-manager/src/nsmd.C b/session-manager/src/nsmd.C
+index a4c04e1..a9c7f5d 100644
+--- a/session-manager/src/nsmd.C
++++ b/session-manager/src/nsmd.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #define __MODULE__ "nsmd"
+diff --git a/session-manager/src/send_osc.C b/session-manager/src/send_osc.C
+index 609ce70..2f126cc 100644
+--- a/session-manager/src/send_osc.C
++++ b/session-manager/src/send_osc.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ // #include <lo/lo.h>
+diff --git a/session-manager/src/session-manager.C b/session-manager/src/session-manager.C
+index e296b86..e3abf50 100644
+--- a/session-manager/src/session-manager.C
++++ b/session-manager/src/session-manager.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/bin/import-ardour-session b/timeline/bin/import-ardour-session
+index 7640386..0bce32a 100755
+--- a/timeline/bin/import-ardour-session
++++ b/timeline/bin/import-ardour-session
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ import xml.etree.ElementTree as et
+ import random
+diff --git a/timeline/bin/import-external-sources b/timeline/bin/import-external-sources
+index 34b39eb..5c8be16 100755
+--- a/timeline/bin/import-external-sources
++++ b/timeline/bin/import-external-sources
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ ## import-external-sources
+ #
+diff --git a/timeline/bin/remove-unused-sources b/timeline/bin/remove-unused-sources
+index 798a1c0..5b5c7c2 100755
+--- a/timeline/bin/remove-unused-sources
++++ b/timeline/bin/remove-unused-sources
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ ## remove-unused-sources
+ #
+diff --git a/timeline/src/Annotation_Point.H b/timeline/src/Annotation_Point.H
+index aaec594..2a0c9c4 100644
+--- a/timeline/src/Annotation_Point.H
++++ b/timeline/src/Annotation_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Annotation_Region.C b/timeline/src/Annotation_Region.C
+index 83c374c..0fbac2b 100644
+--- a/timeline/src/Annotation_Region.C
++++ b/timeline/src/Annotation_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Tooltip.H>
+diff --git a/timeline/src/Annotation_Region.H b/timeline/src/Annotation_Region.H
+index 9d56da7..bf36210 100644
+--- a/timeline/src/Annotation_Region.H
++++ b/timeline/src/Annotation_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Annotation_Sequence.H b/timeline/src/Annotation_Sequence.H
+index 8c4d117..0dbd136 100644
+--- a/timeline/src/Annotation_Sequence.H
++++ b/timeline/src/Annotation_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Audio_Region.C b/timeline/src/Audio_Region.C
+index 49f4bd9..481a23e 100644
+--- a/timeline/src/Audio_Region.C
++++ b/timeline/src/Audio_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Audio_Region.H b/timeline/src/Audio_Region.H
+index fb142d8..0b6b07a 100644
+--- a/timeline/src/Audio_Region.H
++++ b/timeline/src/Audio_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Audio_Sequence.C b/timeline/src/Audio_Sequence.C
+index f8dddd5..8f2880b 100644
+--- a/timeline/src/Audio_Sequence.C
++++ b/timeline/src/Audio_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* An Audio_Sequence is a sequence of Audio_Regions. Takes and 'track
+diff --git a/timeline/src/Audio_Sequence.H b/timeline/src/Audio_Sequence.H
+index 756144a..3ec154e 100644
+--- a/timeline/src/Audio_Sequence.H
++++ b/timeline/src/Audio_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Clock.H b/timeline/src/Clock.H
+index 948b4c9..7126a5b 100644
+--- a/timeline/src/Clock.H
++++ b/timeline/src/Clock.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Control_Point.C b/timeline/src/Control_Point.C
+index c13f413..2de0f36 100644
+--- a/timeline/src/Control_Point.C
++++ b/timeline/src/Control_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Control_Point.H b/timeline/src/Control_Point.H
+index 171be96..0d98d6f 100644
+--- a/timeline/src/Control_Point.H
++++ b/timeline/src/Control_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Control_Sequence.C b/timeline/src/Control_Sequence.C
+index 503052e..b588189 100644
+--- a/timeline/src/Control_Sequence.C
++++ b/timeline/src/Control_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/timeline/src/Control_Sequence.H b/timeline/src/Control_Sequence.H
+index 38e9822..df14766 100644
+--- a/timeline/src/Control_Sequence.H
++++ b/timeline/src/Control_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Cursor_Point.C b/timeline/src/Cursor_Point.C
+index e953b16..6985823 100644
+--- a/timeline/src/Cursor_Point.C
++++ b/timeline/src/Cursor_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Cursor_Point.H b/timeline/src/Cursor_Point.H
+index 0cd05b6..a730c8c 100644
+--- a/timeline/src/Cursor_Point.H
++++ b/timeline/src/Cursor_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Cursor_Region.C b/timeline/src/Cursor_Region.C
+index 3c1be5c..8ef6137 100644
+--- a/timeline/src/Cursor_Region.C
++++ b/timeline/src/Cursor_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Tooltip.H>
+diff --git a/timeline/src/Cursor_Region.H b/timeline/src/Cursor_Region.H
+index 3290867..ff0d90d 100644
+--- a/timeline/src/Cursor_Region.H
++++ b/timeline/src/Cursor_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Cursor_Sequence.C b/timeline/src/Cursor_Sequence.C
+index 2f683e9..fb26edd 100644
+--- a/timeline/src/Cursor_Sequence.C
++++ b/timeline/src/Cursor_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Cursor_Sequence.H"
+diff --git a/timeline/src/Cursor_Sequence.H b/timeline/src/Cursor_Sequence.H
+index 57fe5f7..3d5f105 100644
+--- a/timeline/src/Cursor_Sequence.H
++++ b/timeline/src/Cursor_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File.C b/timeline/src/Engine/Audio_File.C
+index 0d70346..591cb83 100644
+--- a/timeline/src/Engine/Audio_File.C
++++ b/timeline/src/Engine/Audio_File.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File.H"
+diff --git a/timeline/src/Engine/Audio_File.H b/timeline/src/Engine/Audio_File.H
+index baeedee..5e0c172 100644
+--- a/timeline/src/Engine/Audio_File.H
++++ b/timeline/src/Engine/Audio_File.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File_Dummy.C b/timeline/src/Engine/Audio_File_Dummy.C
+index b91ede9..9e5b907 100644
+--- a/timeline/src/Engine/Audio_File_Dummy.C
++++ b/timeline/src/Engine/Audio_File_Dummy.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File_Dummy.H"
+diff --git a/timeline/src/Engine/Audio_File_Dummy.H b/timeline/src/Engine/Audio_File_Dummy.H
+index 331e3f9..4fa2e7e 100644
+--- a/timeline/src/Engine/Audio_File_Dummy.H
++++ b/timeline/src/Engine/Audio_File_Dummy.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File_SF.C b/timeline/src/Engine/Audio_File_SF.C
+index a1ef61f..418ccf1 100644
+--- a/timeline/src/Engine/Audio_File_SF.C
++++ b/timeline/src/Engine/Audio_File_SF.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File_SF.H"
+diff --git a/timeline/src/Engine/Audio_File_SF.H b/timeline/src/Engine/Audio_File_SF.H
+index 8ab9a75..4fdf876 100644
+--- a/timeline/src/Engine/Audio_File_SF.H
++++ b/timeline/src/Engine/Audio_File_SF.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_Region.C b/timeline/src/Engine/Audio_Region.C
+index e96e215..a7e48a3 100644
+--- a/timeline/src/Engine/Audio_Region.C
++++ b/timeline/src/Engine/Audio_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /**********/
+diff --git a/timeline/src/Engine/Audio_Sequence.C b/timeline/src/Engine/Audio_Sequence.C
+index cda9eda..ccb0cf4 100644
+--- a/timeline/src/Engine/Audio_Sequence.C
++++ b/timeline/src/Engine/Audio_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Audio_Sequence.H"
+diff --git a/timeline/src/Engine/Control_Sequence.C b/timeline/src/Engine/Control_Sequence.C
+index f334e65..fde8c0c 100644
+--- a/timeline/src/Engine/Control_Sequence.C
++++ b/timeline/src/Engine/Control_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Control_Sequence.H"
+diff --git a/timeline/src/Engine/Disk_Stream.C b/timeline/src/Engine/Disk_Stream.C
+index 7268e67..3456fa2 100644
+--- a/timeline/src/Engine/Disk_Stream.C
++++ b/timeline/src/Engine/Disk_Stream.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Track.H"
+diff --git a/timeline/src/Engine/Disk_Stream.H b/timeline/src/Engine/Disk_Stream.H
+index 7c3541b..7e3f4f6 100644
+--- a/timeline/src/Engine/Disk_Stream.H
++++ b/timeline/src/Engine/Disk_Stream.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Engine.C b/timeline/src/Engine/Engine.C
+index 3f7c84a..53529bd 100644
+--- a/timeline/src/Engine/Engine.C
++++ b/timeline/src/Engine/Engine.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Engine.H"
+diff --git a/timeline/src/Engine/Engine.H b/timeline/src/Engine/Engine.H
+index cf1d426..2f36973 100644
+--- a/timeline/src/Engine/Engine.H
++++ b/timeline/src/Engine/Engine.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Peak.H b/timeline/src/Engine/Peak.H
+index 8ee1529..d6ae610 100644
+--- a/timeline/src/Engine/Peak.H
++++ b/timeline/src/Engine/Peak.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Peaks.C b/timeline/src/Engine/Peaks.C
+index 0fa4dd9..5520c17 100644
+--- a/timeline/src/Engine/Peaks.C
++++ b/timeline/src/Engine/Peaks.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Engine/Peaks.H b/timeline/src/Engine/Peaks.H
+index c8d7612..5e43a12 100644
+--- a/timeline/src/Engine/Peaks.H
++++ b/timeline/src/Engine/Peaks.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Playback_DS.C b/timeline/src/Engine/Playback_DS.C
+index e5cf15d..3437c2c 100644
+--- a/timeline/src/Engine/Playback_DS.C
++++ b/timeline/src/Engine/Playback_DS.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Engine/Playback_DS.H b/timeline/src/Engine/Playback_DS.H
+index 128a745..6ef6caf 100644
+--- a/timeline/src/Engine/Playback_DS.H
++++ b/timeline/src/Engine/Playback_DS.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Disk_Stream.H"
+diff --git a/timeline/src/Engine/Record_DS.C b/timeline/src/Engine/Record_DS.C
+index 312ce74..09ae3e4 100644
+--- a/timeline/src/Engine/Record_DS.C
++++ b/timeline/src/Engine/Record_DS.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Handles streaming from track inputs to disk */
+diff --git a/timeline/src/Engine/Record_DS.H b/timeline/src/Engine/Record_DS.H
+index 054bbc6..8e1d08a 100644
+--- a/timeline/src/Engine/Record_DS.H
++++ b/timeline/src/Engine/Record_DS.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Timeline.C b/timeline/src/Engine/Timeline.C
+index 9bcfa0f..e33cbf7 100644
+--- a/timeline/src/Engine/Timeline.C
++++ b/timeline/src/Engine/Timeline.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Timeline.H"
+diff --git a/timeline/src/Engine/Track.C b/timeline/src/Engine/Track.C
+index 4bfdb5f..de385fd 100644
+--- a/timeline/src/Engine/Track.C
++++ b/timeline/src/Engine/Track.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Track.H"
+diff --git a/timeline/src/Engine/const.h b/timeline/src/Engine/const.h
+index 623ca48..96077d9 100644
+--- a/timeline/src/Engine/const.h
++++ b/timeline/src/Engine/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #define __MODULE__ "non-timeline:engine"
+diff --git a/timeline/src/Engine/types.h b/timeline/src/Engine/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/timeline/src/Engine/types.h
++++ b/timeline/src/Engine/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/NSM.C b/timeline/src/NSM.C
+index 28c702f..e71cdd7 100644
+--- a/timeline/src/NSM.C
++++ b/timeline/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/timeline/src/OSC_Thread.C b/timeline/src/OSC_Thread.C
+index 70fe6fe..edb0e49 100644
+--- a/timeline/src/OSC_Thread.C
++++ b/timeline/src/OSC_Thread.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "OSC_Thread.H"
+diff --git a/timeline/src/OSC_Thread.H b/timeline/src/OSC_Thread.H
+index d678028..f289933 100644
+--- a/timeline/src/OSC_Thread.H
++++ b/timeline/src/OSC_Thread.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Project.C b/timeline/src/Project.C
+index f92375f..bac1f1c 100644
+--- a/timeline/src/Project.C
++++ b/timeline/src/Project.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Routings for opening/closing/creation of projects. All the actual
+diff --git a/timeline/src/Project.H b/timeline/src/Project.H
+index a1a67a4..039af54 100644
+--- a/timeline/src/Project.H
++++ b/timeline/src/Project.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char template_dir[] = "share/non-daw/templates";
+diff --git a/timeline/src/RWLock.H b/timeline/src/RWLock.H
+index b21d945..c623942 100644
+--- a/timeline/src/RWLock.H
++++ b/timeline/src/RWLock.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Sequence.C b/timeline/src/Sequence.C
+index 9fd9a07..849cbcd 100644
+--- a/timeline/src/Sequence.C
++++ b/timeline/src/Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence.H"
+diff --git a/timeline/src/Sequence.H b/timeline/src/Sequence.H
+index c07b4f9..8167ec3 100644
+--- a/timeline/src/Sequence.H
++++ b/timeline/src/Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Sequence_Point.C b/timeline/src/Sequence_Point.C
+index afb8377..af8d5f4 100644
+--- a/timeline/src/Sequence_Point.C
++++ b/timeline/src/Sequence_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence_Point.H"
+diff --git a/timeline/src/Sequence_Point.H b/timeline/src/Sequence_Point.H
+index af64b46..618112a 100644
+--- a/timeline/src/Sequence_Point.H
++++ b/timeline/src/Sequence_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Sequence_Region.C b/timeline/src/Sequence_Region.C
+index c119467..6a0a8ed 100644
+--- a/timeline/src/Sequence_Region.C
++++ b/timeline/src/Sequence_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence_Region.H"
+diff --git a/timeline/src/Sequence_Region.H b/timeline/src/Sequence_Region.H
+index 8be8b81..c9ce7e9 100644
+--- a/timeline/src/Sequence_Region.H
++++ b/timeline/src/Sequence_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Sequence_Widget.C b/timeline/src/Sequence_Widget.C
+index ea9a858..554fa5c 100644
+--- a/timeline/src/Sequence_Widget.C
++++ b/timeline/src/Sequence_Widget.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Sequence_Widget.H b/timeline/src/Sequence_Widget.H
+index 210f72b..4029a1e 100644
+--- a/timeline/src/Sequence_Widget.H
++++ b/timeline/src/Sequence_Widget.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/TLE.fl b/timeline/src/TLE.fl
+index e54de7f..51450e8 100644
+--- a/timeline/src/TLE.fl
++++ b/timeline/src/TLE.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/timeline/src/Tempo_Point.C b/timeline/src/Tempo_Point.C
+index 5848ffc..563b340 100644
+--- a/timeline/src/Tempo_Point.C
++++ b/timeline/src/Tempo_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Tempo_Point.H"
+diff --git a/timeline/src/Tempo_Point.H b/timeline/src/Tempo_Point.H
+index 8dd88d0..f1ebdfb 100644
+--- a/timeline/src/Tempo_Point.H
++++ b/timeline/src/Tempo_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Tempo_Sequence.C b/timeline/src/Tempo_Sequence.C
+index 50c16b3..ccbfbe3 100644
+--- a/timeline/src/Tempo_Sequence.C
++++ b/timeline/src/Tempo_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Tempo_Sequence.H"
+diff --git a/timeline/src/Tempo_Sequence.H b/timeline/src/Tempo_Sequence.H
+index 61f6498..b6cbcbc 100644
+--- a/timeline/src/Tempo_Sequence.H
++++ b/timeline/src/Tempo_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Time_Point.C b/timeline/src/Time_Point.C
+index 002c38c..6dfae5d 100644
+--- a/timeline/src/Time_Point.C
++++ b/timeline/src/Time_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Time_Point.H"
+diff --git a/timeline/src/Time_Point.H b/timeline/src/Time_Point.H
+index 79665aa..bd98f55 100644
+--- a/timeline/src/Time_Point.H
++++ b/timeline/src/Time_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Time_Sequence.C b/timeline/src/Time_Sequence.C
+index f877b8a..389c6ef 100644
+--- a/timeline/src/Time_Sequence.C
++++ b/timeline/src/Time_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Time_Sequence.H"
+diff --git a/timeline/src/Time_Sequence.H b/timeline/src/Time_Sequence.H
+index 4e71a71..ffa5c52 100644
+--- a/timeline/src/Time_Sequence.H
++++ b/timeline/src/Time_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Timeline.C b/timeline/src/Timeline.C
+index ccde2a1..d16cb1b 100644
+--- a/timeline/src/Timeline.C
++++ b/timeline/src/Timeline.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is the Timeline widget, which contains all the tracks and
+diff --git a/timeline/src/Timeline.H b/timeline/src/Timeline.H
+index 022c3af..8d75a2a 100644
+--- a/timeline/src/Timeline.H
++++ b/timeline/src/Timeline.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Track.C b/timeline/src/Track.C
+index 0e0ecf6..d3e215e 100644
+--- a/timeline/src/Track.C
++++ b/timeline/src/Track.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* A Track is a container for various sequences; the sequence, the
+diff --git a/timeline/src/Track.H b/timeline/src/Track.H
+index b2e0134..47f82cf 100644
+--- a/timeline/src/Track.H
++++ b/timeline/src/Track.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Transport.C b/timeline/src/Transport.C
+index 27df7fd..62bba1e 100644
+--- a/timeline/src/Transport.C
++++ b/timeline/src/Transport.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Controls the audio transport */
+diff --git a/timeline/src/Transport.H b/timeline/src/Transport.H
+index 8323222..b2c412c 100644
+--- a/timeline/src/Transport.H
++++ b/timeline/src/Transport.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Waveform.C b/timeline/src/Waveform.C
+index a6bb8b9..fb48b04 100644
+--- a/timeline/src/Waveform.C
++++ b/timeline/src/Waveform.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* routines to draw a waveform from peak data */
+diff --git a/timeline/src/Waveform.H b/timeline/src/Waveform.H
+index eed7747..57407aa 100644
+--- a/timeline/src/Waveform.H
++++ b/timeline/src/Waveform.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/const.h b/timeline/src/const.h
+index 385b0ce..5a7e772 100644
+--- a/timeline/src/const.h
++++ b/timeline/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ extern const char *APP_NAME;
+diff --git a/timeline/src/main.C b/timeline/src/main.C
+index a341240..5010902 100644
+--- a/timeline/src/main.C
++++ b/timeline/src/main.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/timeline/src/types.h b/timeline/src/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/timeline/src/types.h
++++ b/timeline/src/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+--
+2.26.0.rc2
+
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
deleted file mode 100644
index 4f79787..0000000
--- a/non-daw-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
---- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
-+++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Non DAW
- Comment=Modular Digital Audio Workstation - Timeline Editor
--Exec=@BIN_PATH@/non-daw
-+Exec=non-daw
- Terminal=false
- Type=Application
- Icon=non-daw
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
index cc8a77b..e1fcdc6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,22 +1,22 @@
+%global commit0 bbe8386499621c8e60eebb06d80e966f13a69a95
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global commitdate 20200307
+
Name: non-daw
Version: 1.2.0
-Release: 18.git16885e69%{?dist}
+Release: 19.%{commitdate}git%{shortcommit0}%{?dist}
Summary: A digital audio workstation for JACK
-License: GPLv2+
-URL: http://non.tuxfamily.org/
-Source0: non-20160405-git16885e69.tar.bz2
-# sh non-snapshot.sh (rev>
-Source1: non-snapshot.sh
+License: GPLv2+ and ISC
+URL: https://non.tuxfamily.org/
+Source0: https://git.tuxfamily.org/non/non.git/snapshot/non-%{commit0}.tar.gz
# notified upstream of the following along with incorrect FSF address headers
-Patch1: non-daw-desktop.patch
-# rhbz 1317283
-Patch2: add-lib64-in-ladspa-search-path.patch
+Patch0: add-lib64-in-ladspa-search-path.patch
+Patch1: fix-fsf-address.patch
+# build optimization should be avoided in Fedora as Fedora has its own optimizations
+Patch2: remove-optimization-flags.patch
-BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
-BuildRequires: fltk-devel
-BuildRequires: fltk-fluid
BuildRequires: imake
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
@@ -28,42 +28,82 @@ BuildRequires: libvorbis-devel
BuildRequires: libXpm-devel
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
-BuildRequires: python2
+BuildRequires: python3
+BuildRequires: gcc-c++
+BuildRequires: %{_bindir}/pathfix.py
+BuildRequires: %{_bindir}/find
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description
Non-daw is a digital audio workstation for JACK
%package -n non-mixer
Summary: A digital audio mixer for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-mixer
non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+%package -n non-mixer-doc
+Summary: A digital audio mixer for JACK - Documentation
+
+%description -n non-mixer-doc
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+This package contains the documentation.
+
%package -n non-session-manager
Summary: A session manager for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
application state including JACK and MIDI connections between audio sessions.
+%package -n non-session-manager-doc
+Summary: A session manager for JACK - Documentation
+
+%description -n non-session-manager-doc
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+This package contains the documentation.
+
%package -n non-sequencer
Summary: A MIDI sequencer for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-sequencer
non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
+%package -n non-sequencer-doc
+Summary: A MIDI sequencer for JACK - Documentation
+
+%description -n non-sequencer-doc
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
%prep
-%setup -q -n non-20160405
+%setup -q -n non-%{commit0}
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
+rm -rf lib
+pathfix.py -pni %{_bindir}/python3 waf $(find -name wscript)
%build
+%set_build_flags
+CXXFLAGS+=" -std=c++11"
+./waf configure --prefix=%{_prefix} --libdir=%{_libdir} \
%ifarch %{ix86} x86_64
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+
%else
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+--disable-sse
%endif
-./waf %{_smp_mflags} -v
+./waf build -v %{?_smp_mflags}
%install
./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
@@ -71,11 +111,15 @@ for i in %{buildroot}%{_datadir}/applications/*.desktop; do
sed -i -e 's|\/usr\/bin\/||' $i
desktop-file-validate $i;
done;
+# correct locations
+mv %{buildroot}%{_bindir}/bin/* %{buildrootdir}{_bindir}
# correct permissions
chmod 755 %{buildroot}%{_bindir}/*
+#NOTE: No manpages, all documentation is at http://non.tuxfamily.org/wiki/Documentation
+
%files
-%doc COPYING
+%license COPYING
%{_bindir}/import*
%{_bindir}/%{name}
%{_bindir}/non-timeline
@@ -85,40 +129,46 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-timeline
%files -n non-mixer
+%license COPYING
%{_bindir}/non-mixer
%{_bindir}/non-mixer-noui
%{_bindir}/non-midi-mapper
-%{_docdir}/non-mixer
%{_datadir}/applications/non-mixer.desktop
%{_datadir}/icons/hicolor/*/apps/non-mixer*
%{_datadir}/pixmaps/non-mixer
+%files -n non-mixer-doc
+%license COPYING
+%{_docdir}/non-mixer
+
%files -n non-session-manager
+%license COPYING
%{_bindir}/nsm*
%{_bindir}/jackpatch
%{_bindir}/non-session-manager
-%{_docdir}/non-session-manager
%{_datadir}/applications/non-session-manager.desktop
%{_datadir}/icons/hicolor/*/apps/non-session-manager*
%{_datadir}/pixmaps/non-session-manager
+%files -n non-session-manager-doc
+%license COPYING
+%{_docdir}/non-session-manager
+
%files -n non-sequencer
+%license COPYING
%{_bindir}/non-sequencer
-%{_docdir}/non-sequencer
%{_datadir}/non-sequencer
%{_datadir}/applications/non-sequencer.desktop
%{_datadir}/icons/hicolor/*/apps/non-sequencer*
%{_datadir}/pixmaps/non-sequencer
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%files -n non-sequencer-doc
+%license COPYING
+%{_docdir}/non-sequencer
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+%changelog
+* Sun Mar 08 2020 Erich Eickmeyer <erich(a)ericheickmeyer.com> - 1.2.0-19.20200307gitbbe83864
+- New git sync, built with waf built with python3
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/non-snapshot.sh b/non-snapshot.sh
deleted file mode 100644
index bc82db5..0000000
--- a/non-snapshot.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $1 - revision number to checkout.
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
- or fetch the latest revision by: `basename $0` HEAD"}
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-name=non
-version=20160405
-
-pushd "$tmp" >/dev/null
-echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
-ls
-pushd $name-$version
-git reset --hard $1
-rm -rf .git
-popd
-echo "Fetched git revision: $1"
-rm -f $name.stdout
-
-tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
-echo "Written: $name-$version-git$1.tar.bz2"
-popd >/dev/null
diff --git a/remove-optimization-flags.patch b/remove-optimization-flags.patch
new file mode 100644
index 0000000..ead7b64
--- /dev/null
+++ b/remove-optimization-flags.patch
@@ -0,0 +1,29 @@
+From d26ce26213e3ec1f3f2662d3f477c38ba92191a4 Mon Sep 17 00:00:00 2001
+Message-Id: <d26ce26213e3ec1f3f2662d3f477c38ba92191a4.1584830098.git.erich(a)ericheickmeyer.com>
+From: Erich Eickmeyer <erich(a)ericheickmeyer.com>
+Date: Sat, 21 Mar 2020 15:34:51 -0700
+Subject: [PATCH] remove-optimization-flags
+
+---
+ wscript | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index 7dd9857..9143ef6 100644
+--- a/wscript
++++ b/wscript
+@@ -89,10 +89,7 @@ def configure(conf):
+ conf.recurse(i)
+
+ optimization_flags = [
+- "-O3",
+- "-fomit-frame-pointer",
+- "-ffast-math",
+- "-pipe"
++ ""
+ ]
+
+ if Options.options.sse:
+--
+2.26.0.rc2
+
diff --git a/sources b/sources
index edd578e..c379e77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
+SHA512 (non-bbe8386499621c8e60eebb06d80e966f13a69a95.tar.gz) = 1a667b0648df37c6e04f9eefbeff2c2c73e5f6988965aa0bbda0b57e2a47cbd89a02e98acdcef9f3d98749144b5627c751d8f14952d14e37431c59823f0a2f0a
commit 06b3bccd5af7d333fb34e979f6178554bf156016
Author: Mohan Boddu <mboddu(a)bhujji.com>
Date: Thu Mar 26 12:57:42 2020 -0400
Revert "non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549"
Unretirement for https://pagure.io/releng/issue/9355
This reverts commit 4f5ca32ff1b65fd97747737d0f93c4ee5011231f.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b36417
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
+/non-daw-20131026-git13c3ca8.tar.bz2
+/non-20160405-git16885e69.tar.bz2
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
new file mode 100644
index 0000000..5bc905f
--- /dev/null
+++ b/add-lib64-in-ladspa-search-path.patch
@@ -0,0 +1,25 @@
+From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
+From: Yann Collette <ycollette.nospam(a)free.fr>
+Date: Sun, 13 Mar 2016 19:14:08 +0100
+Subject: [PATCH] add lib64 in ladspa search path
+
+---
+ mixer/src/LADSPAInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..150916e 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
+ cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
+ cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
+
+- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
++ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
+ }
+ }
+
+--
+2.5.0
+
diff --git a/dead.package b/dead.package
deleted file mode 100644
index b2e703b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
new file mode 100644
index 0000000..4f79787
--- /dev/null
+++ b/non-daw-desktop.patch
@@ -0,0 +1,14 @@
+diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
+--- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
++++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Non DAW
+ Comment=Modular Digital Audio Workstation - Timeline Editor
+-Exec=@BIN_PATH@/non-daw
++Exec=non-daw
+ Terminal=false
+ Type=Application
+ Icon=non-daw
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
new file mode 100644
index 0000000..cc8a77b
--- /dev/null
+++ b/non-daw.spec
@@ -0,0 +1,184 @@
+Name: non-daw
+Version: 1.2.0
+Release: 18.git16885e69%{?dist}
+Summary: A digital audio workstation for JACK
+
+License: GPLv2+
+URL: http://non.tuxfamily.org/
+Source0: non-20160405-git16885e69.tar.bz2
+# sh non-snapshot.sh (rev>
+Source1: non-snapshot.sh
+# notified upstream of the following along with incorrect FSF address headers
+Patch1: non-daw-desktop.patch
+# rhbz 1317283
+Patch2: add-lib64-in-ladspa-search-path.patch
+
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fltk-devel
+BuildRequires: fltk-fluid
+BuildRequires: imake
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
+BuildRequires: liblrdf-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXpm-devel
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
+BuildRequires: python2
+
+%description
+Non-daw is a digital audio workstation for JACK
+
+%package -n non-mixer
+Summary: A digital audio mixer for JACK
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary: A session manager for JACK
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary: A MIDI sequencer for JACK
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
+%prep
+%setup -q -n non-20160405
+%patch2 -p1
+
+%build
+%ifarch %{ix86} x86_64
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+%else
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+%endif
+./waf %{_smp_mflags} -v
+
+%install
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+ sed -i -e 's|\/usr\/bin\/||' $i
+ desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
+
+%files
+%doc COPYING
+%{_bindir}/import*
+%{_bindir}/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/jackpatch
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
+
+%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
+- Remove obsolete scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
+- Added BR: python2
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
+- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
+- Enable vorbis support
+- Put jackpatch in right sub package (rhbz 1336224)
+- Fix ladspa plugins search path (rhbz 1317283)
+
+* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
+- Fix up Release so upgrade path works correctly
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
+- rebuild (fltk)
+- non-session-manager: omit non-sensical Obsoletes
+- fix Release: tag
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
+* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
+- Unversioned doc dir changes
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
+- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
new file mode 100644
index 0000000..bc82db5
--- /dev/null
+++ b/non-snapshot.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+ or fetch the latest revision by: `basename $0` HEAD"}
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+name=non
+version=20160405
+
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
+ls
+pushd $name-$version
+git reset --hard $1
+rm -rf .git
+popd
+echo "Fetched git revision: $1"
+rm -f $name.stdout
+
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
+popd >/dev/null
diff --git a/sources b/sources
new file mode 100644
index 0000000..edd578e
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 4f5ca32ff1b65fd97747737d0f93c4ee5011231f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:13:19 2019 +0000
non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5b36417..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/non-daw-20121013-git61addce.tar.bz2
-/non-daw-20130902-git9fba8a8.tar.bz2
-/non-daw-20131026-git13c3ca8.tar.bz2
-/non-20160405-git16885e69.tar.bz2
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
deleted file mode 100644
index 5bc905f..0000000
--- a/add-lib64-in-ladspa-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
-From: Yann Collette <ycollette.nospam(a)free.fr>
-Date: Sun, 13 Mar 2016 19:14:08 +0100
-Subject: [PATCH] add lib64 in ladspa search path
-
----
- mixer/src/LADSPAInfo.C | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
-index 8fc611e..150916e 100644
---- a/mixer/src/LADSPAInfo.C
-+++ b/mixer/src/LADSPAInfo.C
-@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
- cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
- cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
-
-- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
-+ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
- }
- }
-
---
-2.5.0
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..b2e703b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
deleted file mode 100644
index 4f79787..0000000
--- a/non-daw-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
---- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
-+++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Non DAW
- Comment=Modular Digital Audio Workstation - Timeline Editor
--Exec=@BIN_PATH@/non-daw
-+Exec=non-daw
- Terminal=false
- Type=Application
- Icon=non-daw
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
deleted file mode 100644
index cc8a77b..0000000
--- a/non-daw.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-Name: non-daw
-Version: 1.2.0
-Release: 18.git16885e69%{?dist}
-Summary: A digital audio workstation for JACK
-
-License: GPLv2+
-URL: http://non.tuxfamily.org/
-Source0: non-20160405-git16885e69.tar.bz2
-# sh non-snapshot.sh (rev>
-Source1: non-snapshot.sh
-# notified upstream of the following along with incorrect FSF address headers
-Patch1: non-daw-desktop.patch
-# rhbz 1317283
-Patch2: add-lib64-in-ladspa-search-path.patch
-
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-BuildRequires: fltk-devel
-BuildRequires: fltk-fluid
-BuildRequires: imake
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: ladspa-devel
-BuildRequires: liblo-devel
-BuildRequires: liblrdf-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXpm-devel
-BuildRequires: non-ntk-devel
-BuildRequires: non-ntk-fluid
-BuildRequires: python2
-
-%description
-Non-daw is a digital audio workstation for JACK
-
-%package -n non-mixer
-Summary: A digital audio mixer for JACK
-
-%description -n non-mixer
-non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
-
-%package -n non-session-manager
-Summary: A session manager for JACK
-
-%description -n non-session-manager
-non-session-manager is an audio project session manager. It preserves
-application state including JACK and MIDI connections between audio sessions.
-
-%package -n non-sequencer
-Summary: A MIDI sequencer for JACK
-
-%description -n non-sequencer
-non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
-sequencer
-
-%prep
-%setup -q -n non-20160405
-%patch2 -p1
-
-%build
-%ifarch %{ix86} x86_64
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
-%else
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
-%endif
-./waf %{_smp_mflags} -v
-
-%install
-./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
-for i in %{buildroot}%{_datadir}/applications/*.desktop; do
- sed -i -e 's|\/usr\/bin\/||' $i
- desktop-file-validate $i;
-done;
-# correct permissions
-chmod 755 %{buildroot}%{_bindir}/*
-
-%files
-%doc COPYING
-%{_bindir}/import*
-%{_bindir}/%{name}
-%{_bindir}/non-timeline
-%{_docdir}/non-timeline
-%{_datadir}/applications/non-timeline.desktop
-%{_datadir}/icons/hicolor/*/apps/non-timeline*
-%{_datadir}/pixmaps/non-timeline
-
-%files -n non-mixer
-%{_bindir}/non-mixer
-%{_bindir}/non-mixer-noui
-%{_bindir}/non-midi-mapper
-%{_docdir}/non-mixer
-%{_datadir}/applications/non-mixer.desktop
-%{_datadir}/icons/hicolor/*/apps/non-mixer*
-%{_datadir}/pixmaps/non-mixer
-
-%files -n non-session-manager
-%{_bindir}/nsm*
-%{_bindir}/jackpatch
-%{_bindir}/non-session-manager
-%{_docdir}/non-session-manager
-%{_datadir}/applications/non-session-manager.desktop
-%{_datadir}/icons/hicolor/*/apps/non-session-manager*
-%{_datadir}/pixmaps/non-session-manager
-
-%files -n non-sequencer
-%{_bindir}/non-sequencer
-%{_docdir}/non-sequencer
-%{_datadir}/non-sequencer
-%{_datadir}/applications/non-sequencer.desktop
-%{_datadir}/icons/hicolor/*/apps/non-sequencer*
-%{_datadir}/pixmaps/non-sequencer
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
-- Remove obsolete scriptlets
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
-- Added BR: python2
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
-- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
-- Enable vorbis support
-- Put jackpatch in right sub package (rhbz 1336224)
-- Fix ladspa plugins search path (rhbz 1317283)
-
-* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
-- Fix up Release so upgrade path works correctly
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
-- rebuild (fltk)
-- non-session-manager: omit non-sensical Obsoletes
-- fix Release: tag
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
-- New source, adding additional sub packages, non-mixer
-- obsoletes non-session-manager, non-sequencer
-
-* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
-- Unversioned doc dir changes
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
-- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
deleted file mode 100644
index bc82db5..0000000
--- a/non-snapshot.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $1 - revision number to checkout.
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
- or fetch the latest revision by: `basename $0` HEAD"}
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-name=non
-version=20160405
-
-pushd "$tmp" >/dev/null
-echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
-ls
-pushd $name-$version
-git reset --hard $1
-rm -rf .git
-popd
-echo "Fetched git revision: $1"
-rm -f $name.stdout
-
-tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
-echo "Written: $name-$version-git$1.tar.bz2"
-popd >/dev/null
diff --git a/sources b/sources
deleted file mode 100644
index edd578e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 531a1f8e8db4351b6fb73a5bf4db91c33be52d0f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 22:30:55 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 3409948..cc8a77b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 17.git16885e69%{?dist}
+Release: 18.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
License: GPLv2+
@@ -111,6 +111,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 0895151eaf13d3ab3a055dc023595839012630f2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 16:27:51 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 1bdbcd3..3409948 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 16.git16885e69%{?dist}
+Release: 17.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
License: GPLv2+
@@ -111,6 +111,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 24526ee961be1d8962195dbf73239ce66d2eb194
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:58 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/non-daw.spec b/non-daw.spec
index 29b970c..1bdbcd3 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -3,7 +3,6 @@ Version: 1.2.0
Release: 16.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
-Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
Source0: non-20160405-git16885e69.tar.bz2
@@ -36,14 +35,12 @@ Non-daw is a digital audio workstation for JACK
%package -n non-mixer
Summary: A digital audio mixer for JACK
-Group: Applications/Multimedia
%description -n non-mixer
non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
-Group: Applications/Multimedia
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -51,7 +48,6 @@ application state including JACK and MIDI connections between audio sessions.
%package -n non-sequencer
Summary: A MIDI sequencer for JACK
-Group: Applications/Multimedia
%description -n non-sequencer
non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
commit 3a3d787272c75e3d9f5b5d2769c879a09886eb3a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sat Jul 28 16:00:55 2018 +0200
BR: gcc-c++
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 30e3bd6..29b970c 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -14,6 +14,7 @@ Patch1: non-daw-desktop.patch
# rhbz 1317283
Patch2: add-lib64-in-ladspa-search-path.patch
+BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fltk-devel
BuildRequires: fltk-fluid
commit b3e39528336fbaa369c7d2404834c63e82901bc8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 14:27:33 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index ce043d0..30e3bd6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 15.git16885e69%{?dist}
+Release: 16.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -114,6 +114,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit adcb953fc9088cde687da829b19dc4d6c600dc0f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 8 08:22:01 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 93fc46e..ce043d0 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 14.git16885e69%{?dist}
+Release: 15.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -114,6 +114,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
- Remove obsolete scriptlets
commit 14eb76d0601f985248667284d92f624d8c8c9b3d
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Thu Jan 18 20:58:20 2018 +0100
Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index b18b3ae..93fc46e 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 13.git16885e69%{?dist}
+Release: 14.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -77,20 +77,6 @@ done;
# correct permissions
chmod 755 %{buildroot}%{_bindir}/*
-%post
-update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-update-desktop-database -q
-if [ $1 -eq 0 ]; then
- touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc COPYING
%{_bindir}/import*
@@ -128,6 +114,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
+- Remove obsolete scriptlets
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 1b9e61c6156ea8d2fc79ee0186eabc1d24bccc3a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 04:03:53 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 8aae1dc..b18b3ae 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 12.git16885e69%{?dist}
+Release: 13.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -128,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 9da99cada93a65b9f89b5ba6d299bd75defdac2c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 01:14:41 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 70fb40d..8aae1dc 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 11.git16885e69%{?dist}
+Release: 12.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -128,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
- Added BR: python2
commit 2e59ec087867e0eecd280d3e2d9121ade87d79e6
Author: Orcan Ogetbil <orcan(a)localhost.localdomain>
Date: Fri Feb 17 00:18:37 2017 -0500
Added BR: python2
diff --git a/non-daw.spec b/non-daw.spec
index 610f6c9..70fb40d 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 10.git16885e69%{?dist}
+Release: 11.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -28,6 +28,7 @@ BuildRequires: libvorbis-devel
BuildRequires: libXpm-devel
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
+BuildRequires: python2
%description
Non-daw is a digital audio workstation for JACK
@@ -127,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
+- Added BR: python2
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit ed4ad26a3b24ae82fbab6ef92ebc726ba1cf0bd8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 00:18:27 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 2fdf443..610f6c9 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 9.git16885e69%{?dist}
+Release: 10.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -127,6 +127,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
- Enable vorbis support
commit 47007462be1d6508c5f156ae5b24039c53c105b0
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sat Aug 20 14:24:23 2016 +0100
Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others), Enable vorbis support, Put jackpatch in right sub package (rhbz 1336224), Fix ladspa plugins search path (rhbz 1317283)
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
new file mode 100644
index 0000000..5bc905f
--- /dev/null
+++ b/add-lib64-in-ladspa-search-path.patch
@@ -0,0 +1,25 @@
+From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
+From: Yann Collette <ycollette.nospam(a)free.fr>
+Date: Sun, 13 Mar 2016 19:14:08 +0100
+Subject: [PATCH] add lib64 in ladspa search path
+
+---
+ mixer/src/LADSPAInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..150916e 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
+ cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
+ cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
+
+- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
++ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
+ }
+ }
+
+--
+2.5.0
+
diff --git a/non-daw.spec b/non-daw.spec
index d0053db..2fdf443 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 8.git16885e69%{?dist}
+Release: 9.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -11,22 +11,23 @@ Source0: non-20160405-git16885e69.tar.bz2
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
-# missing ladspa dependencies (temporarily)
-ExcludeArch: %{arm}
+# rhbz 1317283
+Patch2: add-lib64-in-ladspa-search-path.patch
-BuildRequires: non-ntk-devel
-BuildRequires: non-ntk-fluid
-BuildRequires: liblo-devel
-BuildRequires: libsndfile-devel
-BuildRequires: fltk-fluid
-BuildRequires: fltk-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: jack-audio-connection-kit-devel
BuildRequires: desktop-file-utils
+BuildRequires: fltk-devel
+BuildRequires: fltk-fluid
BuildRequires: imake
-BuildRequires: libXpm-devel
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
BuildRequires: liblrdf-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXpm-devel
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
%description
Non-daw is a digital audio workstation for JACK
@@ -56,9 +57,14 @@ sequencer
%prep
%setup -q -n non-20160405
+%patch2 -p1
%build
+%ifarch %{ix86} x86_64
CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+%else
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+%endif
./waf %{_smp_mflags} -v
%install
@@ -90,7 +96,6 @@ fi
%{_bindir}/%{name}
%{_bindir}/non-timeline
%{_docdir}/non-timeline
-%{_bindir}/jackpatch
%{_datadir}/applications/non-timeline.desktop
%{_datadir}/icons/hicolor/*/apps/non-timeline*
%{_datadir}/pixmaps/non-timeline
@@ -106,6 +111,7 @@ fi
%files -n non-session-manager
%{_bindir}/nsm*
+%{_bindir}/jackpatch
%{_bindir}/non-session-manager
%{_docdir}/non-session-manager
%{_datadir}/applications/non-session-manager.desktop
@@ -121,6 +127,12 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
+- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
+- Enable vorbis support
+- Put jackpatch in right sub package (rhbz 1336224)
+- Fix ladspa plugins search path (rhbz 1317283)
+
* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
- Fix up Release so upgrade path works correctly
commit ad2f3ba9faea2227cbb2d054927403e3892e5e1a
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Thu Aug 11 17:50:26 2016 +0100
Fix up Release so upgrade path works correctly
diff --git a/non-daw.spec b/non-daw.spec
index 2185a0c..d0053db 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 0.1.git16885e69%{?dist}
+Release: 8.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -121,6 +121,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
+- Fix up Release so upgrade path works correctly
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit 010ea05a95813567c39ea720a880e3ba6eb65f55
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Mon Apr 25 08:31:21 2016 +0200
Update to latest git
diff --git a/.gitignore b/.gitignore
index 39dcb47..5b36417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/non-daw-20121013-git61addce.tar.bz2
/non-daw-20130902-git9fba8a8.tar.bz2
/non-daw-20131026-git13c3ca8.tar.bz2
+/non-20160405-git16885e69.tar.bz2
diff --git a/non-daw.spec b/non-daw.spec
index cc59f33..2185a0c 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,16 +1,18 @@
Name: non-daw
Version: 1.2.0
-Release: 7.git13c3ca8%{?dist}
+Release: 0.1.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
-Source0: non-daw-20131026-git13c3ca8.tar.bz2
+Source0: non-20160405-git16885e69.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
+# missing ladspa dependencies (temporarily)
+ExcludeArch: %{arm}
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
@@ -39,10 +41,6 @@ non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
Group: Applications/Multimedia
-## this can't work, maybe want something like:
-## Obsoletes: non-session-manager < 1.0.0-0.6
-## instead?? -- rex
-#Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -57,13 +55,11 @@ non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
%prep
-%setup -q -n non-daw-20131026
-sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
- wscript
+%setup -q -n non-20160405
%build
-CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-debug
-./waf -j4 -v
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+./waf %{_smp_mflags} -v
%install
./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
diff --git a/non-snapshot.sh b/non-snapshot.sh
index df91616..bc82db5 100644
--- a/non-snapshot.sh
+++ b/non-snapshot.sh
@@ -17,16 +17,15 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
name=non
-version=20130520
+version=20160405
pushd "$tmp" >/dev/null
echo "Fetching git revision: $1"
git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
+ls
pushd $name-$version
-# grab submodule
git reset --hard $1
-git clone git://git.tuxfamily.org/gitroot/non/fltk.git lib/ntk
-rm -rf lib/ntk/.git* .git*
+rm -rf .git
popd
echo "Fetched git revision: $1"
rm -f $name.stdout
diff --git a/sources b/sources
index 673eec9..edd578e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08008457dddcd3fedd32fb90fd3b7552 non-daw-20131026-git13c3ca8.tar.bz2
+b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 8eb2bb69084dfb76ca69555db61c9133ee8e3381
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 4 10:52:44 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 8901cec..cc59f33 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 6.git13c3ca8%{?dist}
+Release: 7.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 3040fd519962c561d5664727eae9e9d0b6ca2cfd
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jun 17 23:19:33 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 7f6a716..8901cec 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 5.git13c3ca8%{?dist}
+Release: 6.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
- Rebuilt for GCC 5 C++11 ABI change
commit a3217dd92a13c5a5ea9867e815b8a9705f7d9f8b
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat May 2 16:15:06 2015 +0200
Rebuilt for GCC 5 C++11 ABI change
diff --git a/non-daw.spec b/non-daw.spec
index aeca0ef..7f6a716 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 4.git13c3ca8%{?dist}
+Release: 5.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
+- Rebuilt for GCC 5 C++11 ABI change
+
* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
- rebuild (fltk)
- non-session-manager: omit non-sensical Obsoletes
commit ca1729969acecdc828498f7e6cdcc3b11a8c7c54
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Thu Feb 19 12:10:48 2015 -0600
1.2.0-4.git13c3ca8
- rebuild (fltk)
- non-session-manager: omit non-sensical Obsoletes
- fix Release: tag
diff --git a/non-daw.spec b/non-daw.spec
index 346d44b..aeca0ef 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 3.1.git13c3ca8%{?dist}
+Release: 4.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -39,7 +39,10 @@ non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
Group: Applications/Multimedia
-Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
+## this can't work, maybe want something like:
+## Obsoletes: non-session-manager < 1.0.0-0.6
+## instead?? -- rex
+#Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -122,6 +125,11 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
+- rebuild (fltk)
+- non-session-manager: omit non-sensical Obsoletes
+- fix Release: tag
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit 5e126a62aac8753523600d9fe3f53dd596d08dd3
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Sun Aug 17 12:09:35 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 435475b..346d44b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 2.1.git13c3ca8%{?dist}
+Release: 3.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -122,6 +122,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 2be8f584367f9b3f6d1db370d90a897e1ba68d24
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 09:59:28 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index dca2328..435475b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 1.1.git13c3ca8%{?dist}
+Release: 2.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -122,6 +122,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
- New source, adding additional sub packages, non-mixer
- obsoletes non-session-manager, non-sequencer
commit 773314c3ebf126cf3332c9dc27c5e6cfc15ebec0
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Sat Oct 26 20:47:33 2013 +0200
Update to 1.2.0
diff --git a/.gitignore b/.gitignore
index 4624953..39dcb47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/non-daw-20121013-git61addce.tar.bz2
/non-daw-20130902-git9fba8a8.tar.bz2
+/non-daw-20131026-git13c3ca8.tar.bz2
diff --git a/non-daw.spec b/non-daw.spec
index bfd4dda..dca2328 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,12 +1,12 @@
Name: non-daw
-Version: 1.1.0
-Release: 0.5.git9fba8a8%{?dist}
+Version: 1.2.0
+Release: 1.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
-Source0: non-daw-20130902-git9fba8a8.tar.bz2
+Source0: non-daw-20131026-git13c3ca8.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
@@ -54,7 +54,7 @@ non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
%prep
-%setup -q -n non-daw-20130902
+%setup -q -n non-daw-20131026
sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
wscript
diff --git a/sources b/sources
index c2b4cab..673eec9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7322bf08e70c076ab7a4b016c8c2e5a0 non-daw-20130902-git9fba8a8.tar.bz2
+08008457dddcd3fedd32fb90fd3b7552 non-daw-20131026-git13c3ca8.tar.bz2
commit 7bd22b4294c2797138ba2065b2eee2974f4ee1ba
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Tue Sep 3 20:34:13 2013 +0200
Update source, build new sub-packages
diff --git a/.gitignore b/.gitignore
index 1db5b9d..4624953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
index 6e187d4..4f79787 100644
--- a/non-daw-desktop.patch
+++ b/non-daw-desktop.patch
@@ -11,4 +11,4 @@ diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/tim
Type=Application
Icon=non-daw
-Categories=Application;AudioVideo;Audio;
-+Categories=Application;AudioVideo;Audio;X-Jack;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw-makefile.patch b/non-daw-makefile.patch
deleted file mode 100644
index 390675e..0000000
--- a/non-daw-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nurp non-daw-20121013/session-manager/configure non-daw-20121013.new/session-manager/configure
---- non-daw-20121013/session-manager/configure 2012-10-13 07:44:23.000000000 +0200
-+++ non-daw-20121013.new/session-manager/configure 2012-10-13 20:35:59.222308215 +0200
-@@ -27,15 +27,15 @@ test_version `version_of liblo` 0.26 ||
-
- end
-
--if ! hostname_resolvable
--then
-- echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
-- echo "This is a broken configuration and will cause liblo (the"
-- echo "OSC library) to fail to function. Add the line:"
-- echo
-- echo "127.0.0.1 $(hostname)"
-- echo
-- echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
-- echo
-- fail "Invalid hostname!"
--fi
-+#if ! hostname_resolvable
-+#then
-+# echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
-+# echo "This is a broken configuration and will cause liblo (the"
-+# echo "OSC library) to fail to function. Add the line:"
-+# echo
-+# echo "127.0.0.1 $(hostname)"
-+# echo
-+# echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
-+# echo
-+# fail "Invalid hostname!"
-+#fi
-diff -Nurp non-daw-20121013/timeline/makefile.inc non-daw-20121013.new/timeline/makefile.inc
---- non-daw-20121013/timeline/makefile.inc 2012-10-13 07:44:23.000000000 +0200
-+++ non-daw-20121013.new/timeline/makefile.inc 2012-10-13 09:50:37.844660915 +0200
-@@ -40,8 +40,8 @@ clean:
- install: all
- @ echo -n "Installing..."
- @ install src/timeline $(prefix)/bin/non-daw
-- @ mkdir -p $(SYSTEM_PATH)/non-daw
-- @ mkdir -p $(PIXMAP_PATH)/non-daw
-+ @ mkdir -p $(DESTDIR)$(SYSTEM_PATH)/non-daw
-+ @ mkdir -p $(DESTDIR)$(PIXMAP_PATH)/non-daw
- @ $(MAKE) -s -C doc install
- @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
- @ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
diff --git a/non-daw.spec b/non-daw.spec
index f25d5e6..bfd4dda 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,18 +1,19 @@
Name: non-daw
Version: 1.1.0
-Release: 0.4.gitae6b78cf%{?dist}
+Release: 0.5.git9fba8a8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
-URL: http://%{name}.tuxfamily.org/
-Source0: non-daw-20121013-git61addce.tar.bz2
-# script to create source tarball from git
+URL: http://non.tuxfamily.org/
+Source0: non-daw-20130902-git9fba8a8.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
-Patch0: non-daw-makefile.patch
+# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
BuildRequires: liblo-devel
BuildRequires: libsndfile-devel
BuildRequires: fltk-fluid
@@ -22,38 +23,53 @@ BuildRequires: jack-audio-connection-kit-devel
BuildRequires: desktop-file-utils
BuildRequires: imake
BuildRequires: libXpm-devel
+BuildRequires: ladspa-devel
+BuildRequires: liblrdf-devel
%description
Non-daw is a digital audio workstation for JACK
+%package -n non-mixer
+Summary: A digital audio mixer for JACK
+Group: Applications/Multimedia
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary: A session manager for JACK
+Group: Applications/Multimedia
+Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary: A MIDI sequencer for JACK
+Group: Applications/Multimedia
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
%prep
-%setup -q -n non-daw-20121013
-%patch0 -p1
-%patch1 -p1
-sed -i -e 's|src/timeline $(prefix)/bin/non-daw|src/timeline $(DESTDIR)$(prefix)/bin/non-daw|' timeline/makefile.inc
-sed -i -e 's|@ $(CXX)|$(CXX) %optflags|' \
- scripts/Makefile
+%setup -q -n non-daw-20130902
+sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
+ wscript
%build
-cd nonlib
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
-cd ../FL
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
-cd ../timeline
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
+CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-debug
+./waf -j4 -v
%install
-cd timeline
-mkdir -p %{buildroot}%{_bindir}
-export DESTDIR=%{buildroot}
-make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
-%if 0%{?fedora} < 20
-mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
-%endif
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+ sed -i -e 's|\/usr\/bin\/||' $i
+ desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
%post
update-desktop-database -q
@@ -71,13 +87,45 @@ fi
%files
%doc COPYING
+%{_bindir}/import*
%{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/pixmaps/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_bindir}/jackpatch
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
%changelog
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
- Unversioned doc dir changes
diff --git a/non-snapshot.sh b/non-snapshot.sh
index 537996d..df91616 100644
--- a/non-snapshot.sh
+++ b/non-snapshot.sh
@@ -16,16 +16,17 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
-name=non-daw
-version=20121013
+name=non
+version=20130520
pushd "$tmp" >/dev/null
echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/daw.git $name-$version |tee $name.stdout
-ls
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
pushd $name-$version
+# grab submodule
git reset --hard $1
-rm -rf .git
+git clone git://git.tuxfamily.org/gitroot/non/fltk.git lib/ntk
+rm -rf lib/ntk/.git* .git*
popd
echo "Fetched git revision: $1"
rm -f $name.stdout
diff --git a/sources b/sources
index 040c124..c2b4cab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb624e8750dfda430ed1edeec14d9e0c non-daw-20121013-git61addce.tar.bz2
+7322bf08e70c076ab7a4b016c8c2e5a0 non-daw-20130902-git9fba8a8.tar.bz2
commit 4a634d0e5603301ef0d1f6a2a087b6f3b24ff0bc
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Mon Aug 12 10:24:39 2013 +0200
Unversioned doc dir changes
diff --git a/non-daw.spec b/non-daw.spec
index f8f1bb5..f25d5e6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.3.gitae6b78cf%{?dist}
+Release: 0.4.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -50,7 +50,9 @@ cd timeline
mkdir -p %{buildroot}%{_bindir}
export DESTDIR=%{buildroot}
make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
+%if 0%{?fedora} < 20
mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
+%endif
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%post
@@ -76,6 +78,9 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
+- Unversioned doc dir changes
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit 48b1d48349ec62b380d04c4510a78e1a903ca7e3
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 09:22:38 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 3c7c966..f8f1bb5 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.2.gitae6b78cf%{?dist}
+Release: 0.3.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -76,6 +76,9 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit 25a5d422bcbbcd1b41dd287a80bb493a497017a8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Feb 14 02:41:54 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 5ee738c..3c7c966 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.1.gitae6b78cf%{?dist}
+Release: 0.2.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -76,5 +76,8 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
- Initial build
commit a2efb0ce4882d6129df6b7dce341d4b9a110fd36
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Sun Jan 13 22:43:20 2013 +0100
Initial import
diff --git a/.gitignore b/.gitignore
index e69de29..1db5b9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/non-daw-20121013-git61addce.tar.bz2
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
new file mode 100644
index 0000000..6e187d4
--- /dev/null
+++ b/non-daw-desktop.patch
@@ -0,0 +1,14 @@
+diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
+--- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
++++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Non DAW
+ Comment=Modular Digital Audio Workstation - Timeline Editor
+-Exec=@BIN_PATH@/non-daw
++Exec=non-daw
+ Terminal=false
+ Type=Application
+ Icon=non-daw
+-Categories=Application;AudioVideo;Audio;
++Categories=Application;AudioVideo;Audio;X-Jack;
diff --git a/non-daw-makefile.patch b/non-daw-makefile.patch
new file mode 100644
index 0000000..390675e
--- /dev/null
+++ b/non-daw-makefile.patch
@@ -0,0 +1,45 @@
+diff -Nurp non-daw-20121013/session-manager/configure non-daw-20121013.new/session-manager/configure
+--- non-daw-20121013/session-manager/configure 2012-10-13 07:44:23.000000000 +0200
++++ non-daw-20121013.new/session-manager/configure 2012-10-13 20:35:59.222308215 +0200
+@@ -27,15 +27,15 @@ test_version `version_of liblo` 0.26 ||
+
+ end
+
+-if ! hostname_resolvable
+-then
+- echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
+- echo "This is a broken configuration and will cause liblo (the"
+- echo "OSC library) to fail to function. Add the line:"
+- echo
+- echo "127.0.0.1 $(hostname)"
+- echo
+- echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
+- echo
+- fail "Invalid hostname!"
+-fi
++#if ! hostname_resolvable
++#then
++# echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
++# echo "This is a broken configuration and will cause liblo (the"
++# echo "OSC library) to fail to function. Add the line:"
++# echo
++# echo "127.0.0.1 $(hostname)"
++# echo
++# echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
++# echo
++# fail "Invalid hostname!"
++#fi
+diff -Nurp non-daw-20121013/timeline/makefile.inc non-daw-20121013.new/timeline/makefile.inc
+--- non-daw-20121013/timeline/makefile.inc 2012-10-13 07:44:23.000000000 +0200
++++ non-daw-20121013.new/timeline/makefile.inc 2012-10-13 09:50:37.844660915 +0200
+@@ -40,8 +40,8 @@ clean:
+ install: all
+ @ echo -n "Installing..."
+ @ install src/timeline $(prefix)/bin/non-daw
+- @ mkdir -p $(SYSTEM_PATH)/non-daw
+- @ mkdir -p $(PIXMAP_PATH)/non-daw
++ @ mkdir -p $(DESTDIR)$(SYSTEM_PATH)/non-daw
++ @ mkdir -p $(DESTDIR)$(PIXMAP_PATH)/non-daw
+ @ $(MAKE) -s -C doc install
+ @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
+ @ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
diff --git a/non-daw.spec b/non-daw.spec
new file mode 100644
index 0000000..5ee738c
--- /dev/null
+++ b/non-daw.spec
@@ -0,0 +1,80 @@
+Name: non-daw
+Version: 1.1.0
+Release: 0.1.gitae6b78cf%{?dist}
+Summary: A digital audio workstation for JACK
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://%{name}.tuxfamily.org/
+Source0: non-daw-20121013-git61addce.tar.bz2
+# script to create source tarball from git
+# sh non-snapshot.sh (rev>
+Source1: non-snapshot.sh
+Patch0: non-daw-makefile.patch
+Patch1: non-daw-desktop.patch
+
+BuildRequires: liblo-devel
+BuildRequires: libsndfile-devel
+BuildRequires: fltk-fluid
+BuildRequires: fltk-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: desktop-file-utils
+BuildRequires: imake
+BuildRequires: libXpm-devel
+
+%description
+Non-daw is a digital audio workstation for JACK
+
+%prep
+%setup -q -n non-daw-20121013
+%patch0 -p1
+%patch1 -p1
+sed -i -e 's|src/timeline $(prefix)/bin/non-daw|src/timeline $(DESTDIR)$(prefix)/bin/non-daw|' timeline/makefile.inc
+sed -i -e 's|@ $(CXX)|$(CXX) %optflags|' \
+ scripts/Makefile
+
+%build
+cd nonlib
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+cd ../FL
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+cd ../timeline
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+
+%install
+cd timeline
+mkdir -p %{buildroot}%{_bindir}
+export DESTDIR=%{buildroot}
+make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
+mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%post
+update-desktop-database -q
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+
+%postun
+update-desktop-database -q
+if [ $1 -eq 0 ]; then
+ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files
+%doc COPYING
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/pixmaps/%{name}
+
+%changelog
+* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
+- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
new file mode 100644
index 0000000..537996d
--- /dev/null
+++ b/non-snapshot.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+ or fetch the latest revision by: `basename $0` HEAD"}
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+name=non-daw
+version=20121013
+
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/daw.git $name-$version |tee $name.stdout
+ls
+pushd $name-$version
+git reset --hard $1
+rm -rf .git
+popd
+echo "Fetched git revision: $1"
+rm -f $name.stdout
+
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
+popd >/dev/null
diff --git a/sources b/sources
index e69de29..040c124 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bb624e8750dfda430ed1edeec14d9e0c non-daw-20121013-git61addce.tar.bz2
1
0
26 Mar '20
The package rpms/non-daw.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=06b3bccd5af7…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=4f5ca32ff1b6…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=47007462be1d…
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=010ea05a9581….
Change:
+%ifarch %{ix86} x86_64
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64
+ExcludeArch: %{arm}
Thanks.
Full change:
============
commit 699d9f3be4813d96ce3d07327bc96d3c8a412286
Author: Erich Eickmeyer <erich(a)ericheickmeyer.com>
Date: Thu Mar 26 10:18:21 2020 -0700
Unretired, new import
diff --git a/.gitignore b/.gitignore
index 5b36417..d5a32dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/non-daw-20130902-git9fba8a8.tar.bz2
/non-daw-20131026-git13c3ca8.tar.bz2
/non-20160405-git16885e69.tar.bz2
+/non-bbe8386499621c8e60eebb06d80e966f13a69a95.tar.gz
diff --git a/fix-fsf-address.patch b/fix-fsf-address.patch
new file mode 100644
index 0000000..537e254
--- /dev/null
+++ b/fix-fsf-address.patch
@@ -0,0 +1,3246 @@
+From 1daedbec4b3a185f444aedf63e03dd65d684aea9 Mon Sep 17 00:00:00 2001
+Message-Id: <1daedbec4b3a185f444aedf63e03dd65d684aea9.1584816930.git.erich(a)ericheickmeyer.com>
+From: Erich Eickmeyer <erich(a)ericheickmeyer.com>
+Date: Sat, 21 Mar 2020 11:55:13 -0700
+Subject: [PATCH] fix-fsf-address
+
+---
+ FL/About_Dialog.fl | 2 +-
+ FL/Fl_Blink_Button.H | 2 +-
+ FL/Fl_DialX.C | 2 +-
+ FL/Fl_DialX.H | 2 +-
+ FL/Fl_Flip_Button.H | 2 +-
+ FL/Fl_Flowpack.H | 2 +-
+ FL/Fl_Labelpad_Group.H | 2 +-
+ FL/Fl_Menu_Settings.C | 2 +-
+ FL/Fl_Menu_Settings.H | 2 +-
+ FL/Fl_Packscroller.H | 2 +-
+ FL/Fl_Scalepack.C | 2 +-
+ FL/Fl_Scalepack.H | 2 +-
+ FL/Fl_SliderX.C | 2 +-
+ FL/Fl_SliderX.H | 2 +-
+ FL/Fl_Sometimes_Input.H | 2 +-
+ FL/Fl_Sometimes_Pack.H | 2 +-
+ FL/Fl_Value_SliderX.C | 2 +-
+ FL/Fl_Value_SliderX.H | 2 +-
+ FL/New_Project_Dialog.fl | 2 +-
+ FL/event_name.C | 2 +-
+ FL/event_name.H | 2 +-
+ FL/focus_frame.C | 2 +-
+ FL/focus_frame.H | 2 +-
+ FL/img_io_input_connector_10x10_png.h | 2 +-
+ FL/img_io_output_connector_10x10_png.h | 2 +-
+ FL/menu_popup.C | 2 +-
+ FL/menu_popup.H | 2 +-
+ FL/test_press.C | 2 +-
+ FL/test_press.H | 2 +-
+ FL/util/ntk-perf.C | 2 +-
+ mixer/src/AUX_Module.C | 2 +-
+ mixer/src/AUX_Module.H | 2 +-
+ mixer/src/Chain.C | 2 +-
+ mixer/src/Chain.H | 2 +-
+ mixer/src/Controller_Module.C | 2 +-
+ mixer/src/Controller_Module.H | 2 +-
+ mixer/src/DPM.C | 2 +-
+ mixer/src/DPM.H | 2 +-
+ mixer/src/Gain_Module.C | 2 +-
+ mixer/src/Gain_Module.H | 2 +-
+ mixer/src/Group.C | 2 +-
+ mixer/src/Group.H | 2 +-
+ mixer/src/JACK_Module.C | 2 +-
+ mixer/src/JACK_Module.H | 2 +-
+ mixer/src/LADSPAInfo.C | 2 +-
+ mixer/src/LADSPAInfo.h | 2 +-
+ mixer/src/Meter.H | 2 +-
+ mixer/src/Meter_Indicator_Module.C | 2 +-
+ mixer/src/Meter_Indicator_Module.H | 2 +-
+ mixer/src/Meter_Module.C | 2 +-
+ mixer/src/Meter_Module.H | 2 +-
+ mixer/src/Mixer.C | 2 +-
+ mixer/src/Mixer.H | 2 +-
+ mixer/src/Mixer_Strip.C | 2 +-
+ mixer/src/Mixer_Strip.H | 2 +-
+ mixer/src/Module.C | 2 +-
+ mixer/src/Module.H | 2 +-
+ mixer/src/Module_Parameter_Editor.C | 2 +-
+ mixer/src/Module_Parameter_Editor.H | 2 +-
+ mixer/src/Mono_Pan_Module.C | 2 +-
+ mixer/src/Mono_Pan_Module.H | 2 +-
+ mixer/src/NSM.C | 2 +-
+ mixer/src/NSM.H | 2 +-
+ mixer/src/Panner.C | 2 +-
+ mixer/src/Panner.H | 2 +-
+ mixer/src/Plugin_Chooser.C | 2 +-
+ mixer/src/Plugin_Chooser.H | 2 +-
+ mixer/src/Plugin_Module.C | 2 +-
+ mixer/src/Plugin_Module.H | 2 +-
+ mixer/src/Project.C | 2 +-
+ mixer/src/Project.H | 2 +-
+ mixer/src/Spatialization_Console.C | 2 +-
+ mixer/src/Spatialization_Console.H | 2 +-
+ mixer/src/Spatializer_Module.C | 2 +-
+ mixer/src/Spatializer_Module.H | 2 +-
+ mixer/src/SpectrumView.C | 2 +-
+ mixer/src/SpectrumView.H | 2 +-
+ mixer/src/const.h | 2 +-
+ mixer/src/main.C | 2 +-
+ mixer/src/midi-mapper.C | 2 +-
+ nonlib/Block_Timer.H | 2 +-
+ nonlib/JACK/Client.C | 2 +-
+ nonlib/JACK/Client.H | 2 +-
+ nonlib/JACK/Port.C | 2 +-
+ nonlib/JACK/Port.H | 2 +-
+ nonlib/Log_Entry.C | 2 +-
+ nonlib/Log_Entry.H | 2 +-
+ nonlib/Loggable.C | 2 +-
+ nonlib/Loggable.H | 2 +-
+ nonlib/MIDI/event.C | 2 +-
+ nonlib/MIDI/event.H | 2 +-
+ nonlib/MIDI/event_list.C | 2 +-
+ nonlib/MIDI/event_list.H | 2 +-
+ nonlib/MIDI/midievent.C | 2 +-
+ nonlib/MIDI/midievent.H | 2 +-
+ nonlib/MIDI/types.h | 2 +-
+ nonlib/Mutex.H | 2 +-
+ nonlib/NSM/Client.C | 2 +-
+ nonlib/NSM/Client.H | 2 +-
+ nonlib/OSC/Endpoint.C | 2 +-
+ nonlib/OSC/Endpoint.H | 2 +-
+ nonlib/Thread.C | 2 +-
+ nonlib/Thread.H | 2 +-
+ nonlib/debug.C | 2 +-
+ nonlib/debug.h | 2 +-
+ nonlib/dsp.C | 2 +-
+ nonlib/dsp.h | 2 +-
+ nonlib/file.C | 2 +-
+ nonlib/file.h | 2 +-
+ nonlib/string_util.C | 2 +-
+ nonlib/string_util.h | 2 +-
+ nonlib/types.h | 2 +-
+ sequencer/src/NSM.C | 2 +-
+ sequencer/src/NSM.H | 2 +-
+ sequencer/src/NSM/Client.C | 2 +-
+ sequencer/src/NSM/Client.H | 2 +-
+ sequencer/src/canvas.C | 2 +-
+ sequencer/src/canvas.H | 2 +-
+ sequencer/src/common.h | 2 +-
+ sequencer/src/const.h | 2 +-
+ sequencer/src/debug.C | 2 +-
+ sequencer/src/debug.h | 2 +-
+ sequencer/src/grid.C | 2 +-
+ sequencer/src/grid.H | 2 +-
+ sequencer/src/gui/event_edit.fl | 2 +-
+ sequencer/src/gui/ui.fl | 2 +-
+ sequencer/src/instrument.C | 2 +-
+ sequencer/src/instrument.H | 2 +-
+ sequencer/src/jack.C | 2 +-
+ sequencer/src/main.C | 2 +-
+ sequencer/src/mapping.C | 2 +-
+ sequencer/src/mapping.H | 2 +-
+ sequencer/src/non.H | 2 +-
+ sequencer/src/pattern.C | 2 +-
+ sequencer/src/pattern.H | 2 +-
+ sequencer/src/phrase.C | 2 +-
+ sequencer/src/phrase.H | 2 +-
+ sequencer/src/scale.C | 2 +-
+ sequencer/src/scale.H | 2 +-
+ sequencer/src/sequence.C | 2 +-
+ sequencer/src/sequence.H | 2 +-
+ sequencer/src/smf.C | 2 +-
+ sequencer/src/smf.H | 2 +-
+ sequencer/src/transport.C | 2 +-
+ sequencer/src/transport.H | 2 +-
+ session-manager/src/jackpatch.c | 2 +-
+ session-manager/src/nsm-proxy-gui.C | 2 +-
+ session-manager/src/nsm-proxy.C | 2 +-
+ session-manager/src/nsmd.C | 2 +-
+ session-manager/src/send_osc.C | 2 +-
+ session-manager/src/session-manager.C | 2 +-
+ timeline/bin/import-ardour-session | 2 +-
+ timeline/bin/import-external-sources | 2 +-
+ timeline/bin/remove-unused-sources | 2 +-
+ timeline/src/Annotation_Point.H | 2 +-
+ timeline/src/Annotation_Region.C | 2 +-
+ timeline/src/Annotation_Region.H | 2 +-
+ timeline/src/Annotation_Sequence.H | 2 +-
+ timeline/src/Audio_Region.C | 2 +-
+ timeline/src/Audio_Region.H | 2 +-
+ timeline/src/Audio_Sequence.C | 2 +-
+ timeline/src/Audio_Sequence.H | 2 +-
+ timeline/src/Clock.H | 2 +-
+ timeline/src/Control_Point.C | 2 +-
+ timeline/src/Control_Point.H | 2 +-
+ timeline/src/Control_Sequence.C | 2 +-
+ timeline/src/Control_Sequence.H | 2 +-
+ timeline/src/Cursor_Point.C | 2 +-
+ timeline/src/Cursor_Point.H | 2 +-
+ timeline/src/Cursor_Region.C | 2 +-
+ timeline/src/Cursor_Region.H | 2 +-
+ timeline/src/Cursor_Sequence.C | 2 +-
+ timeline/src/Cursor_Sequence.H | 2 +-
+ timeline/src/Engine/Audio_File.C | 2 +-
+ timeline/src/Engine/Audio_File.H | 2 +-
+ timeline/src/Engine/Audio_File_Dummy.C | 2 +-
+ timeline/src/Engine/Audio_File_Dummy.H | 2 +-
+ timeline/src/Engine/Audio_File_SF.C | 2 +-
+ timeline/src/Engine/Audio_File_SF.H | 2 +-
+ timeline/src/Engine/Audio_Region.C | 2 +-
+ timeline/src/Engine/Audio_Sequence.C | 2 +-
+ timeline/src/Engine/Control_Sequence.C | 2 +-
+ timeline/src/Engine/Disk_Stream.C | 2 +-
+ timeline/src/Engine/Disk_Stream.H | 2 +-
+ timeline/src/Engine/Engine.C | 2 +-
+ timeline/src/Engine/Engine.H | 2 +-
+ timeline/src/Engine/Peak.H | 2 +-
+ timeline/src/Engine/Peaks.C | 2 +-
+ timeline/src/Engine/Peaks.H | 2 +-
+ timeline/src/Engine/Playback_DS.C | 2 +-
+ timeline/src/Engine/Playback_DS.H | 2 +-
+ timeline/src/Engine/Record_DS.C | 2 +-
+ timeline/src/Engine/Record_DS.H | 2 +-
+ timeline/src/Engine/Timeline.C | 2 +-
+ timeline/src/Engine/Track.C | 2 +-
+ timeline/src/Engine/const.h | 2 +-
+ timeline/src/Engine/types.h | 2 +-
+ timeline/src/NSM.C | 2 +-
+ timeline/src/OSC_Thread.C | 2 +-
+ timeline/src/OSC_Thread.H | 2 +-
+ timeline/src/Project.C | 2 +-
+ timeline/src/Project.H | 2 +-
+ timeline/src/RWLock.H | 2 +-
+ timeline/src/Sequence.C | 2 +-
+ timeline/src/Sequence.H | 2 +-
+ timeline/src/Sequence_Point.C | 2 +-
+ timeline/src/Sequence_Point.H | 2 +-
+ timeline/src/Sequence_Region.C | 2 +-
+ timeline/src/Sequence_Region.H | 2 +-
+ timeline/src/Sequence_Widget.C | 2 +-
+ timeline/src/Sequence_Widget.H | 2 +-
+ timeline/src/TLE.fl | 2 +-
+ timeline/src/Tempo_Point.C | 2 +-
+ timeline/src/Tempo_Point.H | 2 +-
+ timeline/src/Tempo_Sequence.C | 2 +-
+ timeline/src/Tempo_Sequence.H | 2 +-
+ timeline/src/Time_Point.C | 2 +-
+ timeline/src/Time_Point.H | 2 +-
+ timeline/src/Time_Sequence.C | 2 +-
+ timeline/src/Time_Sequence.H | 2 +-
+ timeline/src/Timeline.C | 2 +-
+ timeline/src/Timeline.H | 2 +-
+ timeline/src/Track.C | 2 +-
+ timeline/src/Track.H | 2 +-
+ timeline/src/Transport.C | 2 +-
+ timeline/src/Transport.H | 2 +-
+ timeline/src/Waveform.C | 2 +-
+ timeline/src/Waveform.H | 2 +-
+ timeline/src/const.h | 2 +-
+ timeline/src/main.C | 2 +-
+ timeline/src/types.h | 2 +-
+ 231 files changed, 231 insertions(+), 231 deletions(-)
+
+diff --git a/FL/About_Dialog.fl b/FL/About_Dialog.fl
+index 2504854..5f191ae 100644
+--- a/FL/About_Dialog.fl
++++ b/FL/About_Dialog.fl
+@@ -70,7 +70,7 @@ if ( logo_box->image() )
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.}
++You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.}
+ xywh {10 414 535 225} box ROUNDED_BOX color 46 labelfont 1 labelsize 12 labelcolor 53 align 144
+ }
+ }
+diff --git a/FL/Fl_Blink_Button.H b/FL/Fl_Blink_Button.H
+index bc81303..bc4c7a7 100644
+--- a/FL/Fl_Blink_Button.H
++++ b/FL/Fl_Blink_Button.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_DialX.C b/FL/Fl_DialX.C
+index 64973b5..6dfdc05 100644
+--- a/FL/Fl_DialX.C
++++ b/FL/Fl_DialX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_DialX.H"
+diff --git a/FL/Fl_DialX.H b/FL/Fl_DialX.H
+index d27da3c..8bde176 100644
+--- a/FL/Fl_DialX.H
++++ b/FL/Fl_DialX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Flip_Button.H b/FL/Fl_Flip_Button.H
+index d3e0b1e..b1b8be0 100644
+--- a/FL/Fl_Flip_Button.H
++++ b/FL/Fl_Flip_Button.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Simple extension of Fl_Button to support different lables for the
+diff --git a/FL/Fl_Flowpack.H b/FL/Fl_Flowpack.H
+index cdb3779..0edfc6d 100644
+--- a/FL/Fl_Flowpack.H
++++ b/FL/Fl_Flowpack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Labelpad_Group.H b/FL/Fl_Labelpad_Group.H
+index bf7e641..7750c19 100644
+--- a/FL/Fl_Labelpad_Group.H
++++ b/FL/Fl_Labelpad_Group.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* wrap a widget in a group as wide as the widget's label. This is
+diff --git a/FL/Fl_Menu_Settings.C b/FL/Fl_Menu_Settings.C
+index a2f513e..e47b4a1 100644
+--- a/FL/Fl_Menu_Settings.C
++++ b/FL/Fl_Menu_Settings.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_Menu_Settings.H"
+diff --git a/FL/Fl_Menu_Settings.H b/FL/Fl_Menu_Settings.H
+index 7a94697..416d909 100644
+--- a/FL/Fl_Menu_Settings.H
++++ b/FL/Fl_Menu_Settings.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Packscroller.H b/FL/Fl_Packscroller.H
+index 0661b48..1b75d01 100644
+--- a/FL/Fl_Packscroller.H
++++ b/FL/Fl_Packscroller.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Scrolling group suitable for containing a single child (a
+diff --git a/FL/Fl_Scalepack.C b/FL/Fl_Scalepack.C
+index c253838..bab54e1 100644
+--- a/FL/Fl_Scalepack.C
++++ b/FL/Fl_Scalepack.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Scalepack.H b/FL/Fl_Scalepack.H
+index 9974bba..b1e278e 100644
+--- a/FL/Fl_Scalepack.H
++++ b/FL/Fl_Scalepack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_SliderX.C b/FL/Fl_SliderX.C
+index 582b02a..1596bab 100644
+--- a/FL/Fl_SliderX.C
++++ b/FL/Fl_SliderX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Fl_SliderX.H"
+diff --git a/FL/Fl_SliderX.H b/FL/Fl_SliderX.H
+index bc56605..629d824 100644
+--- a/FL/Fl_SliderX.H
++++ b/FL/Fl_SliderX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Sometimes_Input.H b/FL/Fl_Sometimes_Input.H
+index ef5be75..d001382 100644
+--- a/FL/Fl_Sometimes_Input.H
++++ b/FL/Fl_Sometimes_Input.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Sometimes_Pack.H b/FL/Fl_Sometimes_Pack.H
+index d20a035..1974f7d 100644
+--- a/FL/Fl_Sometimes_Pack.H
++++ b/FL/Fl_Sometimes_Pack.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/FL/Fl_Value_SliderX.C b/FL/Fl_Value_SliderX.C
+index 0e8821f..069c57b 100644
+--- a/FL/Fl_Value_SliderX.C
++++ b/FL/Fl_Value_SliderX.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/FL/Fl_Value_SliderX.H b/FL/Fl_Value_SliderX.H
+index 39492b0..0a5ac0b 100644
+--- a/FL/Fl_Value_SliderX.H
++++ b/FL/Fl_Value_SliderX.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #ifndef Fl_Value_SliderX_H
+diff --git a/FL/New_Project_Dialog.fl b/FL/New_Project_Dialog.fl
+index 14be033..8e19a0e 100644
+--- a/FL/New_Project_Dialog.fl
++++ b/FL/New_Project_Dialog.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/FL/event_name.C b/FL/event_name.C
+index d53ab98..96503b7 100644
+--- a/FL/event_name.C
++++ b/FL/event_name.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static const char *event_names[] =
+diff --git a/FL/event_name.H b/FL/event_name.H
+index 28d58d6..741393e 100644
+--- a/FL/event_name.H
++++ b/FL/event_name.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char *event_name ( int m );
+diff --git a/FL/focus_frame.C b/FL/focus_frame.C
+index 0cabb7e..50c6848 100644
+--- a/FL/focus_frame.C
++++ b/FL/focus_frame.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/FL/focus_frame.H b/FL/focus_frame.H
+index e48e540..73338a4 100644
+--- a/FL/focus_frame.H
++++ b/FL/focus_frame.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ void draw_focus_frame ( int x, int y, int w, int h, Fl_Color c );
+diff --git a/FL/img_io_input_connector_10x10_png.h b/FL/img_io_input_connector_10x10_png.h
+index c58f485..36f1c88 100644
+--- a/FL/img_io_input_connector_10x10_png.h
++++ b/FL/img_io_input_connector_10x10_png.h
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static unsigned char img_io_input_connector_10x10_png[] = {
+diff --git a/FL/img_io_output_connector_10x10_png.h b/FL/img_io_output_connector_10x10_png.h
+index 1a0503f..1625a54 100644
+--- a/FL/img_io_output_connector_10x10_png.h
++++ b/FL/img_io_output_connector_10x10_png.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ static unsigned char img_io_output_connector_10x10_png[] = {
+diff --git a/FL/menu_popup.C b/FL/menu_popup.C
+index afe3b95..0eb7b0d 100644
+--- a/FL/menu_popup.C
++++ b/FL/menu_popup.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/FL/menu_popup.H b/FL/menu_popup.H
+index 67c5b78..2c282e6 100644
+--- a/FL/menu_popup.H
++++ b/FL/menu_popup.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ class Fl_Menu_;
+diff --git a/FL/test_press.C b/FL/test_press.C
+index 0a79238..7356516 100644
+--- a/FL/test_press.C
++++ b/FL/test_press.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Fl::test_shortcut() is broken for use in FL_PUSH handlers etc,
+diff --git a/FL/test_press.H b/FL/test_press.H
+index 3b0fe55..1f5a427 100644
+--- a/FL/test_press.H
++++ b/FL/test_press.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ int test_press ( unsigned long e );
+diff --git a/FL/util/ntk-perf.C b/FL/util/ntk-perf.C
+index ca32236..b24ed01 100644
+--- a/FL/util/ntk-perf.C
++++ b/FL/util/ntk-perf.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/AUX_Module.C b/mixer/src/AUX_Module.C
+index d8aa58e..d0e2ce8 100644
+--- a/mixer/src/AUX_Module.C
++++ b/mixer/src/AUX_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/mixer/src/AUX_Module.H b/mixer/src/AUX_Module.H
+index e422a54..1838b0d 100644
+--- a/mixer/src/AUX_Module.H
++++ b/mixer/src/AUX_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Chain.C b/mixer/src/Chain.C
+index d0b173a..e1d0678 100644
+--- a/mixer/src/Chain.C
++++ b/mixer/src/Chain.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Filter chain. This would all be much simpler if we chose not to
+diff --git a/mixer/src/Chain.H b/mixer/src/Chain.H
+index c11cdad..c6c8261 100644
+--- a/mixer/src/Chain.H
++++ b/mixer/src/Chain.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Controller_Module.C b/mixer/src/Controller_Module.C
+index 74eaca9..9d9df7f 100644
+--- a/mixer/src/Controller_Module.C
++++ b/mixer/src/Controller_Module.C
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Controller_Module.H b/mixer/src/Controller_Module.H
+index 83973ba..2bc095a 100644
+--- a/mixer/src/Controller_Module.H
++++ b/mixer/src/Controller_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C
+index 35edf23..978feda 100644
+--- a/mixer/src/DPM.C
++++ b/mixer/src/DPM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* a Digital Peak Meter, either horizontal or vertical. Color is a
+diff --git a/mixer/src/DPM.H b/mixer/src/DPM.H
+index 03f24bb..ed56651 100644
+--- a/mixer/src/DPM.H
++++ b/mixer/src/DPM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Gain_Module.C b/mixer/src/Gain_Module.C
+index ecd5fe1..f35ce30 100644
+--- a/mixer/src/Gain_Module.C
++++ b/mixer/src/Gain_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <math.h>
+diff --git a/mixer/src/Gain_Module.H b/mixer/src/Gain_Module.H
+index a8bf764..5e4a322 100644
+--- a/mixer/src/Gain_Module.H
++++ b/mixer/src/Gain_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Group.C b/mixer/src/Group.C
+index 1f57642..24ec09c 100644
+--- a/mixer/src/Group.C
++++ b/mixer/src/Group.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <Mixer.H>
+diff --git a/mixer/src/Group.H b/mixer/src/Group.H
+index 5d3dd3d..cd93080 100644
+--- a/mixer/src/Group.H
++++ b/mixer/src/Group.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/JACK_Module.C b/mixer/src/JACK_Module.C
+index 199f75c..c33be0e 100644
+--- a/mixer/src/JACK_Module.C
++++ b/mixer/src/JACK_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/JACK_Module.H b/mixer/src/JACK_Module.H
+index 25e3d97..0ec1f82 100644
+--- a/mixer/src/JACK_Module.H
++++ b/mixer/src/JACK_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..e3cb345 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ //
+
+ // #include <config.h>
+diff --git a/mixer/src/LADSPAInfo.h b/mixer/src/LADSPAInfo.h
+index fbda43d..6083b83 100644
+--- a/mixer/src/LADSPAInfo.h
++++ b/mixer/src/LADSPAInfo.h
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ //
+
+ #ifndef __ladspa_info_h__
+diff --git a/mixer/src/Meter.H b/mixer/src/Meter.H
+index ce61263..0de7491 100644
+--- a/mixer/src/Meter.H
++++ b/mixer/src/Meter.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/mixer/src/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C
+index df23d3b..3e4fc49 100644
+--- a/mixer/src/Meter_Indicator_Module.C
++++ b/mixer/src/Meter_Indicator_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Meter_Indicator_Module.H"
+diff --git a/mixer/src/Meter_Indicator_Module.H b/mixer/src/Meter_Indicator_Module.H
+index 960d17c..441372d 100644
+--- a/mixer/src/Meter_Indicator_Module.H
++++ b/mixer/src/Meter_Indicator_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Meter_Module.C b/mixer/src/Meter_Module.C
+index 30876b3..1b19e5d 100644
+--- a/mixer/src/Meter_Module.C
++++ b/mixer/src/Meter_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Meter_Module.H b/mixer/src/Meter_Module.H
+index 2b3e72b..ac100b5 100644
+--- a/mixer/src/Meter_Module.H
++++ b/mixer/src/Meter_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C
+index 0969a9e..6812aef 100644
+--- a/mixer/src/Mixer.C
++++ b/mixer/src/Mixer.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is the main mixer group. It contains and manages Mixer_Strips. */
+diff --git a/mixer/src/Mixer.H b/mixer/src/Mixer.H
+index c86109b..1dc9eaa 100644
+--- a/mixer/src/Mixer.H
++++ b/mixer/src/Mixer.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C
+index 88dffa0..f4c63e8 100644
+--- a/mixer/src/Mixer_Strip.C
++++ b/mixer/src/Mixer_Strip.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Mixer strip control. Handles GUI and control I/O for this strip. */
+diff --git a/mixer/src/Mixer_Strip.H b/mixer/src/Mixer_Strip.H
+index ce7967a..c50f293 100644
+--- a/mixer/src/Mixer_Strip.H
++++ b/mixer/src/Mixer_Strip.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Module.C b/mixer/src/Module.C
+index ea712d3..b147750 100644
+--- a/mixer/src/Module.C
++++ b/mixer/src/Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Module.H"
+diff --git a/mixer/src/Module.H b/mixer/src/Module.H
+index 8eebc82..dc5931f 100644
+--- a/mixer/src/Module.H
++++ b/mixer/src/Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Module_Parameter_Editor.C b/mixer/src/Module_Parameter_Editor.C
+index fbd3e72..a2531ce 100644
+--- a/mixer/src/Module_Parameter_Editor.C
++++ b/mixer/src/Module_Parameter_Editor.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Module_Parameter_Editor.H b/mixer/src/Module_Parameter_Editor.H
+index ab3f2fb..e504e54 100644
+--- a/mixer/src/Module_Parameter_Editor.H
++++ b/mixer/src/Module_Parameter_Editor.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Mono_Pan_Module.C b/mixer/src/Mono_Pan_Module.C
+index 9eac660..63be94e 100644
+--- a/mixer/src/Mono_Pan_Module.C
++++ b/mixer/src/Mono_Pan_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/Mono_Pan_Module.H b/mixer/src/Mono_Pan_Module.H
+index 7ede987..474bdfb 100644
+--- a/mixer/src/Mono_Pan_Module.H
++++ b/mixer/src/Mono_Pan_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/NSM.C b/mixer/src/NSM.C
+index b1083f6..74b95d6 100644
+--- a/mixer/src/NSM.C
++++ b/mixer/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/NSM.H b/mixer/src/NSM.H
+index b289c00..315ce27 100644
+--- a/mixer/src/NSM.H
++++ b/mixer/src/NSM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Panner.C b/mixer/src/Panner.C
+index c48e852..3c4ff6a 100644
+--- a/mixer/src/Panner.C
++++ b/mixer/src/Panner.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Panner.H"
+diff --git a/mixer/src/Panner.H b/mixer/src/Panner.H
+index 8bb8e5e..42351eb 100644
+--- a/mixer/src/Panner.H
++++ b/mixer/src/Panner.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Plugin_Chooser.C b/mixer/src/Plugin_Chooser.C
+index ea50226..c25f8dd 100644
+--- a/mixer/src/Plugin_Chooser.C
++++ b/mixer/src/Plugin_Chooser.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Plugin_Chooser.H b/mixer/src/Plugin_Chooser.H
+index ce67564..46581af 100644
+--- a/mixer/src/Plugin_Chooser.H
++++ b/mixer/src/Plugin_Chooser.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Plugin_Module.C b/mixer/src/Plugin_Module.C
+index f281c39..2cfcf0a 100644
+--- a/mixer/src/Plugin_Module.C
++++ b/mixer/src/Plugin_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Filter module. Can host LADPSA Plugins, or can be inherited from to make internal
+diff --git a/mixer/src/Plugin_Module.H b/mixer/src/Plugin_Module.H
+index 7409e8d..557f230 100644
+--- a/mixer/src/Plugin_Module.H
++++ b/mixer/src/Plugin_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Project.C b/mixer/src/Project.C
+index 777704c..bf8f83f 100644
+--- a/mixer/src/Project.C
++++ b/mixer/src/Project.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Routings for opening/closing/creation of projects. All the actual
+diff --git a/mixer/src/Project.H b/mixer/src/Project.H
+index 42328dc..b5dc18a 100644
+--- a/mixer/src/Project.H
++++ b/mixer/src/Project.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char template_dir[] = "share/non-daw/templates";
+diff --git a/mixer/src/Spatialization_Console.C b/mixer/src/Spatialization_Console.C
+index e82527a..2345f81 100644
+--- a/mixer/src/Spatialization_Console.C
++++ b/mixer/src/Spatialization_Console.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/mixer/src/Spatialization_Console.H b/mixer/src/Spatialization_Console.H
+index 5ca0274..bde5caf 100644
+--- a/mixer/src/Spatialization_Console.H
++++ b/mixer/src/Spatialization_Console.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/Spatializer_Module.C b/mixer/src/Spatializer_Module.C
+index 5649053..1f0a06c 100644
+--- a/mixer/src/Spatializer_Module.C
++++ b/mixer/src/Spatializer_Module.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/mixer/src/Spatializer_Module.H b/mixer/src/Spatializer_Module.H
+index 45a4699..5dd9ac4 100644
+--- a/mixer/src/Spatializer_Module.H
++++ b/mixer/src/Spatializer_Module.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/SpectrumView.C b/mixer/src/SpectrumView.C
+index bfd5792..70f7bbc 100644
+--- a/mixer/src/SpectrumView.C
++++ b/mixer/src/SpectrumView.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "SpectrumView.H"
+diff --git a/mixer/src/SpectrumView.H b/mixer/src/SpectrumView.H
+index 21200a5..4a83f93 100644
+--- a/mixer/src/SpectrumView.H
++++ b/mixer/src/SpectrumView.H
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Box.H>
+diff --git a/mixer/src/const.h b/mixer/src/const.h
+index 1cccaee..f64913e 100644
+--- a/mixer/src/const.h
++++ b/mixer/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/mixer/src/main.C b/mixer/src/main.C
+index 4e56e02..7a738d7 100644
+--- a/mixer/src/main.C
++++ b/mixer/src/main.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/mixer/src/midi-mapper.C b/mixer/src/midi-mapper.C
+index bd2f31a..64e1bd6 100644
+--- a/mixer/src/midi-mapper.C
++++ b/mixer/src/midi-mapper.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <JACK/Client.H>
+diff --git a/nonlib/Block_Timer.H b/nonlib/Block_Timer.H
+index 006ce02..e7f306f 100644
+--- a/nonlib/Block_Timer.H
++++ b/nonlib/Block_Timer.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/JACK/Client.C b/nonlib/JACK/Client.C
+index 9cc1375..db9eee9 100644
+--- a/nonlib/JACK/Client.C
++++ b/nonlib/JACK/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Client.H"
+diff --git a/nonlib/JACK/Client.H b/nonlib/JACK/Client.H
+index cffadc6..98fa251 100644
+--- a/nonlib/JACK/Client.H
++++ b/nonlib/JACK/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/JACK/Port.C b/nonlib/JACK/Port.C
+index e60e6d5..aadf0b7 100644
+--- a/nonlib/JACK/Port.C
++++ b/nonlib/JACK/Port.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Wrapper for a JACK audio port */
+diff --git a/nonlib/JACK/Port.H b/nonlib/JACK/Port.H
+index 202f77f..c253b11 100644
+--- a/nonlib/JACK/Port.H
++++ b/nonlib/JACK/Port.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Log_Entry.C b/nonlib/Log_Entry.C
+index 5857e4e..dee89d7 100644
+--- a/nonlib/Log_Entry.C
++++ b/nonlib/Log_Entry.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Log_Entry.H"
+diff --git a/nonlib/Log_Entry.H b/nonlib/Log_Entry.H
+index a7b7c57..085049c 100644
+--- a/nonlib/Log_Entry.H
++++ b/nonlib/Log_Entry.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Loggable.C b/nonlib/Loggable.C
+index e89c7d7..02707c9 100644
+--- a/nonlib/Loggable.C
++++ b/nonlib/Loggable.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This class handles all journaling. All journaled objects must
+diff --git a/nonlib/Loggable.H b/nonlib/Loggable.H
+index 2b1242c..33349b7 100644
+--- a/nonlib/Loggable.H
++++ b/nonlib/Loggable.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/nonlib/MIDI/event.C b/nonlib/MIDI/event.C
+index 6e488f2..2d2eb6d 100644
+--- a/nonlib/MIDI/event.C
++++ b/nonlib/MIDI/event.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "event.H"
+diff --git a/nonlib/MIDI/event.H b/nonlib/MIDI/event.H
+index d45d059..014f080 100644
+--- a/nonlib/MIDI/event.H
++++ b/nonlib/MIDI/event.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Higher level event interface than midievent, supporting
+diff --git a/nonlib/MIDI/event_list.C b/nonlib/MIDI/event_list.C
+index ced374c..9af1cc4 100644
+--- a/nonlib/MIDI/event_list.C
++++ b/nonlib/MIDI/event_list.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/nonlib/MIDI/event_list.H b/nonlib/MIDI/event_list.H
+index 88c05c1..8a7d0d9 100644
+--- a/nonlib/MIDI/event_list.H
++++ b/nonlib/MIDI/event_list.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/MIDI/midievent.C b/nonlib/MIDI/midievent.C
+index a8d5716..0de3323 100644
+--- a/nonlib/MIDI/midievent.C
++++ b/nonlib/MIDI/midievent.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "midievent.H"
+diff --git a/nonlib/MIDI/midievent.H b/nonlib/MIDI/midievent.H
+index a4e203b..1fb02e2 100644
+--- a/nonlib/MIDI/midievent.H
++++ b/nonlib/MIDI/midievent.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* this class represents a single raw MIDI event plus a timestamp */
+diff --git a/nonlib/MIDI/types.h b/nonlib/MIDI/types.h
+index 192647f..ca89f0d 100644
+--- a/nonlib/MIDI/types.h
++++ b/nonlib/MIDI/types.h
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Mutex.H b/nonlib/Mutex.H
+index ba7d7fc..0ab5f65 100644
+--- a/nonlib/Mutex.H
++++ b/nonlib/Mutex.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/NSM/Client.C b/nonlib/NSM/Client.C
+index fae4b9c..0b91193 100644
+--- a/nonlib/NSM/Client.C
++++ b/nonlib/NSM/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../debug.h"
+diff --git a/nonlib/NSM/Client.H b/nonlib/NSM/Client.H
+index f417944..eedb40b 100644
+--- a/nonlib/NSM/Client.H
++++ b/nonlib/NSM/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/OSC/Endpoint.C b/nonlib/OSC/Endpoint.C
+index cb8c822..661cd39 100644
+--- a/nonlib/OSC/Endpoint.C
++++ b/nonlib/OSC/Endpoint.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <lo/lo.h>
+diff --git a/nonlib/OSC/Endpoint.H b/nonlib/OSC/Endpoint.H
+index 4e56960..53f376f 100644
+--- a/nonlib/OSC/Endpoint.H
++++ b/nonlib/OSC/Endpoint.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/Thread.C b/nonlib/Thread.C
+index 6e5b953..e413ac1 100644
+--- a/nonlib/Thread.C
++++ b/nonlib/Thread.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Thread.H"
+diff --git a/nonlib/Thread.H b/nonlib/Thread.H
+index ad405ad..87a3f8d 100644
+--- a/nonlib/Thread.H
++++ b/nonlib/Thread.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/debug.C b/nonlib/debug.C
+index fe64e7e..080a501 100644
+--- a/nonlib/debug.C
++++ b/nonlib/debug.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/nonlib/debug.h b/nonlib/debug.h
+index d125246..fb43536 100644
+--- a/nonlib/debug.h
++++ b/nonlib/debug.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* debug.h
+diff --git a/nonlib/dsp.C b/nonlib/dsp.C
+index e77ae45..86dd231 100644
+--- a/nonlib/dsp.C
++++ b/nonlib/dsp.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* General DSP related functions. */
+diff --git a/nonlib/dsp.h b/nonlib/dsp.h
+index 20c684e..699a25c 100644
+--- a/nonlib/dsp.h
++++ b/nonlib/dsp.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/nonlib/file.C b/nonlib/file.C
+index f52a481..f766b93 100644
+--- a/nonlib/file.C
++++ b/nonlib/file.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <fcntl.h>
+diff --git a/nonlib/file.h b/nonlib/file.h
+index a5de6e2..7eb34fd 100644
+--- a/nonlib/file.h
++++ b/nonlib/file.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdio.h>
+diff --git a/nonlib/string_util.C b/nonlib/string_util.C
+index e26b696..334ad3e 100644
+--- a/nonlib/string_util.C
++++ b/nonlib/string_util.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <string.h>
+diff --git a/nonlib/string_util.h b/nonlib/string_util.h
+index 1a43254..12ff155 100644
+--- a/nonlib/string_util.h
++++ b/nonlib/string_util.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ void unescape_url ( char *url );
+diff --git a/nonlib/types.h b/nonlib/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/nonlib/types.h
++++ b/nonlib/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/NSM.C b/sequencer/src/NSM.C
+index 8d4c26e..8785c1f 100644
+--- a/sequencer/src/NSM.C
++++ b/sequencer/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "NSM.H"
+diff --git a/sequencer/src/NSM.H b/sequencer/src/NSM.H
+index 0f787d8..7383971 100644
+--- a/sequencer/src/NSM.H
++++ b/sequencer/src/NSM.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/NSM/Client.C b/sequencer/src/NSM/Client.C
+index fae4b9c..0b91193 100644
+--- a/sequencer/src/NSM/Client.C
++++ b/sequencer/src/NSM/Client.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../debug.h"
+diff --git a/sequencer/src/NSM/Client.H b/sequencer/src/NSM/Client.H
+index f417944..eedb40b 100644
+--- a/sequencer/src/NSM/Client.H
++++ b/sequencer/src/NSM/Client.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/canvas.C b/sequencer/src/canvas.C
+index ba3509a..8075c35 100644
+--- a/sequencer/src/canvas.C
++++ b/sequencer/src/canvas.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is a generic double-buffering, optimizing canvas interface to
+diff --git a/sequencer/src/canvas.H b/sequencer/src/canvas.H
+index b715f17..24a4a0e 100644
+--- a/sequencer/src/canvas.H
++++ b/sequencer/src/canvas.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/common.h b/sequencer/src/common.h
+index 7c179a8..dbdbfff 100644
+--- a/sequencer/src/common.h
++++ b/sequencer/src/common.h
+@@ -15,7 +15,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ // #pragma once
+diff --git a/sequencer/src/const.h b/sequencer/src/const.h
+index 0eeb0d6..5f592da 100644
+--- a/sequencer/src/const.h
++++ b/sequencer/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/debug.C b/sequencer/src/debug.C
+index 47e46fe..19c52de 100644
+--- a/sequencer/src/debug.C
++++ b/sequencer/src/debug.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "debug.h"
+diff --git a/sequencer/src/debug.h b/sequencer/src/debug.h
+index 126d6fc..0ca41e6 100644
+--- a/sequencer/src/debug.h
++++ b/sequencer/src/debug.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* debug.h
+diff --git a/sequencer/src/grid.C b/sequencer/src/grid.C
+index 121f14b..7a3fc1c 100644
+--- a/sequencer/src/grid.C
++++ b/sequencer/src/grid.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "grid.H"
+diff --git a/sequencer/src/grid.H b/sequencer/src/grid.H
+index ca39d43..9bb3822 100644
+--- a/sequencer/src/grid.H
++++ b/sequencer/src/grid.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/gui/event_edit.fl b/sequencer/src/gui/event_edit.fl
+index d4c924b..c871502 100644
+--- a/sequencer/src/gui/event_edit.fl
++++ b/sequencer/src/gui/event_edit.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/sequencer/src/gui/ui.fl b/sequencer/src/gui/ui.fl
+index b46abc9..f727fb3 100644
+--- a/sequencer/src/gui/ui.fl
++++ b/sequencer/src/gui/ui.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/sequencer/src/instrument.C b/sequencer/src/instrument.C
+index ef14f24..3735569 100644
+--- a/sequencer/src/instrument.C
++++ b/sequencer/src/instrument.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/instrument.H b/sequencer/src/instrument.H
+index 350b644..5ec2cdb 100644
+--- a/sequencer/src/instrument.H
++++ b/sequencer/src/instrument.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/jack.C b/sequencer/src/jack.C
+index a42d241..49e2fc6 100644
+--- a/sequencer/src/jack.C
++++ b/sequencer/src/jack.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/main.C b/sequencer/src/main.C
+index a89cd96..c7a4378 100644
+--- a/sequencer/src/main.C
++++ b/sequencer/src/main.C
+@@ -13,7 +13,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software ; */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /**********************************************************************************/
+
+ #include <stdlib.h>
+diff --git a/sequencer/src/mapping.C b/sequencer/src/mapping.C
+index 47c9b8e..6caa221 100644
+--- a/sequencer/src/mapping.C
++++ b/sequencer/src/mapping.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "mapping.H"
+diff --git a/sequencer/src/mapping.H b/sequencer/src/mapping.H
+index e00cece..a937922 100644
+--- a/sequencer/src/mapping.H
++++ b/sequencer/src/mapping.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/non.H b/sequencer/src/non.H
+index 98453be..9941b80 100644
+--- a/sequencer/src/non.H
++++ b/sequencer/src/non.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/pattern.C b/sequencer/src/pattern.C
+index c21f7d9..30b3092 100644
+--- a/sequencer/src/pattern.C
++++ b/sequencer/src/pattern.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "pattern.H"
+diff --git a/sequencer/src/pattern.H b/sequencer/src/pattern.H
+index 3d2dab6..e317773 100644
+--- a/sequencer/src/pattern.H
++++ b/sequencer/src/pattern.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/phrase.C b/sequencer/src/phrase.C
+index 2d5ba68..072670d 100644
+--- a/sequencer/src/phrase.C
++++ b/sequencer/src/phrase.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "phrase.H"
+diff --git a/sequencer/src/phrase.H b/sequencer/src/phrase.H
+index 24cdd03..10b4858 100644
+--- a/sequencer/src/phrase.H
++++ b/sequencer/src/phrase.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/scale.C b/sequencer/src/scale.C
+index a14323b..43984e1 100644
+--- a/sequencer/src/scale.C
++++ b/sequencer/src/scale.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "scale.H"
+diff --git a/sequencer/src/scale.H b/sequencer/src/scale.H
+index 61f0ffb..e6f6a74 100644
+--- a/sequencer/src/scale.H
++++ b/sequencer/src/scale.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/sequence.C b/sequencer/src/sequence.C
+index c6a0c38..50bc264 100644
+--- a/sequencer/src/sequence.C
++++ b/sequencer/src/sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "sequence.H"
+diff --git a/sequencer/src/sequence.H b/sequencer/src/sequence.H
+index 321abd4..24925b5 100644
+--- a/sequencer/src/sequence.H
++++ b/sequencer/src/sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/smf.C b/sequencer/src/smf.C
+index 4ae2fb3..2aad8a4 100644
+--- a/sequencer/src/smf.C
++++ b/sequencer/src/smf.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "smf.H"
+diff --git a/sequencer/src/smf.H b/sequencer/src/smf.H
+index ad96db9..201b1da 100644
+--- a/sequencer/src/smf.H
++++ b/sequencer/src/smf.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/sequencer/src/transport.C b/sequencer/src/transport.C
+index e00ab67..02ece07 100644
+--- a/sequencer/src/transport.C
++++ b/sequencer/src/transport.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <jack/jack.h>
+diff --git a/sequencer/src/transport.H b/sequencer/src/transport.H
+index 68d7584..70afb24 100644
+--- a/sequencer/src/transport.H
++++ b/sequencer/src/transport.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/session-manager/src/jackpatch.c b/session-manager/src/jackpatch.c
+index fdb11b3..dfc8141 100644
+--- a/session-manager/src/jackpatch.c
++++ b/session-manager/src/jackpatch.c
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* jackpatch.c
+diff --git a/session-manager/src/nsm-proxy-gui.C b/session-manager/src/nsm-proxy-gui.C
+index ef02972..97269e5 100644
+--- a/session-manager/src/nsm-proxy-gui.C
++++ b/session-manager/src/nsm-proxy-gui.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+diff --git a/session-manager/src/nsm-proxy.C b/session-manager/src/nsm-proxy.C
+index 981c798..d02ac3f 100644
+--- a/session-manager/src/nsm-proxy.C
++++ b/session-manager/src/nsm-proxy.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+diff --git a/session-manager/src/nsmd.C b/session-manager/src/nsmd.C
+index a4c04e1..a9c7f5d 100644
+--- a/session-manager/src/nsmd.C
++++ b/session-manager/src/nsmd.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #define __MODULE__ "nsmd"
+diff --git a/session-manager/src/send_osc.C b/session-manager/src/send_osc.C
+index 609ce70..2f126cc 100644
+--- a/session-manager/src/send_osc.C
++++ b/session-manager/src/send_osc.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ // #include <lo/lo.h>
+diff --git a/session-manager/src/session-manager.C b/session-manager/src/session-manager.C
+index e296b86..e3abf50 100644
+--- a/session-manager/src/session-manager.C
++++ b/session-manager/src/session-manager.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/bin/import-ardour-session b/timeline/bin/import-ardour-session
+index 7640386..0bce32a 100755
+--- a/timeline/bin/import-ardour-session
++++ b/timeline/bin/import-ardour-session
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ import xml.etree.ElementTree as et
+ import random
+diff --git a/timeline/bin/import-external-sources b/timeline/bin/import-external-sources
+index 34b39eb..5c8be16 100755
+--- a/timeline/bin/import-external-sources
++++ b/timeline/bin/import-external-sources
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ ## import-external-sources
+ #
+diff --git a/timeline/bin/remove-unused-sources b/timeline/bin/remove-unused-sources
+index 798a1c0..5b5c7c2 100755
+--- a/timeline/bin/remove-unused-sources
++++ b/timeline/bin/remove-unused-sources
+@@ -14,7 +14,7 @@
+ # #
+ # You should have received a copy of the GNU General Public License along #
+ # with This program; see the file COPYING. If not,write to the Free Software #
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
++# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #
+
+ ## remove-unused-sources
+ #
+diff --git a/timeline/src/Annotation_Point.H b/timeline/src/Annotation_Point.H
+index aaec594..2a0c9c4 100644
+--- a/timeline/src/Annotation_Point.H
++++ b/timeline/src/Annotation_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Annotation_Region.C b/timeline/src/Annotation_Region.C
+index 83c374c..0fbac2b 100644
+--- a/timeline/src/Annotation_Region.C
++++ b/timeline/src/Annotation_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Tooltip.H>
+diff --git a/timeline/src/Annotation_Region.H b/timeline/src/Annotation_Region.H
+index 9d56da7..bf36210 100644
+--- a/timeline/src/Annotation_Region.H
++++ b/timeline/src/Annotation_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Annotation_Sequence.H b/timeline/src/Annotation_Sequence.H
+index 8c4d117..0dbd136 100644
+--- a/timeline/src/Annotation_Sequence.H
++++ b/timeline/src/Annotation_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Audio_Region.C b/timeline/src/Audio_Region.C
+index 49f4bd9..481a23e 100644
+--- a/timeline/src/Audio_Region.C
++++ b/timeline/src/Audio_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Audio_Region.H b/timeline/src/Audio_Region.H
+index fb142d8..0b6b07a 100644
+--- a/timeline/src/Audio_Region.H
++++ b/timeline/src/Audio_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Audio_Sequence.C b/timeline/src/Audio_Sequence.C
+index f8dddd5..8f2880b 100644
+--- a/timeline/src/Audio_Sequence.C
++++ b/timeline/src/Audio_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* An Audio_Sequence is a sequence of Audio_Regions. Takes and 'track
+diff --git a/timeline/src/Audio_Sequence.H b/timeline/src/Audio_Sequence.H
+index 756144a..3ec154e 100644
+--- a/timeline/src/Audio_Sequence.H
++++ b/timeline/src/Audio_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Clock.H b/timeline/src/Clock.H
+index 948b4c9..7126a5b 100644
+--- a/timeline/src/Clock.H
++++ b/timeline/src/Clock.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Control_Point.C b/timeline/src/Control_Point.C
+index c13f413..2de0f36 100644
+--- a/timeline/src/Control_Point.C
++++ b/timeline/src/Control_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Control_Point.H b/timeline/src/Control_Point.H
+index 171be96..0d98d6f 100644
+--- a/timeline/src/Control_Point.H
++++ b/timeline/src/Control_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Control_Sequence.C b/timeline/src/Control_Sequence.C
+index 503052e..b588189 100644
+--- a/timeline/src/Control_Sequence.C
++++ b/timeline/src/Control_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/timeline/src/Control_Sequence.H b/timeline/src/Control_Sequence.H
+index 38e9822..df14766 100644
+--- a/timeline/src/Control_Sequence.H
++++ b/timeline/src/Control_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Cursor_Point.C b/timeline/src/Cursor_Point.C
+index e953b16..6985823 100644
+--- a/timeline/src/Cursor_Point.C
++++ b/timeline/src/Cursor_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Cursor_Point.H b/timeline/src/Cursor_Point.H
+index 0cd05b6..a730c8c 100644
+--- a/timeline/src/Cursor_Point.H
++++ b/timeline/src/Cursor_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Cursor_Region.C b/timeline/src/Cursor_Region.C
+index 3c1be5c..8ef6137 100644
+--- a/timeline/src/Cursor_Region.C
++++ b/timeline/src/Cursor_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl_Tooltip.H>
+diff --git a/timeline/src/Cursor_Region.H b/timeline/src/Cursor_Region.H
+index 3290867..ff0d90d 100644
+--- a/timeline/src/Cursor_Region.H
++++ b/timeline/src/Cursor_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Cursor_Sequence.C b/timeline/src/Cursor_Sequence.C
+index 2f683e9..fb26edd 100644
+--- a/timeline/src/Cursor_Sequence.C
++++ b/timeline/src/Cursor_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Cursor_Sequence.H"
+diff --git a/timeline/src/Cursor_Sequence.H b/timeline/src/Cursor_Sequence.H
+index 57fe5f7..3d5f105 100644
+--- a/timeline/src/Cursor_Sequence.H
++++ b/timeline/src/Cursor_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File.C b/timeline/src/Engine/Audio_File.C
+index 0d70346..591cb83 100644
+--- a/timeline/src/Engine/Audio_File.C
++++ b/timeline/src/Engine/Audio_File.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File.H"
+diff --git a/timeline/src/Engine/Audio_File.H b/timeline/src/Engine/Audio_File.H
+index baeedee..5e0c172 100644
+--- a/timeline/src/Engine/Audio_File.H
++++ b/timeline/src/Engine/Audio_File.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File_Dummy.C b/timeline/src/Engine/Audio_File_Dummy.C
+index b91ede9..9e5b907 100644
+--- a/timeline/src/Engine/Audio_File_Dummy.C
++++ b/timeline/src/Engine/Audio_File_Dummy.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File_Dummy.H"
+diff --git a/timeline/src/Engine/Audio_File_Dummy.H b/timeline/src/Engine/Audio_File_Dummy.H
+index 331e3f9..4fa2e7e 100644
+--- a/timeline/src/Engine/Audio_File_Dummy.H
++++ b/timeline/src/Engine/Audio_File_Dummy.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_File_SF.C b/timeline/src/Engine/Audio_File_SF.C
+index a1ef61f..418ccf1 100644
+--- a/timeline/src/Engine/Audio_File_SF.C
++++ b/timeline/src/Engine/Audio_File_SF.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Audio_File_SF.H"
+diff --git a/timeline/src/Engine/Audio_File_SF.H b/timeline/src/Engine/Audio_File_SF.H
+index 8ab9a75..4fdf876 100644
+--- a/timeline/src/Engine/Audio_File_SF.H
++++ b/timeline/src/Engine/Audio_File_SF.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Audio_Region.C b/timeline/src/Engine/Audio_Region.C
+index e96e215..a7e48a3 100644
+--- a/timeline/src/Engine/Audio_Region.C
++++ b/timeline/src/Engine/Audio_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /**********/
+diff --git a/timeline/src/Engine/Audio_Sequence.C b/timeline/src/Engine/Audio_Sequence.C
+index cda9eda..ccb0cf4 100644
+--- a/timeline/src/Engine/Audio_Sequence.C
++++ b/timeline/src/Engine/Audio_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Audio_Sequence.H"
+diff --git a/timeline/src/Engine/Control_Sequence.C b/timeline/src/Engine/Control_Sequence.C
+index f334e65..fde8c0c 100644
+--- a/timeline/src/Engine/Control_Sequence.C
++++ b/timeline/src/Engine/Control_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Control_Sequence.H"
+diff --git a/timeline/src/Engine/Disk_Stream.C b/timeline/src/Engine/Disk_Stream.C
+index 7268e67..3456fa2 100644
+--- a/timeline/src/Engine/Disk_Stream.C
++++ b/timeline/src/Engine/Disk_Stream.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Track.H"
+diff --git a/timeline/src/Engine/Disk_Stream.H b/timeline/src/Engine/Disk_Stream.H
+index 7c3541b..7e3f4f6 100644
+--- a/timeline/src/Engine/Disk_Stream.H
++++ b/timeline/src/Engine/Disk_Stream.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Engine.C b/timeline/src/Engine/Engine.C
+index 3f7c84a..53529bd 100644
+--- a/timeline/src/Engine/Engine.C
++++ b/timeline/src/Engine/Engine.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Engine.H"
+diff --git a/timeline/src/Engine/Engine.H b/timeline/src/Engine/Engine.H
+index cf1d426..2f36973 100644
+--- a/timeline/src/Engine/Engine.H
++++ b/timeline/src/Engine/Engine.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Peak.H b/timeline/src/Engine/Peak.H
+index 8ee1529..d6ae610 100644
+--- a/timeline/src/Engine/Peak.H
++++ b/timeline/src/Engine/Peak.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Peaks.C b/timeline/src/Engine/Peaks.C
+index 0fa4dd9..5520c17 100644
+--- a/timeline/src/Engine/Peaks.C
++++ b/timeline/src/Engine/Peaks.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Engine/Peaks.H b/timeline/src/Engine/Peaks.H
+index c8d7612..5e43a12 100644
+--- a/timeline/src/Engine/Peaks.H
++++ b/timeline/src/Engine/Peaks.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Playback_DS.C b/timeline/src/Engine/Playback_DS.C
+index e5cf15d..3437c2c 100644
+--- a/timeline/src/Engine/Playback_DS.C
++++ b/timeline/src/Engine/Playback_DS.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Engine/Playback_DS.H b/timeline/src/Engine/Playback_DS.H
+index 128a745..6ef6caf 100644
+--- a/timeline/src/Engine/Playback_DS.H
++++ b/timeline/src/Engine/Playback_DS.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Disk_Stream.H"
+diff --git a/timeline/src/Engine/Record_DS.C b/timeline/src/Engine/Record_DS.C
+index 312ce74..09ae3e4 100644
+--- a/timeline/src/Engine/Record_DS.C
++++ b/timeline/src/Engine/Record_DS.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Handles streaming from track inputs to disk */
+diff --git a/timeline/src/Engine/Record_DS.H b/timeline/src/Engine/Record_DS.H
+index 054bbc6..8e1d08a 100644
+--- a/timeline/src/Engine/Record_DS.H
++++ b/timeline/src/Engine/Record_DS.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Engine/Timeline.C b/timeline/src/Engine/Timeline.C
+index 9bcfa0f..e33cbf7 100644
+--- a/timeline/src/Engine/Timeline.C
++++ b/timeline/src/Engine/Timeline.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Timeline.H"
+diff --git a/timeline/src/Engine/Track.C b/timeline/src/Engine/Track.C
+index 4bfdb5f..de385fd 100644
+--- a/timeline/src/Engine/Track.C
++++ b/timeline/src/Engine/Track.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "../Track.H"
+diff --git a/timeline/src/Engine/const.h b/timeline/src/Engine/const.h
+index 623ca48..96077d9 100644
+--- a/timeline/src/Engine/const.h
++++ b/timeline/src/Engine/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #define __MODULE__ "non-timeline:engine"
+diff --git a/timeline/src/Engine/types.h b/timeline/src/Engine/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/timeline/src/Engine/types.h
++++ b/timeline/src/Engine/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/NSM.C b/timeline/src/NSM.C
+index 28c702f..e71cdd7 100644
+--- a/timeline/src/NSM.C
++++ b/timeline/src/NSM.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "const.h"
+diff --git a/timeline/src/OSC_Thread.C b/timeline/src/OSC_Thread.C
+index 70fe6fe..edb0e49 100644
+--- a/timeline/src/OSC_Thread.C
++++ b/timeline/src/OSC_Thread.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "OSC_Thread.H"
+diff --git a/timeline/src/OSC_Thread.H b/timeline/src/OSC_Thread.H
+index d678028..f289933 100644
+--- a/timeline/src/OSC_Thread.H
++++ b/timeline/src/OSC_Thread.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Project.C b/timeline/src/Project.C
+index f92375f..bac1f1c 100644
+--- a/timeline/src/Project.C
++++ b/timeline/src/Project.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Routings for opening/closing/creation of projects. All the actual
+diff --git a/timeline/src/Project.H b/timeline/src/Project.H
+index a1a67a4..039af54 100644
+--- a/timeline/src/Project.H
++++ b/timeline/src/Project.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ const char template_dir[] = "share/non-daw/templates";
+diff --git a/timeline/src/RWLock.H b/timeline/src/RWLock.H
+index b21d945..c623942 100644
+--- a/timeline/src/RWLock.H
++++ b/timeline/src/RWLock.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Sequence.C b/timeline/src/Sequence.C
+index 9fd9a07..849cbcd 100644
+--- a/timeline/src/Sequence.C
++++ b/timeline/src/Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence.H"
+diff --git a/timeline/src/Sequence.H b/timeline/src/Sequence.H
+index c07b4f9..8167ec3 100644
+--- a/timeline/src/Sequence.H
++++ b/timeline/src/Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Sequence_Point.C b/timeline/src/Sequence_Point.C
+index afb8377..af8d5f4 100644
+--- a/timeline/src/Sequence_Point.C
++++ b/timeline/src/Sequence_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence_Point.H"
+diff --git a/timeline/src/Sequence_Point.H b/timeline/src/Sequence_Point.H
+index af64b46..618112a 100644
+--- a/timeline/src/Sequence_Point.H
++++ b/timeline/src/Sequence_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Sequence_Region.C b/timeline/src/Sequence_Region.C
+index c119467..6a0a8ed 100644
+--- a/timeline/src/Sequence_Region.C
++++ b/timeline/src/Sequence_Region.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Sequence_Region.H"
+diff --git a/timeline/src/Sequence_Region.H b/timeline/src/Sequence_Region.H
+index 8be8b81..c9ce7e9 100644
+--- a/timeline/src/Sequence_Region.H
++++ b/timeline/src/Sequence_Region.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Sequence_Widget.C b/timeline/src/Sequence_Widget.C
+index ea9a858..554fa5c 100644
+--- a/timeline/src/Sequence_Widget.C
++++ b/timeline/src/Sequence_Widget.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/fl_draw.H>
+diff --git a/timeline/src/Sequence_Widget.H b/timeline/src/Sequence_Widget.H
+index 210f72b..4029a1e 100644
+--- a/timeline/src/Sequence_Widget.H
++++ b/timeline/src/Sequence_Widget.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/TLE.fl b/timeline/src/TLE.fl
+index e54de7f..51450e8 100644
+--- a/timeline/src/TLE.fl
++++ b/timeline/src/TLE.fl
+@@ -17,7 +17,7 @@ comment {//
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ //
+ } {in_source in_header
+ }
+diff --git a/timeline/src/Tempo_Point.C b/timeline/src/Tempo_Point.C
+index 5848ffc..563b340 100644
+--- a/timeline/src/Tempo_Point.C
++++ b/timeline/src/Tempo_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Tempo_Point.H"
+diff --git a/timeline/src/Tempo_Point.H b/timeline/src/Tempo_Point.H
+index 8dd88d0..f1ebdfb 100644
+--- a/timeline/src/Tempo_Point.H
++++ b/timeline/src/Tempo_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Tempo_Sequence.C b/timeline/src/Tempo_Sequence.C
+index 50c16b3..ccbfbe3 100644
+--- a/timeline/src/Tempo_Sequence.C
++++ b/timeline/src/Tempo_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Tempo_Sequence.H"
+diff --git a/timeline/src/Tempo_Sequence.H b/timeline/src/Tempo_Sequence.H
+index 61f6498..b6cbcbc 100644
+--- a/timeline/src/Tempo_Sequence.H
++++ b/timeline/src/Tempo_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Time_Point.C b/timeline/src/Time_Point.C
+index 002c38c..6dfae5d 100644
+--- a/timeline/src/Time_Point.C
++++ b/timeline/src/Time_Point.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Time_Point.H"
+diff --git a/timeline/src/Time_Point.H b/timeline/src/Time_Point.H
+index 79665aa..bd98f55 100644
+--- a/timeline/src/Time_Point.H
++++ b/timeline/src/Time_Point.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Time_Sequence.C b/timeline/src/Time_Sequence.C
+index f877b8a..389c6ef 100644
+--- a/timeline/src/Time_Sequence.C
++++ b/timeline/src/Time_Sequence.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include "Time_Sequence.H"
+diff --git a/timeline/src/Time_Sequence.H b/timeline/src/Time_Sequence.H
+index 4e71a71..ffa5c52 100644
+--- a/timeline/src/Time_Sequence.H
++++ b/timeline/src/Time_Sequence.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Timeline.C b/timeline/src/Timeline.C
+index ccde2a1..d16cb1b 100644
+--- a/timeline/src/Timeline.C
++++ b/timeline/src/Timeline.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* This is the Timeline widget, which contains all the tracks and
+diff --git a/timeline/src/Timeline.H b/timeline/src/Timeline.H
+index 022c3af..8d75a2a 100644
+--- a/timeline/src/Timeline.H
++++ b/timeline/src/Timeline.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Track.C b/timeline/src/Track.C
+index 0e0ecf6..d3e215e 100644
+--- a/timeline/src/Track.C
++++ b/timeline/src/Track.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* A Track is a container for various sequences; the sequence, the
+diff --git a/timeline/src/Track.H b/timeline/src/Track.H
+index b2e0134..47f82cf 100644
+--- a/timeline/src/Track.H
++++ b/timeline/src/Track.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+diff --git a/timeline/src/Transport.C b/timeline/src/Transport.C
+index 27df7fd..62bba1e 100644
+--- a/timeline/src/Transport.C
++++ b/timeline/src/Transport.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* Controls the audio transport */
+diff --git a/timeline/src/Transport.H b/timeline/src/Transport.H
+index 8323222..b2c412c 100644
+--- a/timeline/src/Transport.H
++++ b/timeline/src/Transport.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/Waveform.C b/timeline/src/Waveform.C
+index a6bb8b9..fb48b04 100644
+--- a/timeline/src/Waveform.C
++++ b/timeline/src/Waveform.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ /* routines to draw a waveform from peak data */
+diff --git a/timeline/src/Waveform.H b/timeline/src/Waveform.H
+index eed7747..57407aa 100644
+--- a/timeline/src/Waveform.H
++++ b/timeline/src/Waveform.H
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+
+diff --git a/timeline/src/const.h b/timeline/src/const.h
+index 385b0ce..5a7e772 100644
+--- a/timeline/src/const.h
++++ b/timeline/src/const.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ extern const char *APP_NAME;
+diff --git a/timeline/src/main.C b/timeline/src/main.C
+index a341240..5010902 100644
+--- a/timeline/src/main.C
++++ b/timeline/src/main.C
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #include <FL/Fl.H>
+diff --git a/timeline/src/types.h b/timeline/src/types.h
+index cd3cc2c..1e9c8e3 100644
+--- a/timeline/src/types.h
++++ b/timeline/src/types.h
+@@ -14,7 +14,7 @@
+ /* */
+ /* You should have received a copy of the GNU General Public License along */
+ /* with This program; see the file COPYING. If not,write to the Free Software */
+-/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++/* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. */
+ /*******************************************************************************/
+
+ #pragma once
+--
+2.26.0.rc2
+
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
deleted file mode 100644
index 4f79787..0000000
--- a/non-daw-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
---- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
-+++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Non DAW
- Comment=Modular Digital Audio Workstation - Timeline Editor
--Exec=@BIN_PATH@/non-daw
-+Exec=non-daw
- Terminal=false
- Type=Application
- Icon=non-daw
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
index cc8a77b..e1fcdc6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,22 +1,22 @@
+%global commit0 bbe8386499621c8e60eebb06d80e966f13a69a95
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global commitdate 20200307
+
Name: non-daw
Version: 1.2.0
-Release: 18.git16885e69%{?dist}
+Release: 19.%{commitdate}git%{shortcommit0}%{?dist}
Summary: A digital audio workstation for JACK
-License: GPLv2+
-URL: http://non.tuxfamily.org/
-Source0: non-20160405-git16885e69.tar.bz2
-# sh non-snapshot.sh (rev>
-Source1: non-snapshot.sh
+License: GPLv2+ and ISC
+URL: https://non.tuxfamily.org/
+Source0: https://git.tuxfamily.org/non/non.git/snapshot/non-%{commit0}.tar.gz
# notified upstream of the following along with incorrect FSF address headers
-Patch1: non-daw-desktop.patch
-# rhbz 1317283
-Patch2: add-lib64-in-ladspa-search-path.patch
+Patch0: add-lib64-in-ladspa-search-path.patch
+Patch1: fix-fsf-address.patch
+# build optimization should be avoided in Fedora as Fedora has its own optimizations
+Patch2: remove-optimization-flags.patch
-BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
-BuildRequires: fltk-devel
-BuildRequires: fltk-fluid
BuildRequires: imake
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
@@ -28,42 +28,82 @@ BuildRequires: libvorbis-devel
BuildRequires: libXpm-devel
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
-BuildRequires: python2
+BuildRequires: python3
+BuildRequires: gcc-c++
+BuildRequires: %{_bindir}/pathfix.py
+BuildRequires: %{_bindir}/find
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description
Non-daw is a digital audio workstation for JACK
%package -n non-mixer
Summary: A digital audio mixer for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-mixer
non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+%package -n non-mixer-doc
+Summary: A digital audio mixer for JACK - Documentation
+
+%description -n non-mixer-doc
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+This package contains the documentation.
+
%package -n non-session-manager
Summary: A session manager for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
application state including JACK and MIDI connections between audio sessions.
+%package -n non-session-manager-doc
+Summary: A session manager for JACK - Documentation
+
+%description -n non-session-manager-doc
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+This package contains the documentation.
+
%package -n non-sequencer
Summary: A MIDI sequencer for JACK
+Requires: jack-audio-connection-kit
+Requires: hicolor-icon-theme
%description -n non-sequencer
non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
+%package -n non-sequencer-doc
+Summary: A MIDI sequencer for JACK - Documentation
+
+%description -n non-sequencer-doc
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
%prep
-%setup -q -n non-20160405
+%setup -q -n non-%{commit0}
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
+rm -rf lib
+pathfix.py -pni %{_bindir}/python3 waf $(find -name wscript)
%build
+%set_build_flags
+CXXFLAGS+=" -std=c++11"
+./waf configure --prefix=%{_prefix} --libdir=%{_libdir} \
%ifarch %{ix86} x86_64
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+
%else
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+--disable-sse
%endif
-./waf %{_smp_mflags} -v
+./waf build -v %{?_smp_mflags}
%install
./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
@@ -71,11 +111,15 @@ for i in %{buildroot}%{_datadir}/applications/*.desktop; do
sed -i -e 's|\/usr\/bin\/||' $i
desktop-file-validate $i;
done;
+# correct locations
+mv %{buildroot}%{_bindir}/bin/* %{buildrootdir}{_bindir}
# correct permissions
chmod 755 %{buildroot}%{_bindir}/*
+#NOTE: No manpages, all documentation is at http://non.tuxfamily.org/wiki/Documentation
+
%files
-%doc COPYING
+%license COPYING
%{_bindir}/import*
%{_bindir}/%{name}
%{_bindir}/non-timeline
@@ -85,40 +129,46 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-timeline
%files -n non-mixer
+%license COPYING
%{_bindir}/non-mixer
%{_bindir}/non-mixer-noui
%{_bindir}/non-midi-mapper
-%{_docdir}/non-mixer
%{_datadir}/applications/non-mixer.desktop
%{_datadir}/icons/hicolor/*/apps/non-mixer*
%{_datadir}/pixmaps/non-mixer
+%files -n non-mixer-doc
+%license COPYING
+%{_docdir}/non-mixer
+
%files -n non-session-manager
+%license COPYING
%{_bindir}/nsm*
%{_bindir}/jackpatch
%{_bindir}/non-session-manager
-%{_docdir}/non-session-manager
%{_datadir}/applications/non-session-manager.desktop
%{_datadir}/icons/hicolor/*/apps/non-session-manager*
%{_datadir}/pixmaps/non-session-manager
+%files -n non-session-manager-doc
+%license COPYING
+%{_docdir}/non-session-manager
+
%files -n non-sequencer
+%license COPYING
%{_bindir}/non-sequencer
-%{_docdir}/non-sequencer
%{_datadir}/non-sequencer
%{_datadir}/applications/non-sequencer.desktop
%{_datadir}/icons/hicolor/*/apps/non-sequencer*
%{_datadir}/pixmaps/non-sequencer
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%files -n non-sequencer-doc
+%license COPYING
+%{_docdir}/non-sequencer
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+%changelog
+* Sun Mar 08 2020 Erich Eickmeyer <erich(a)ericheickmeyer.com> - 1.2.0-19.20200307gitbbe83864
+- New git sync, built with waf built with python3
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/non-snapshot.sh b/non-snapshot.sh
deleted file mode 100644
index bc82db5..0000000
--- a/non-snapshot.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $1 - revision number to checkout.
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
- or fetch the latest revision by: `basename $0` HEAD"}
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-name=non
-version=20160405
-
-pushd "$tmp" >/dev/null
-echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
-ls
-pushd $name-$version
-git reset --hard $1
-rm -rf .git
-popd
-echo "Fetched git revision: $1"
-rm -f $name.stdout
-
-tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
-echo "Written: $name-$version-git$1.tar.bz2"
-popd >/dev/null
diff --git a/remove-optimization-flags.patch b/remove-optimization-flags.patch
new file mode 100644
index 0000000..ead7b64
--- /dev/null
+++ b/remove-optimization-flags.patch
@@ -0,0 +1,29 @@
+From d26ce26213e3ec1f3f2662d3f477c38ba92191a4 Mon Sep 17 00:00:00 2001
+Message-Id: <d26ce26213e3ec1f3f2662d3f477c38ba92191a4.1584830098.git.erich(a)ericheickmeyer.com>
+From: Erich Eickmeyer <erich(a)ericheickmeyer.com>
+Date: Sat, 21 Mar 2020 15:34:51 -0700
+Subject: [PATCH] remove-optimization-flags
+
+---
+ wscript | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index 7dd9857..9143ef6 100644
+--- a/wscript
++++ b/wscript
+@@ -89,10 +89,7 @@ def configure(conf):
+ conf.recurse(i)
+
+ optimization_flags = [
+- "-O3",
+- "-fomit-frame-pointer",
+- "-ffast-math",
+- "-pipe"
++ ""
+ ]
+
+ if Options.options.sse:
+--
+2.26.0.rc2
+
diff --git a/sources b/sources
index edd578e..c379e77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
+SHA512 (non-bbe8386499621c8e60eebb06d80e966f13a69a95.tar.gz) = 1a667b0648df37c6e04f9eefbeff2c2c73e5f6988965aa0bbda0b57e2a47cbd89a02e98acdcef9f3d98749144b5627c751d8f14952d14e37431c59823f0a2f0a
commit 06b3bccd5af7d333fb34e979f6178554bf156016
Author: Mohan Boddu <mboddu(a)bhujji.com>
Date: Thu Mar 26 12:57:42 2020 -0400
Revert "non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549"
Unretirement for https://pagure.io/releng/issue/9355
This reverts commit 4f5ca32ff1b65fd97747737d0f93c4ee5011231f.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b36417
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
+/non-daw-20131026-git13c3ca8.tar.bz2
+/non-20160405-git16885e69.tar.bz2
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
new file mode 100644
index 0000000..5bc905f
--- /dev/null
+++ b/add-lib64-in-ladspa-search-path.patch
@@ -0,0 +1,25 @@
+From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
+From: Yann Collette <ycollette.nospam(a)free.fr>
+Date: Sun, 13 Mar 2016 19:14:08 +0100
+Subject: [PATCH] add lib64 in ladspa search path
+
+---
+ mixer/src/LADSPAInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..150916e 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
+ cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
+ cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
+
+- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
++ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
+ }
+ }
+
+--
+2.5.0
+
diff --git a/dead.package b/dead.package
deleted file mode 100644
index b2e703b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
new file mode 100644
index 0000000..4f79787
--- /dev/null
+++ b/non-daw-desktop.patch
@@ -0,0 +1,14 @@
+diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
+--- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
++++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Non DAW
+ Comment=Modular Digital Audio Workstation - Timeline Editor
+-Exec=@BIN_PATH@/non-daw
++Exec=non-daw
+ Terminal=false
+ Type=Application
+ Icon=non-daw
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
new file mode 100644
index 0000000..cc8a77b
--- /dev/null
+++ b/non-daw.spec
@@ -0,0 +1,184 @@
+Name: non-daw
+Version: 1.2.0
+Release: 18.git16885e69%{?dist}
+Summary: A digital audio workstation for JACK
+
+License: GPLv2+
+URL: http://non.tuxfamily.org/
+Source0: non-20160405-git16885e69.tar.bz2
+# sh non-snapshot.sh (rev>
+Source1: non-snapshot.sh
+# notified upstream of the following along with incorrect FSF address headers
+Patch1: non-daw-desktop.patch
+# rhbz 1317283
+Patch2: add-lib64-in-ladspa-search-path.patch
+
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fltk-devel
+BuildRequires: fltk-fluid
+BuildRequires: imake
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
+BuildRequires: liblrdf-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXpm-devel
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
+BuildRequires: python2
+
+%description
+Non-daw is a digital audio workstation for JACK
+
+%package -n non-mixer
+Summary: A digital audio mixer for JACK
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary: A session manager for JACK
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary: A MIDI sequencer for JACK
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
+%prep
+%setup -q -n non-20160405
+%patch2 -p1
+
+%build
+%ifarch %{ix86} x86_64
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+%else
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+%endif
+./waf %{_smp_mflags} -v
+
+%install
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+ sed -i -e 's|\/usr\/bin\/||' $i
+ desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
+
+%files
+%doc COPYING
+%{_bindir}/import*
+%{_bindir}/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/jackpatch
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
+
+%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
+- Remove obsolete scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
+- Added BR: python2
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
+- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
+- Enable vorbis support
+- Put jackpatch in right sub package (rhbz 1336224)
+- Fix ladspa plugins search path (rhbz 1317283)
+
+* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
+- Fix up Release so upgrade path works correctly
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
+- rebuild (fltk)
+- non-session-manager: omit non-sensical Obsoletes
+- fix Release: tag
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
+* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
+- Unversioned doc dir changes
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
+- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
new file mode 100644
index 0000000..bc82db5
--- /dev/null
+++ b/non-snapshot.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+ or fetch the latest revision by: `basename $0` HEAD"}
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+name=non
+version=20160405
+
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
+ls
+pushd $name-$version
+git reset --hard $1
+rm -rf .git
+popd
+echo "Fetched git revision: $1"
+rm -f $name.stdout
+
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
+popd >/dev/null
diff --git a/sources b/sources
new file mode 100644
index 0000000..edd578e
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 4f5ca32ff1b65fd97747737d0f93c4ee5011231f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:13:19 2019 +0000
non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5b36417..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/non-daw-20121013-git61addce.tar.bz2
-/non-daw-20130902-git9fba8a8.tar.bz2
-/non-daw-20131026-git13c3ca8.tar.bz2
-/non-20160405-git16885e69.tar.bz2
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
deleted file mode 100644
index 5bc905f..0000000
--- a/add-lib64-in-ladspa-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
-From: Yann Collette <ycollette.nospam(a)free.fr>
-Date: Sun, 13 Mar 2016 19:14:08 +0100
-Subject: [PATCH] add lib64 in ladspa search path
-
----
- mixer/src/LADSPAInfo.C | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
-index 8fc611e..150916e 100644
---- a/mixer/src/LADSPAInfo.C
-+++ b/mixer/src/LADSPAInfo.C
-@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
- cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
- cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
-
-- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
-+ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
- }
- }
-
---
-2.5.0
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..b2e703b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
deleted file mode 100644
index 4f79787..0000000
--- a/non-daw-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
---- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
-+++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Non DAW
- Comment=Modular Digital Audio Workstation - Timeline Editor
--Exec=@BIN_PATH@/non-daw
-+Exec=non-daw
- Terminal=false
- Type=Application
- Icon=non-daw
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
deleted file mode 100644
index cc8a77b..0000000
--- a/non-daw.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-Name: non-daw
-Version: 1.2.0
-Release: 18.git16885e69%{?dist}
-Summary: A digital audio workstation for JACK
-
-License: GPLv2+
-URL: http://non.tuxfamily.org/
-Source0: non-20160405-git16885e69.tar.bz2
-# sh non-snapshot.sh (rev>
-Source1: non-snapshot.sh
-# notified upstream of the following along with incorrect FSF address headers
-Patch1: non-daw-desktop.patch
-# rhbz 1317283
-Patch2: add-lib64-in-ladspa-search-path.patch
-
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-BuildRequires: fltk-devel
-BuildRequires: fltk-fluid
-BuildRequires: imake
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: ladspa-devel
-BuildRequires: liblo-devel
-BuildRequires: liblrdf-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXpm-devel
-BuildRequires: non-ntk-devel
-BuildRequires: non-ntk-fluid
-BuildRequires: python2
-
-%description
-Non-daw is a digital audio workstation for JACK
-
-%package -n non-mixer
-Summary: A digital audio mixer for JACK
-
-%description -n non-mixer
-non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
-
-%package -n non-session-manager
-Summary: A session manager for JACK
-
-%description -n non-session-manager
-non-session-manager is an audio project session manager. It preserves
-application state including JACK and MIDI connections between audio sessions.
-
-%package -n non-sequencer
-Summary: A MIDI sequencer for JACK
-
-%description -n non-sequencer
-non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
-sequencer
-
-%prep
-%setup -q -n non-20160405
-%patch2 -p1
-
-%build
-%ifarch %{ix86} x86_64
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
-%else
-CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
-%endif
-./waf %{_smp_mflags} -v
-
-%install
-./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
-for i in %{buildroot}%{_datadir}/applications/*.desktop; do
- sed -i -e 's|\/usr\/bin\/||' $i
- desktop-file-validate $i;
-done;
-# correct permissions
-chmod 755 %{buildroot}%{_bindir}/*
-
-%files
-%doc COPYING
-%{_bindir}/import*
-%{_bindir}/%{name}
-%{_bindir}/non-timeline
-%{_docdir}/non-timeline
-%{_datadir}/applications/non-timeline.desktop
-%{_datadir}/icons/hicolor/*/apps/non-timeline*
-%{_datadir}/pixmaps/non-timeline
-
-%files -n non-mixer
-%{_bindir}/non-mixer
-%{_bindir}/non-mixer-noui
-%{_bindir}/non-midi-mapper
-%{_docdir}/non-mixer
-%{_datadir}/applications/non-mixer.desktop
-%{_datadir}/icons/hicolor/*/apps/non-mixer*
-%{_datadir}/pixmaps/non-mixer
-
-%files -n non-session-manager
-%{_bindir}/nsm*
-%{_bindir}/jackpatch
-%{_bindir}/non-session-manager
-%{_docdir}/non-session-manager
-%{_datadir}/applications/non-session-manager.desktop
-%{_datadir}/icons/hicolor/*/apps/non-session-manager*
-%{_datadir}/pixmaps/non-session-manager
-
-%files -n non-sequencer
-%{_bindir}/non-sequencer
-%{_docdir}/non-sequencer
-%{_datadir}/non-sequencer
-%{_datadir}/applications/non-sequencer.desktop
-%{_datadir}/icons/hicolor/*/apps/non-sequencer*
-%{_datadir}/pixmaps/non-sequencer
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
-- Remove obsolete scriptlets
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
-- Added BR: python2
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
-- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
-- Enable vorbis support
-- Put jackpatch in right sub package (rhbz 1336224)
-- Fix ladspa plugins search path (rhbz 1317283)
-
-* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
-- Fix up Release so upgrade path works correctly
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
-- rebuild (fltk)
-- non-session-manager: omit non-sensical Obsoletes
-- fix Release: tag
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
-- New source, adding additional sub packages, non-mixer
-- obsoletes non-session-manager, non-sequencer
-
-* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
-- Unversioned doc dir changes
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
-- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
deleted file mode 100644
index bc82db5..0000000
--- a/non-snapshot.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# $1 - revision number to checkout.
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
- or fetch the latest revision by: `basename $0` HEAD"}
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-name=non
-version=20160405
-
-pushd "$tmp" >/dev/null
-echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
-ls
-pushd $name-$version
-git reset --hard $1
-rm -rf .git
-popd
-echo "Fetched git revision: $1"
-rm -f $name.stdout
-
-tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
-echo "Written: $name-$version-git$1.tar.bz2"
-popd >/dev/null
diff --git a/sources b/sources
deleted file mode 100644
index edd578e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 531a1f8e8db4351b6fb73a5bf4db91c33be52d0f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 22:30:55 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 3409948..cc8a77b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 17.git16885e69%{?dist}
+Release: 18.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
License: GPLv2+
@@ -111,6 +111,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 0895151eaf13d3ab3a055dc023595839012630f2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 16:27:51 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 1bdbcd3..3409948 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 16.git16885e69%{?dist}
+Release: 17.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
License: GPLv2+
@@ -111,6 +111,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 24526ee961be1d8962195dbf73239ce66d2eb194
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:58 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/non-daw.spec b/non-daw.spec
index 29b970c..1bdbcd3 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -3,7 +3,6 @@ Version: 1.2.0
Release: 16.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
-Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
Source0: non-20160405-git16885e69.tar.bz2
@@ -36,14 +35,12 @@ Non-daw is a digital audio workstation for JACK
%package -n non-mixer
Summary: A digital audio mixer for JACK
-Group: Applications/Multimedia
%description -n non-mixer
non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
-Group: Applications/Multimedia
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -51,7 +48,6 @@ application state including JACK and MIDI connections between audio sessions.
%package -n non-sequencer
Summary: A MIDI sequencer for JACK
-Group: Applications/Multimedia
%description -n non-sequencer
non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
commit 3a3d787272c75e3d9f5b5d2769c879a09886eb3a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sat Jul 28 16:00:55 2018 +0200
BR: gcc-c++
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 30e3bd6..29b970c 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -14,6 +14,7 @@ Patch1: non-daw-desktop.patch
# rhbz 1317283
Patch2: add-lib64-in-ladspa-search-path.patch
+BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fltk-devel
BuildRequires: fltk-fluid
commit b3e39528336fbaa369c7d2404834c63e82901bc8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 14:27:33 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index ce043d0..30e3bd6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 15.git16885e69%{?dist}
+Release: 16.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -114,6 +114,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit adcb953fc9088cde687da829b19dc4d6c600dc0f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 8 08:22:01 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index 93fc46e..ce043d0 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 14.git16885e69%{?dist}
+Release: 15.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -114,6 +114,9 @@ chmod 755 %{buildroot}%{_bindir}/*
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
- Remove obsolete scriptlets
commit 14eb76d0601f985248667284d92f624d8c8c9b3d
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Thu Jan 18 20:58:20 2018 +0100
Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/non-daw.spec b/non-daw.spec
index b18b3ae..93fc46e 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 13.git16885e69%{?dist}
+Release: 14.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -77,20 +77,6 @@ done;
# correct permissions
chmod 755 %{buildroot}%{_bindir}/*
-%post
-update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-update-desktop-database -q
-if [ $1 -eq 0 ]; then
- touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc COPYING
%{_bindir}/import*
@@ -128,6 +114,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
+- Remove obsolete scriptlets
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 1b9e61c6156ea8d2fc79ee0186eabc1d24bccc3a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 04:03:53 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 8aae1dc..b18b3ae 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 12.git16885e69%{?dist}
+Release: 13.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -128,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 9da99cada93a65b9f89b5ba6d299bd75defdac2c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 01:14:41 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 70fb40d..8aae1dc 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 11.git16885e69%{?dist}
+Release: 12.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -128,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
- Added BR: python2
commit 2e59ec087867e0eecd280d3e2d9121ade87d79e6
Author: Orcan Ogetbil <orcan(a)localhost.localdomain>
Date: Fri Feb 17 00:18:37 2017 -0500
Added BR: python2
diff --git a/non-daw.spec b/non-daw.spec
index 610f6c9..70fb40d 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 10.git16885e69%{?dist}
+Release: 11.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -28,6 +28,7 @@ BuildRequires: libvorbis-devel
BuildRequires: libXpm-devel
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
+BuildRequires: python2
%description
Non-daw is a digital audio workstation for JACK
@@ -127,6 +128,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
+- Added BR: python2
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit ed4ad26a3b24ae82fbab6ef92ebc726ba1cf0bd8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 00:18:27 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 2fdf443..610f6c9 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 9.git16885e69%{?dist}
+Release: 10.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -127,6 +127,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
- Enable vorbis support
commit 47007462be1d6508c5f156ae5b24039c53c105b0
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sat Aug 20 14:24:23 2016 +0100
Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others), Enable vorbis support, Put jackpatch in right sub package (rhbz 1336224), Fix ladspa plugins search path (rhbz 1317283)
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
new file mode 100644
index 0000000..5bc905f
--- /dev/null
+++ b/add-lib64-in-ladspa-search-path.patch
@@ -0,0 +1,25 @@
+From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
+From: Yann Collette <ycollette.nospam(a)free.fr>
+Date: Sun, 13 Mar 2016 19:14:08 +0100
+Subject: [PATCH] add lib64 in ladspa search path
+
+---
+ mixer/src/LADSPAInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..150916e 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
+ cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
+ cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
+
+- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
++ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
+ }
+ }
+
+--
+2.5.0
+
diff --git a/non-daw.spec b/non-daw.spec
index d0053db..2fdf443 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 8.git16885e69%{?dist}
+Release: 9.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -11,22 +11,23 @@ Source0: non-20160405-git16885e69.tar.bz2
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
-# missing ladspa dependencies (temporarily)
-ExcludeArch: %{arm}
+# rhbz 1317283
+Patch2: add-lib64-in-ladspa-search-path.patch
-BuildRequires: non-ntk-devel
-BuildRequires: non-ntk-fluid
-BuildRequires: liblo-devel
-BuildRequires: libsndfile-devel
-BuildRequires: fltk-fluid
-BuildRequires: fltk-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: jack-audio-connection-kit-devel
BuildRequires: desktop-file-utils
+BuildRequires: fltk-devel
+BuildRequires: fltk-fluid
BuildRequires: imake
-BuildRequires: libXpm-devel
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
BuildRequires: liblrdf-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXpm-devel
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
%description
Non-daw is a digital audio workstation for JACK
@@ -56,9 +57,14 @@ sequencer
%prep
%setup -q -n non-20160405
+%patch2 -p1
%build
+%ifarch %{ix86} x86_64
CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+%else
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+%endif
./waf %{_smp_mflags} -v
%install
@@ -90,7 +96,6 @@ fi
%{_bindir}/%{name}
%{_bindir}/non-timeline
%{_docdir}/non-timeline
-%{_bindir}/jackpatch
%{_datadir}/applications/non-timeline.desktop
%{_datadir}/icons/hicolor/*/apps/non-timeline*
%{_datadir}/pixmaps/non-timeline
@@ -106,6 +111,7 @@ fi
%files -n non-session-manager
%{_bindir}/nsm*
+%{_bindir}/jackpatch
%{_bindir}/non-session-manager
%{_docdir}/non-session-manager
%{_datadir}/applications/non-session-manager.desktop
@@ -121,6 +127,12 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
+- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
+- Enable vorbis support
+- Put jackpatch in right sub package (rhbz 1336224)
+- Fix ladspa plugins search path (rhbz 1317283)
+
* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
- Fix up Release so upgrade path works correctly
commit ad2f3ba9faea2227cbb2d054927403e3892e5e1a
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Thu Aug 11 17:50:26 2016 +0100
Fix up Release so upgrade path works correctly
diff --git a/non-daw.spec b/non-daw.spec
index 2185a0c..d0053db 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 0.1.git16885e69%{?dist}
+Release: 8.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -121,6 +121,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
+- Fix up Release so upgrade path works correctly
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit 010ea05a95813567c39ea720a880e3ba6eb65f55
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Mon Apr 25 08:31:21 2016 +0200
Update to latest git
diff --git a/.gitignore b/.gitignore
index 39dcb47..5b36417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/non-daw-20121013-git61addce.tar.bz2
/non-daw-20130902-git9fba8a8.tar.bz2
/non-daw-20131026-git13c3ca8.tar.bz2
+/non-20160405-git16885e69.tar.bz2
diff --git a/non-daw.spec b/non-daw.spec
index cc59f33..2185a0c 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,16 +1,18 @@
Name: non-daw
Version: 1.2.0
-Release: 7.git13c3ca8%{?dist}
+Release: 0.1.git16885e69%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
-Source0: non-daw-20131026-git13c3ca8.tar.bz2
+Source0: non-20160405-git16885e69.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
+# missing ladspa dependencies (temporarily)
+ExcludeArch: %{arm}
BuildRequires: non-ntk-devel
BuildRequires: non-ntk-fluid
@@ -39,10 +41,6 @@ non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
Group: Applications/Multimedia
-## this can't work, maybe want something like:
-## Obsoletes: non-session-manager < 1.0.0-0.6
-## instead?? -- rex
-#Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -57,13 +55,11 @@ non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
%prep
-%setup -q -n non-daw-20131026
-sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
- wscript
+%setup -q -n non-20160405
%build
-CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-debug
-./waf -j4 -v
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+./waf %{_smp_mflags} -v
%install
./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
diff --git a/non-snapshot.sh b/non-snapshot.sh
index df91616..bc82db5 100644
--- a/non-snapshot.sh
+++ b/non-snapshot.sh
@@ -17,16 +17,15 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
name=non
-version=20130520
+version=20160405
pushd "$tmp" >/dev/null
echo "Fetching git revision: $1"
git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
+ls
pushd $name-$version
-# grab submodule
git reset --hard $1
-git clone git://git.tuxfamily.org/gitroot/non/fltk.git lib/ntk
-rm -rf lib/ntk/.git* .git*
+rm -rf .git
popd
echo "Fetched git revision: $1"
rm -f $name.stdout
diff --git a/sources b/sources
index 673eec9..edd578e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08008457dddcd3fedd32fb90fd3b7552 non-daw-20131026-git13c3ca8.tar.bz2
+b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
commit 8eb2bb69084dfb76ca69555db61c9133ee8e3381
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 4 10:52:44 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 8901cec..cc59f33 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 6.git13c3ca8%{?dist}
+Release: 7.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 3040fd519962c561d5664727eae9e9d0b6ca2cfd
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jun 17 23:19:33 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 7f6a716..8901cec 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 5.git13c3ca8%{?dist}
+Release: 6.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
- Rebuilt for GCC 5 C++11 ABI change
commit a3217dd92a13c5a5ea9867e815b8a9705f7d9f8b
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat May 2 16:15:06 2015 +0200
Rebuilt for GCC 5 C++11 ABI change
diff --git a/non-daw.spec b/non-daw.spec
index aeca0ef..7f6a716 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 4.git13c3ca8%{?dist}
+Release: 5.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -125,6 +125,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
+- Rebuilt for GCC 5 C++11 ABI change
+
* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
- rebuild (fltk)
- non-session-manager: omit non-sensical Obsoletes
commit ca1729969acecdc828498f7e6cdcc3b11a8c7c54
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Thu Feb 19 12:10:48 2015 -0600
1.2.0-4.git13c3ca8
- rebuild (fltk)
- non-session-manager: omit non-sensical Obsoletes
- fix Release: tag
diff --git a/non-daw.spec b/non-daw.spec
index 346d44b..aeca0ef 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 3.1.git13c3ca8%{?dist}
+Release: 4.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -39,7 +39,10 @@ non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
%package -n non-session-manager
Summary: A session manager for JACK
Group: Applications/Multimedia
-Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
+## this can't work, maybe want something like:
+## Obsoletes: non-session-manager < 1.0.0-0.6
+## instead?? -- rex
+#Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
%description -n non-session-manager
non-session-manager is an audio project session manager. It preserves
@@ -122,6 +125,11 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
+- rebuild (fltk)
+- non-session-manager: omit non-sensical Obsoletes
+- fix Release: tag
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit 5e126a62aac8753523600d9fe3f53dd596d08dd3
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Sun Aug 17 12:09:35 2014 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 435475b..346d44b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 2.1.git13c3ca8%{?dist}
+Release: 3.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -122,6 +122,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 2be8f584367f9b3f6d1db370d90a897e1ba68d24
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 09:59:28 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index dca2328..435475b 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.2.0
-Release: 1.1.git13c3ca8%{?dist}
+Release: 2.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -122,6 +122,9 @@ fi
%{_datadir}/pixmaps/non-sequencer
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
- New source, adding additional sub packages, non-mixer
- obsoletes non-session-manager, non-sequencer
commit 773314c3ebf126cf3332c9dc27c5e6cfc15ebec0
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Sat Oct 26 20:47:33 2013 +0200
Update to 1.2.0
diff --git a/.gitignore b/.gitignore
index 4624953..39dcb47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/non-daw-20121013-git61addce.tar.bz2
/non-daw-20130902-git9fba8a8.tar.bz2
+/non-daw-20131026-git13c3ca8.tar.bz2
diff --git a/non-daw.spec b/non-daw.spec
index bfd4dda..dca2328 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,12 +1,12 @@
Name: non-daw
-Version: 1.1.0
-Release: 0.5.git9fba8a8%{?dist}
+Version: 1.2.0
+Release: 1.1.git13c3ca8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
URL: http://non.tuxfamily.org/
-Source0: non-daw-20130902-git9fba8a8.tar.bz2
+Source0: non-daw-20131026-git13c3ca8.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
# notified upstream of the following along with incorrect FSF address headers
@@ -54,7 +54,7 @@ non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
sequencer
%prep
-%setup -q -n non-daw-20130902
+%setup -q -n non-daw-20131026
sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
wscript
diff --git a/sources b/sources
index c2b4cab..673eec9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7322bf08e70c076ab7a4b016c8c2e5a0 non-daw-20130902-git9fba8a8.tar.bz2
+08008457dddcd3fedd32fb90fd3b7552 non-daw-20131026-git13c3ca8.tar.bz2
commit 7bd22b4294c2797138ba2065b2eee2974f4ee1ba
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Tue Sep 3 20:34:13 2013 +0200
Update source, build new sub-packages
diff --git a/.gitignore b/.gitignore
index 1db5b9d..4624953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
index 6e187d4..4f79787 100644
--- a/non-daw-desktop.patch
+++ b/non-daw-desktop.patch
@@ -11,4 +11,4 @@ diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/tim
Type=Application
Icon=non-daw
-Categories=Application;AudioVideo;Audio;
-+Categories=Application;AudioVideo;Audio;X-Jack;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw-makefile.patch b/non-daw-makefile.patch
deleted file mode 100644
index 390675e..0000000
--- a/non-daw-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nurp non-daw-20121013/session-manager/configure non-daw-20121013.new/session-manager/configure
---- non-daw-20121013/session-manager/configure 2012-10-13 07:44:23.000000000 +0200
-+++ non-daw-20121013.new/session-manager/configure 2012-10-13 20:35:59.222308215 +0200
-@@ -27,15 +27,15 @@ test_version `version_of liblo` 0.26 ||
-
- end
-
--if ! hostname_resolvable
--then
-- echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
-- echo "This is a broken configuration and will cause liblo (the"
-- echo "OSC library) to fail to function. Add the line:"
-- echo
-- echo "127.0.0.1 $(hostname)"
-- echo
-- echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
-- echo
-- fail "Invalid hostname!"
--fi
-+#if ! hostname_resolvable
-+#then
-+# echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
-+# echo "This is a broken configuration and will cause liblo (the"
-+# echo "OSC library) to fail to function. Add the line:"
-+# echo
-+# echo "127.0.0.1 $(hostname)"
-+# echo
-+# echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
-+# echo
-+# fail "Invalid hostname!"
-+#fi
-diff -Nurp non-daw-20121013/timeline/makefile.inc non-daw-20121013.new/timeline/makefile.inc
---- non-daw-20121013/timeline/makefile.inc 2012-10-13 07:44:23.000000000 +0200
-+++ non-daw-20121013.new/timeline/makefile.inc 2012-10-13 09:50:37.844660915 +0200
-@@ -40,8 +40,8 @@ clean:
- install: all
- @ echo -n "Installing..."
- @ install src/timeline $(prefix)/bin/non-daw
-- @ mkdir -p $(SYSTEM_PATH)/non-daw
-- @ mkdir -p $(PIXMAP_PATH)/non-daw
-+ @ mkdir -p $(DESTDIR)$(SYSTEM_PATH)/non-daw
-+ @ mkdir -p $(DESTDIR)$(PIXMAP_PATH)/non-daw
- @ $(MAKE) -s -C doc install
- @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
- @ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
diff --git a/non-daw.spec b/non-daw.spec
index f25d5e6..bfd4dda 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,18 +1,19 @@
Name: non-daw
Version: 1.1.0
-Release: 0.4.gitae6b78cf%{?dist}
+Release: 0.5.git9fba8a8%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
License: GPLv2+
-URL: http://%{name}.tuxfamily.org/
-Source0: non-daw-20121013-git61addce.tar.bz2
-# script to create source tarball from git
+URL: http://non.tuxfamily.org/
+Source0: non-daw-20130902-git9fba8a8.tar.bz2
# sh non-snapshot.sh (rev>
Source1: non-snapshot.sh
-Patch0: non-daw-makefile.patch
+# notified upstream of the following along with incorrect FSF address headers
Patch1: non-daw-desktop.patch
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
BuildRequires: liblo-devel
BuildRequires: libsndfile-devel
BuildRequires: fltk-fluid
@@ -22,38 +23,53 @@ BuildRequires: jack-audio-connection-kit-devel
BuildRequires: desktop-file-utils
BuildRequires: imake
BuildRequires: libXpm-devel
+BuildRequires: ladspa-devel
+BuildRequires: liblrdf-devel
%description
Non-daw is a digital audio workstation for JACK
+%package -n non-mixer
+Summary: A digital audio mixer for JACK
+Group: Applications/Multimedia
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary: A session manager for JACK
+Group: Applications/Multimedia
+Obsoletes: non-session-manager%{?_isa} = 1.0.0-0.5.gitae6b78cf
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary: A MIDI sequencer for JACK
+Group: Applications/Multimedia
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
%prep
-%setup -q -n non-daw-20121013
-%patch0 -p1
-%patch1 -p1
-sed -i -e 's|src/timeline $(prefix)/bin/non-daw|src/timeline $(DESTDIR)$(prefix)/bin/non-daw|' timeline/makefile.inc
-sed -i -e 's|@ $(CXX)|$(CXX) %optflags|' \
- scripts/Makefile
+%setup -q -n non-daw-20130902
+sed -i -e "s|'-D_GNU_SOURCE' ]|'-D_GNU_SOURCE' ] +'%{optflags}'.split(' ')|" \
+ wscript
%build
-cd nonlib
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
-cd ../FL
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
-cd ../timeline
-%configure --prefix=%{_prefix} --enable-debug
-make %{?_smp_mflags}
+CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-debug
+./waf -j4 -v
%install
-cd timeline
-mkdir -p %{buildroot}%{_bindir}
-export DESTDIR=%{buildroot}
-make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
-%if 0%{?fedora} < 20
-mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
-%endif
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+ sed -i -e 's|\/usr\/bin\/||' $i
+ desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
%post
update-desktop-database -q
@@ -71,13 +87,45 @@ fi
%files
%doc COPYING
+%{_bindir}/import*
%{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/pixmaps/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_bindir}/jackpatch
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
%changelog
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
- Unversioned doc dir changes
diff --git a/non-snapshot.sh b/non-snapshot.sh
index 537996d..df91616 100644
--- a/non-snapshot.sh
+++ b/non-snapshot.sh
@@ -16,16 +16,17 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
-name=non-daw
-version=20121013
+name=non
+version=20130520
pushd "$tmp" >/dev/null
echo "Fetching git revision: $1"
-git clone git://git.tuxfamily.org/gitroot/non/daw.git $name-$version |tee $name.stdout
-ls
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
pushd $name-$version
+# grab submodule
git reset --hard $1
-rm -rf .git
+git clone git://git.tuxfamily.org/gitroot/non/fltk.git lib/ntk
+rm -rf lib/ntk/.git* .git*
popd
echo "Fetched git revision: $1"
rm -f $name.stdout
diff --git a/sources b/sources
index 040c124..c2b4cab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb624e8750dfda430ed1edeec14d9e0c non-daw-20121013-git61addce.tar.bz2
+7322bf08e70c076ab7a4b016c8c2e5a0 non-daw-20130902-git9fba8a8.tar.bz2
commit 4a634d0e5603301ef0d1f6a2a087b6f3b24ff0bc
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Mon Aug 12 10:24:39 2013 +0200
Unversioned doc dir changes
diff --git a/non-daw.spec b/non-daw.spec
index f8f1bb5..f25d5e6 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.3.gitae6b78cf%{?dist}
+Release: 0.4.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -50,7 +50,9 @@ cd timeline
mkdir -p %{buildroot}%{_bindir}
export DESTDIR=%{buildroot}
make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
+%if 0%{?fedora} < 20
mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
+%endif
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%post
@@ -76,6 +78,9 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
+- Unversioned doc dir changes
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit 48b1d48349ec62b380d04c4510a78e1a903ca7e3
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 09:22:38 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 3c7c966..f8f1bb5 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.2.gitae6b78cf%{?dist}
+Release: 0.3.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -76,6 +76,9 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit 25a5d422bcbbcd1b41dd287a80bb493a497017a8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Feb 14 02:41:54 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/non-daw.spec b/non-daw.spec
index 5ee738c..3c7c966 100644
--- a/non-daw.spec
+++ b/non-daw.spec
@@ -1,6 +1,6 @@
Name: non-daw
Version: 1.1.0
-Release: 0.1.gitae6b78cf%{?dist}
+Release: 0.2.gitae6b78cf%{?dist}
Summary: A digital audio workstation for JACK
Group: Applications/Multimedia
@@ -76,5 +76,8 @@ fi
%{_datadir}/pixmaps/%{name}
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
- Initial build
commit a2efb0ce4882d6129df6b7dce341d4b9a110fd36
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Sun Jan 13 22:43:20 2013 +0100
Initial import
diff --git a/.gitignore b/.gitignore
index e69de29..1db5b9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/non-daw-20121013-git61addce.tar.bz2
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
new file mode 100644
index 0000000..6e187d4
--- /dev/null
+++ b/non-daw-desktop.patch
@@ -0,0 +1,14 @@
+diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
+--- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
++++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Non DAW
+ Comment=Modular Digital Audio Workstation - Timeline Editor
+-Exec=@BIN_PATH@/non-daw
++Exec=non-daw
+ Terminal=false
+ Type=Application
+ Icon=non-daw
+-Categories=Application;AudioVideo;Audio;
++Categories=Application;AudioVideo;Audio;X-Jack;
diff --git a/non-daw-makefile.patch b/non-daw-makefile.patch
new file mode 100644
index 0000000..390675e
--- /dev/null
+++ b/non-daw-makefile.patch
@@ -0,0 +1,45 @@
+diff -Nurp non-daw-20121013/session-manager/configure non-daw-20121013.new/session-manager/configure
+--- non-daw-20121013/session-manager/configure 2012-10-13 07:44:23.000000000 +0200
++++ non-daw-20121013.new/session-manager/configure 2012-10-13 20:35:59.222308215 +0200
+@@ -27,15 +27,15 @@ test_version `version_of liblo` 0.26 ||
+
+ end
+
+-if ! hostname_resolvable
+-then
+- echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
+- echo "This is a broken configuration and will cause liblo (the"
+- echo "OSC library) to fail to function. Add the line:"
+- echo
+- echo "127.0.0.1 $(hostname)"
+- echo
+- echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
+- echo
+- fail "Invalid hostname!"
+-fi
++#if ! hostname_resolvable
++#then
++# echo "Your hostname \"$(hostname)\" does not resolve to a valid address."
++# echo "This is a broken configuration and will cause liblo (the"
++# echo "OSC library) to fail to function. Add the line:"
++# echo
++# echo "127.0.0.1 $(hostname)"
++# echo
++# echo "to your /etc/hosts file to fix. And consider switching to a saner distribution."
++# echo
++# fail "Invalid hostname!"
++#fi
+diff -Nurp non-daw-20121013/timeline/makefile.inc non-daw-20121013.new/timeline/makefile.inc
+--- non-daw-20121013/timeline/makefile.inc 2012-10-13 07:44:23.000000000 +0200
++++ non-daw-20121013.new/timeline/makefile.inc 2012-10-13 09:50:37.844660915 +0200
+@@ -40,8 +40,8 @@ clean:
+ install: all
+ @ echo -n "Installing..."
+ @ install src/timeline $(prefix)/bin/non-daw
+- @ mkdir -p $(SYSTEM_PATH)/non-daw
+- @ mkdir -p $(PIXMAP_PATH)/non-daw
++ @ mkdir -p $(DESTDIR)$(SYSTEM_PATH)/non-daw
++ @ mkdir -p $(DESTDIR)$(PIXMAP_PATH)/non-daw
+ @ $(MAKE) -s -C doc install
+ @ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
+ @ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
diff --git a/non-daw.spec b/non-daw.spec
new file mode 100644
index 0000000..5ee738c
--- /dev/null
+++ b/non-daw.spec
@@ -0,0 +1,80 @@
+Name: non-daw
+Version: 1.1.0
+Release: 0.1.gitae6b78cf%{?dist}
+Summary: A digital audio workstation for JACK
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://%{name}.tuxfamily.org/
+Source0: non-daw-20121013-git61addce.tar.bz2
+# script to create source tarball from git
+# sh non-snapshot.sh (rev>
+Source1: non-snapshot.sh
+Patch0: non-daw-makefile.patch
+Patch1: non-daw-desktop.patch
+
+BuildRequires: liblo-devel
+BuildRequires: libsndfile-devel
+BuildRequires: fltk-fluid
+BuildRequires: fltk-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: desktop-file-utils
+BuildRequires: imake
+BuildRequires: libXpm-devel
+
+%description
+Non-daw is a digital audio workstation for JACK
+
+%prep
+%setup -q -n non-daw-20121013
+%patch0 -p1
+%patch1 -p1
+sed -i -e 's|src/timeline $(prefix)/bin/non-daw|src/timeline $(DESTDIR)$(prefix)/bin/non-daw|' timeline/makefile.inc
+sed -i -e 's|@ $(CXX)|$(CXX) %optflags|' \
+ scripts/Makefile
+
+%build
+cd nonlib
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+cd ../FL
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+cd ../timeline
+%configure --prefix=%{_prefix} --enable-debug
+make %{?_smp_mflags}
+
+%install
+cd timeline
+mkdir -p %{buildroot}%{_bindir}
+export DESTDIR=%{buildroot}
+make install DOCUMENT_PATH=%{buildroot}/%{_docdir}/
+mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_docdir}/%{name}-%{version}
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%post
+update-desktop-database -q
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+
+%postun
+update-desktop-database -q
+if [ $1 -eq 0 ]; then
+ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files
+%doc COPYING
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/pixmaps/%{name}
+
+%changelog
+* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
+- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
new file mode 100644
index 0000000..537996d
--- /dev/null
+++ b/non-snapshot.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+ or fetch the latest revision by: `basename $0` HEAD"}
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+name=non-daw
+version=20121013
+
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/daw.git $name-$version |tee $name.stdout
+ls
+pushd $name-$version
+git reset --hard $1
+rm -rf .git
+popd
+echo "Fetched git revision: $1"
+rm -f $name.stdout
+
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
+popd >/dev/null
diff --git a/sources b/sources
index e69de29..040c124 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bb624e8750dfda430ed1edeec14d9e0c non-daw-20121013-git61addce.tar.bz2
1
0
26 Mar '20
The package rpms/non-daw.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/non-daw.git/commit/?id=06b3bccd5af7….
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 06b3bccd5af7d333fb34e979f6178554bf156016
Author: Mohan Boddu <mboddu(a)bhujji.com>
Date: Thu Mar 26 12:57:42 2020 -0400
Revert "non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549"
Unretirement for https://pagure.io/releng/issue/9355
This reverts commit 4f5ca32ff1b65fd97747737d0f93c4ee5011231f.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b36417
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/non-daw-20121013-git61addce.tar.bz2
+/non-daw-20130902-git9fba8a8.tar.bz2
+/non-daw-20131026-git13c3ca8.tar.bz2
+/non-20160405-git16885e69.tar.bz2
diff --git a/add-lib64-in-ladspa-search-path.patch b/add-lib64-in-ladspa-search-path.patch
new file mode 100644
index 0000000..5bc905f
--- /dev/null
+++ b/add-lib64-in-ladspa-search-path.patch
@@ -0,0 +1,25 @@
+From 019cc0c91a747be24c293d75e1688721400cae5b Mon Sep 17 00:00:00 2001
+From: Yann Collette <ycollette.nospam(a)free.fr>
+Date: Sun, 13 Mar 2016 19:14:08 +0100
+Subject: [PATCH] add lib64 in ladspa search path
+
+---
+ mixer/src/LADSPAInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mixer/src/LADSPAInfo.C b/mixer/src/LADSPAInfo.C
+index 8fc611e..150916e 100644
+--- a/mixer/src/LADSPAInfo.C
++++ b/mixer/src/LADSPAInfo.C
+@@ -81,7 +81,7 @@ LADSPAInfo::RescanPlugins(void)
+ cerr << "WARNING: LADSPA_PATH environment variable not set" << endl;
+ cerr << " Assuming /usr/lib/ladspa:/usr/local/lib/ladspa" << endl;
+
+- ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa", &LADSPAInfo::ExaminePluginLibrary);
++ ScanPathList("/usr/lib/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/local/lib64/ladspa", &LADSPAInfo::ExaminePluginLibrary);
+ }
+ }
+
+--
+2.5.0
+
diff --git a/dead.package b/dead.package
deleted file mode 100644
index b2e703b..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-non-daw fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675549
diff --git a/non-daw-desktop.patch b/non-daw-desktop.patch
new file mode 100644
index 0000000..4f79787
--- /dev/null
+++ b/non-daw-desktop.patch
@@ -0,0 +1,14 @@
+diff -Nurp non-daw-20120722/timeline/non-daw.desktop.in non-daw-20120722.upd/timeline/non-daw.desktop.in
+--- non-daw-20120722/timeline/non-daw.desktop.in 2012-07-24 09:18:38.000000000 +0200
++++ non-daw-20120722.upd/timeline/non-daw.desktop.in 2012-07-24 10:30:21.956785645 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Non DAW
+ Comment=Modular Digital Audio Workstation - Timeline Editor
+-Exec=@BIN_PATH@/non-daw
++Exec=non-daw
+ Terminal=false
+ Type=Application
+ Icon=non-daw
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;X-Jack;X-Mixer;
diff --git a/non-daw.spec b/non-daw.spec
new file mode 100644
index 0000000..cc8a77b
--- /dev/null
+++ b/non-daw.spec
@@ -0,0 +1,184 @@
+Name: non-daw
+Version: 1.2.0
+Release: 18.git16885e69%{?dist}
+Summary: A digital audio workstation for JACK
+
+License: GPLv2+
+URL: http://non.tuxfamily.org/
+Source0: non-20160405-git16885e69.tar.bz2
+# sh non-snapshot.sh (rev>
+Source1: non-snapshot.sh
+# notified upstream of the following along with incorrect FSF address headers
+Patch1: non-daw-desktop.patch
+# rhbz 1317283
+Patch2: add-lib64-in-ladspa-search-path.patch
+
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fltk-devel
+BuildRequires: fltk-fluid
+BuildRequires: imake
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
+BuildRequires: liblrdf-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXpm-devel
+BuildRequires: non-ntk-devel
+BuildRequires: non-ntk-fluid
+BuildRequires: python2
+
+%description
+Non-daw is a digital audio workstation for JACK
+
+%package -n non-mixer
+Summary: A digital audio mixer for JACK
+
+%description -n non-mixer
+non-mixer is a powerful, reliable and fast modular Digital Audio Mixer
+
+%package -n non-session-manager
+Summary: A session manager for JACK
+
+%description -n non-session-manager
+non-session-manager is an audio project session manager. It preserves
+application state including JACK and MIDI connections between audio sessions.
+
+%package -n non-sequencer
+Summary: A MIDI sequencer for JACK
+
+%description -n non-sequencer
+non-sequencer is a powerful, lightweight, real-time, pattern-based MIDI
+sequencer
+
+%prep
+%setup -q -n non-20160405
+%patch2 -p1
+
+%build
+%ifarch %{ix86} x86_64
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
+%else
+CXXFLAGS="%{optflags} -std=c++11" ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-sse
+%endif
+./waf %{_smp_mflags} -v
+
+%install
+./waf install --destdir=%{buildroot} --docdir=%{buildroot}/%{_docdir}/
+for i in %{buildroot}%{_datadir}/applications/*.desktop; do
+ sed -i -e 's|\/usr\/bin\/||' $i
+ desktop-file-validate $i;
+done;
+# correct permissions
+chmod 755 %{buildroot}%{_bindir}/*
+
+%files
+%doc COPYING
+%{_bindir}/import*
+%{_bindir}/%{name}
+%{_bindir}/non-timeline
+%{_docdir}/non-timeline
+%{_datadir}/applications/non-timeline.desktop
+%{_datadir}/icons/hicolor/*/apps/non-timeline*
+%{_datadir}/pixmaps/non-timeline
+
+%files -n non-mixer
+%{_bindir}/non-mixer
+%{_bindir}/non-mixer-noui
+%{_bindir}/non-midi-mapper
+%{_docdir}/non-mixer
+%{_datadir}/applications/non-mixer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-mixer*
+%{_datadir}/pixmaps/non-mixer
+
+%files -n non-session-manager
+%{_bindir}/nsm*
+%{_bindir}/jackpatch
+%{_bindir}/non-session-manager
+%{_docdir}/non-session-manager
+%{_datadir}/applications/non-session-manager.desktop
+%{_datadir}/icons/hicolor/*/apps/non-session-manager*
+%{_datadir}/pixmaps/non-session-manager
+
+%files -n non-sequencer
+%{_bindir}/non-sequencer
+%{_docdir}/non-sequencer
+%{_datadir}/non-sequencer
+%{_datadir}/applications/non-sequencer.desktop
+%{_datadir}/icons/hicolor/*/apps/non-sequencer*
+%{_datadir}/pixmaps/non-sequencer
+
+%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-18.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-17.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-16.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-15.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.2.0-14.git16885e69
+- Remove obsolete scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-13.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-12.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 16 2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2.0-11.git16885e69
+- Added BR: python2
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-10.git16885e69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Aug 20 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-9.git16885e69
+- Disable SSE on non x86 arches (fixes FTBFS on ARMv7 and others)
+- Enable vorbis support
+- Put jackpatch in right sub package (rhbz 1336224)
+- Fix ladspa plugins search path (rhbz 1317283)
+
+* Thu Aug 11 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.2.0-8.git16885e69
+- Fix up Release so upgrade path works correctly
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-7.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-6.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.2.0-5.git13c3ca8
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Feb 19 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 1.2.0-4.git13c3ca8
+- rebuild (fltk)
+- non-session-manager: omit non-sensical Obsoletes
+- fix Release: tag
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-3.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2.1.git13c3ca8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Sep 03 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.5.git9fba8a8
+- New source, adding additional sub packages, non-mixer
+- obsoletes non-session-manager, non-sequencer
+
+* Mon Aug 12 2013 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.4.gitae6b78cf
+- Unversioned doc dir changes
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.3.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-0.2.gitae6b78cf
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Oct 13 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 1.1.0-0.1.gitae6b78cf
+- Initial build
diff --git a/non-snapshot.sh b/non-snapshot.sh
new file mode 100644
index 0000000..bc82db5
--- /dev/null
+++ b/non-snapshot.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# $1 - revision number to checkout.
+: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
+ or fetch the latest revision by: `basename $0` HEAD"}
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+name=non
+version=20160405
+
+pushd "$tmp" >/dev/null
+echo "Fetching git revision: $1"
+git clone git://git.tuxfamily.org/gitroot/non/non.git $name-$version |tee $name.stdout
+ls
+pushd $name-$version
+git reset --hard $1
+rm -rf .git
+popd
+echo "Fetched git revision: $1"
+rm -f $name.stdout
+
+tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version
+echo "Written: $name-$version-git$1.tar.bz2"
+popd >/dev/null
diff --git a/sources b/sources
new file mode 100644
index 0000000..edd578e
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b6f50f19d81279f6d620326fb177addc non-20160405-git16885e69.tar.bz2
1
0
Architecture specific change in rpms/eclipse-tm-terminal.git
by githook-noreply＠fedoraproject.org 26 Mar '20
by githook-noreply＠fedoraproject.org 26 Mar '20
26 Mar '20
The package rpms/eclipse-tm-terminal.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-tm-terminal.git/commit/?id=….
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 6ec0857b96fc7d6718d2341850660d7443d7ebba
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Mar 26 16:32:41 2020 +0000
This package was subsumed into eclipse-cdt
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fcdd0f6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/org.eclipse.tm.terminal-*.tar.xz
-/*.src.rpm
-/org.eclipse.tm-6b04c544d33c31b1f3da168d0e606d8d20ed541d.tar.xz
-/org.eclipse.tm-3ba744c9c82dcd8df82263254431180b7db6e93a.tar.xz
diff --git a/0001-Fix-feature-includes.patch b/0001-Fix-feature-includes.patch
deleted file mode 100644
index 5a78b2c..0000000
--- a/0001-Fix-feature-includes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 92ce1ecdedfeb73eb3c995dc01733fea299b55fb Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth(a)redhat.com>
-Date: Thu, 14 Mar 2019 17:08:53 +0000
-Subject: [PATCH] Fix feature includes
-
----
- rse/features/org.eclipse.rse.ftp-feature/feature.xml | 9 +--------
- rse/features/org.eclipse.rse.telnet-feature/feature.xml | 8 +-------
- .../org.eclipse.tm.terminal.view.feature/feature.xml | 2 --
- .../org.eclipse.tm.terminal.view.rse.feature/feature.xml | 3 ---
- 4 files changed, 2 insertions(+), 20 deletions(-)
-
-diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
-index 4db815c..9a779f5 100644
---- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
-+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
-@@ -37,19 +37,12 @@
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.console"/>
-- <import plugin="org.apache.commons.net" version="2.0.0" match="greaterOrEqual"/>
-+ <import plugin="org.apache.commons.net"/>
- <import plugin="org.eclipse.rse.services"/>
- <import plugin="org.eclipse.rse.subsystems.files.core"/>
- <import plugin="org.eclipse.rse.ui"/>
- </requires>
-
-- <plugin
-- id="org.apache.commons.net"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- <plugin
- id="org.eclipse.rse.services.files.ftp"
- download-size="0"
-diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
-index 61487db..6b16ace 100644
---- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
-+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
-@@ -41,15 +41,9 @@
- <import plugin="org.eclipse.rse.subsystems.files.core"/>
- <import plugin="org.eclipse.rse.subsystems.shells.core"/>
- <import plugin="org.eclipse.rse.ui"/>
-+ <import plugin="org.apache.commons.net"/>
- </requires>
-
-- <plugin
-- id="org.apache.commons.net"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- <plugin
- id="org.eclipse.rse.connectorservice.telnet"
- download-size="0"
-diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
-index 6e53196..ab7c658 100644
---- a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
-+++ b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
-@@ -33,8 +33,6 @@
- <requires>
- <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-- <import plugin="org.eclipse.tm.terminal.view.core"/>
-- <import plugin="org.eclipse.tm.terminal.control"/>
- <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
- </requires>
-
-diff --git a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
-index 35a974a..c4f43ba 100644
---- a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
-+++ b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
-@@ -36,11 +36,8 @@
- <import plugin="org.eclipse.rse.core"/>
- <import plugin="org.eclipse.rse.subsystems.files.core"/>
- <import plugin="org.eclipse.rse.ui"/>
-- <import plugin="org.eclipse.tm.terminal.view.core"/>
-- <import plugin="org.eclipse.tm.terminal.control"/>
- <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.tm.terminal.view.feature"/>
-- <import plugin="org.eclipse.tm.terminal.view.ui"/>
- </requires>
-
- <plugin
---
-2.20.1
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..48da440
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was subsumed into eclipse-cdt
diff --git a/eclipse-rse-server-auth-pl.patch b/eclipse-rse-server-auth-pl.patch
deleted file mode 100644
index a4d7a4b..0000000
--- a/eclipse-rse-server-auth-pl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl.fix 2011-12-01 15:38:49.000000000 -0500
-+++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl 2011-12-01 15:39:30.000000000 -0500
-@@ -13,9 +13,12 @@
- # David McKnight (IBM) - [254785] [dstore] RSE Server assumes home directory on target machine
- # David McKnight (IBM) - [262013] [dstore][unix] RSE Daemon fails to start server on HP-UX
- # David McKnight (IBM) - [270833] Unify rseserver auth.pl to not use "su -p" on any Platform
-+# Jeff Johnston (Red Hat) - [364859] Support Kerberos
- #*******************************************************************************
-
- use Shell;
-+use Authen::PAM;
-+use POSIX qw(ttyname);
-
- if (!defined($ARGV[0]) || !defined($ARGV[1]) || !defined($ARGV[2]) || !defined($ARGV[3]) || !defined($ARGV[4]))
- {
-@@ -44,7 +47,23 @@ else
- chomp($pwdIN);
-
-
-- @passwdStruct = getpwnam($userIN);
-+ @passwdStruct = getpwnam($userIN);
-+
-+ sub my_conv_func {
-+ my @res;
-+ while ( @_ ) {
-+ my $code = shift;
-+ my $msg = shift;
-+ my $ans = "";
-+
-+ $ans = $userIN if ($code == PAM_PROMPT_ECHO_ON() );
-+ $ans = $pwdIN if ($code == PAM_PROMPT_ECHO_OFF() );
-+
-+ push @res, (PAM_SUCCESS(),$ans);
-+ }
-+ push @res, PAM_SUCCESS();
-+ return @res;
-+ }
-
- if (@passwdStruct == 0)
- {
-@@ -53,15 +72,21 @@ else
- }
- else
- {
-- $passwd=$passwdStruct[1];
- $dir=$passwdStruct[7]; # get the user's home dir
-- #$passwd = $pass;
--
-- $encryptedPWD = crypt($pwdIN, $passwd);
-+ # now authenticate the password using Authen::PAM instead
-+ # of using passwd in passwdStruct because it does not support
-+ # kerberos
-+ $service="login";
-+ $tty_name = ttyname(fileno(STDIN));
-+ ref($pamh = new Authen::PAM($service, $userIN, \&my_conv_func)) ||
-+ die "Error code $pamh during PAM init!";
-+
-+ $res = $pamh->pam_set_item(PAM_TTY(), $tty_name);
-+ $res = $pamh->pam_authenticate;
- $classpath=$ENV{CLASSPATH};
- $suOptions="-";
-
-- if ($passwd eq $encryptedPWD)
-+ if ($res == PAM_SUCCESS())
- {
- print("success\n");
-
diff --git a/eclipse-rse-server-scripts.patch b/eclipse-rse-server-scripts.patch
deleted file mode 100644
index 4335b88..0000000
--- a/eclipse-rse-server-scripts.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties.fix 2011-12-14 17:55:18.000000000 -0500
-+++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties 2011-12-14 17:59:39.000000000 -0500
-@@ -40,7 +40,12 @@ disable_server_ssl=false
- ###################################
- # The keystore file and password need to be specified for the
- # server to use. If none is specified, the server falls back
--# to use the same keystore and password as the daemon
-+# to use the same keystore and password as the daemon. Note
-+# that the server uses the home directory of the userid as its
-+# working directory so a relative path will only work for both
-+# daemon and server if the keystore file is copied. A full path
-+# is required to share a single keystore file between server and
-+# daemon.
- #
- #server_keystore_file=
--#server_keystore_password=
-\ No newline at end of file
-+#server_keystore_password=
---- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl.fix 2011-12-05 18:58:17.000000000 -0500
-+++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl 2011-12-13 19:02:13.000000000 -0500
-@@ -45,16 +45,17 @@ else
- $trace = $ENV{DSTORE_TRACING_ON};
- }
-
-- $dir= $ENV{PWD};
-- $plugins_dir=$dir;
-+ $dir= "$ENV{PWD}";
-+ $configdir= "/etc/sysconfig/rseserver/";
-+ $plugins_dir="/usr/share/java/eclipse-rse-server";
-
-- $ENV{A_PLUGIN_PATH}="$plugins_dir/";
-+ $ENV{A_PLUGIN_PATH}="$dir/";
-
-
- $oldClasspath = $ENV{CLASSPATH};
-
-
-- $ENV{CLASSPATH}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar";
-+ $ENV{CLASSPATH}="$dir:$configdir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar";
- if (defined ($oldClasspath))
- {
- $ENV{CLASSPATH}="$ENV{CLASSPATH}:$oldClasspath";
---- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl.fix 2011-12-05 18:58:21.000000000 -0500
-+++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl 2011-12-06 18:16:23.000000000 -0500
-@@ -17,18 +17,17 @@ $port = $ARGV[0];
- $timeout = $ARGV[1];
- $clientUserID = $ARGV[2];
-
--$dir= $ENV{PWD};
--#print("path $dir");
-+$dir="$ENV{PWD}";
-+$configdir="/etc/sysconfig/rseserver";
-
--#$plugins_dir=substr($dir,0,rindex($dir,"/"));
--$plugins_dir=$dir;
-+$plugins_dir="/usr/share/java/eclipse-rse-server";
-
- $ENV{A_PLUGIN_PATH}="$plugins_dir/";
-
- $oldClasspath = $ENV{CLASSPATH};
-
-
--$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
-+$ENV{"CLASSPATH"}="$dir:$configdir:$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
-
- if (!defined($timeout))
- {
-@@ -46,4 +45,4 @@ else
- }
- }
-
--$ENV{CLASSPATH}=$oldClasspath;
-\ No newline at end of file
-+$ENV{CLASSPATH}=$oldClasspath;
diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
deleted file mode 100644
index 43a7547..0000000
--- a/eclipse-tm-terminal.spec
+++ /dev/null
@@ -1,235 +0,0 @@
-%global git_tag 3ba744c9c82dcd8df82263254431180b7db6e93a
-
-# Set this to avoid building CDT and remotes bundles to eliminate
-# a circular dep on CDT->tm-terminal->remote->CDT
-%bcond_with bootstrap
-
-Name: eclipse-tm-terminal
-Version: 4.5.102
-Release: 2%{?dist}
-Summary: Terminal plug-in for Eclipse
-
-License: EPL-2.0
-URL: https://www.eclipse.org/tm/
-Source0: https://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/org.eclipse.tm-%{g…
-
-Patch0: 0001-Fix-feature-includes.patch
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-BuildRequires: tycho-extras
-BuildRequires: apache-commons-net
-BuildRequires: eclipse-egit
-BuildRequires: eclipse-license2
-%if %{without bootstrap}
-# Needed for additional terminal connectors
-BuildRequires: eclipse-cdt
-BuildRequires: eclipse-remote
-BuildRequires: rxtx >= 2.2-0.15
-%endif
-
-# Obsoletes/Provides added in F30
-Obsoletes: eclipse-rse < %{version}-%{release}
-Obsoletes: eclipse-rse-server < %{version}-%{release}
-Obsoletes: %{name}-rse < %{version}-%{release}
-
-%description
-An integrated Eclipse View for the local command prompt (console) or
-remote hosts (SSH, Telnet, Serial).
-
-%if %{without bootstrap}
-%package connectors
-Summary: Additional connectors for Terminal plug-in for Eclipse
-
-%description connectors
-Additional connectors for Terminal plug-in for Eclipse.
-%endif
-
-%package sdk
-Summary: Terminal SDK plug-in for Eclipse
-Requires: %{name} = %{version}-%{release}
-%if %{without bootstrap}
-Requires: %{name}-connectors = %{version}-%{release}
-%endif
-
-%description sdk
-Sources and developer resources for the Terminal plug-in for Eclipse.
-
-%prep
-%setup -q -n org.eclipse.tm-%{git_tag}
-%patch0 -p1
-
-# Don't need to build repo for RPM builds
-%pom_disable_module site
-%pom_remove_plugin :target-platform-configuration
-%pom_remove_plugin :tycho-packaging-plugin
-
-# Fixup erroneous license info, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=538094
-sed -i -e '/license-feature-version/s/1\.0\.1\.qualifier/0.0.0/' \
- $(find -name feature.xml)
-
-# Don't ship tests, examples, etc
-%pom_disable_module org.eclipse.tm.terminal.test terminal/plugins
-
-# Don't build and ship obsolete RSE plugins
-%pom_disable_module rse
-%pom_disable_module org.eclipse.tm.terminal.view.ui.rse terminal/plugins
-%pom_disable_module org.eclipse.tm.terminal.view.rse.feature terminal/features
-%pom_disable_module org.eclipse.tm.terminal.view.rse.sdk.feature terminal/features
-
-# When bootstrapping, disable the plugins and features that
-# create cyclical dependencies
-%if %{with bootstrap}
-%pom_disable_module org.eclipse.tm.terminal.connector.process terminal/plugins
-%pom_disable_module org.eclipse.tm.terminal.connector.local terminal/plugins
-%pom_disable_module org.eclipse.tm.terminal.connector.local.feature terminal/features
-%pom_disable_module org.eclipse.tm.terminal.connector.local.sdk.feature terminal/features
-%pom_disable_module org.eclipse.tm.terminal.connector.remote terminal/plugins
-%pom_disable_module org.eclipse.tm.terminal.connector.remote.feature terminal/features
-%pom_disable_module org.eclipse.tm.terminal.connector.remote.sdk.feature terminal/features
-%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.sdk.feature']" \
- terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml
-%endif
-
-# Remove cycles between subpackages
-%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.feature']" \
- terminal/features/org.eclipse.tm.terminal.feature/feature.xml
-
-# Fix trying to include non-existent files
-sed -i -e "s|feature.properties,\\\|feature.properties|g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties
-sed -i -e "s|p2.inf||g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties
-
-# Enable serial connector
-sed -i -e '/<modules>/s/<!-- Bug 536800 remove from reactor//' -e '/modules>/s/-->//' \
- terminal/{plugins,features}/pom.xml
-
-# No need to install poms
-%mvn_package "::pom::" __noinstall
-%mvn_package "::jar:sources{,-feature}:" sdk
-%mvn_package ":*.sdk.feature" sdk
-%mvn_package ":*.sdk" sdk
-%mvn_package ":org.eclipse.tm.terminal.connector.{local,process,remote,cdtserial,serial}*" connectors
-%mvn_package ":"
-
-%build
-%if %{without bootstrap}
-%mvn_build -j -- -Pcdtserial,rxtxserial
-%else
-%mvn_build -j -- -P"!cdtserial,!rxtxserial"
-%endif
-
-%install
-%mvn_install
-
-%files -f .mfiles
-
-%if %{without bootstrap}
-%files connectors -f .mfiles-connectors
-%endif
-
-%files sdk -f .mfiles-sdk
-
-%changelog
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.5.102-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Sep 16 2019 Mat Booth <mat.booth(a)redhat.com> - 4.5.102-1
-- Update to latest upstream release
-- Retire obsolete RSE plugins
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.5.100-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 4.5.100-1
-- Update to 2019-03 release
-- Update license tag
-- Add RSE subpackage and obsolete the old one since the projects
- were merged
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug 22 2018 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-4
-- Actually update license tag
-
-* Wed Aug 22 2018 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-3
-- Update license tag
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 11 2018 Mat Booth <mat.booth(a)redhat.com> - 4.4.0-1
-- Update to photon release
-
-* Wed Mar 21 2018 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-1
-- Add patch to add API to read TextCanvas content
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-0.4.gitfa298da
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.0-0.3.gitfa298da
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 19 2017 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-0.2.gitfa298da
-- Allow conditionally building against cdt and remote
-
-* Sun Jun 18 2017 Mat Booth <mat.booth(a)redhat.com> - 4.3.0-0.1.gitfa298da
-- Update to Oxygen snapshot
-
-* Fri Mar 31 2017 Mat Booth <mat.booth(a)redhat.com> - 4.2.0-2
-- Build serial port bundles, resolves rhbz#1272785
-
-* Wed Mar 29 2017 Mat Booth <mat.booth(a)redhat.com> - 4.2.0-1
-- Update to latest upstream release
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Aug 12 2016 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-3
-- Split out remote connecter, which requires CDT via PTP Remote
-
-* Fri Aug 12 2016 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-2
-- Improve bootstrapping mode
-- Split out local connecter, which requires CDT
-- Add a SDK package for source bundles
-
-* Fri Jul 01 2016 Mat Booth <mat.booth(a)redhat.com> - 4.1.0-1
-- Update to Neon release
-
-* Thu Mar 03 2016 Sopot Cela <scela(a)redhat.com> - 4.0.0-6.gitcf7ef3f
-- Update for Mars.2 release
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Sep 14 2015 Roland Grunberg <rgrunber(a)redhat.com> - 4.0.0-4
-- Rebuild as an Eclipse p2 Droplet.
-
-* Thu Aug 27 2015 Mat Booth <mat.booth(a)redhat.com> - 4.0.0-3
-- Add bootstrap mode to allow breaking of cyclic dependencies
-
-* Thu Jun 25 2015 Roland Grunberg <rgrunber(a)redhat.com> - 4.0.0-2
-- Rebuild to correct auto-generated requires.
-
-* Wed Jun 24 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-1
-- Update to 4.0 final.
-
-* Wed Jun 17 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.5.gite58c5d3
-- Fix FTBFS - pom/manifest/feature qualifier misalignments.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.0.0-0.4.gite58c5d3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jun 3 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.3.gite58c5d3
-- New git snapshot.
-
-* Tue Jun 2 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.2.git4ea71eb
-- Fix review comments.
-
-* Tue Jun 2 2015 Alexander Kurtakov <akurtako(a)redhat.com> 4.0.0-0.1.git4ea71eb
-- Initial packaging
diff --git a/sources b/sources
deleted file mode 100644
index 4791908..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (org.eclipse.tm-3ba744c9c82dcd8df82263254431180b7db6e93a.tar.xz) = 209d2464fe9459119f033f0789abfe6b7d72c4f82c3af5c30f232cb8ddb07f186a0984e3eeb307b6cb8d58a80f4112c9c2bc3107f3cb16743a1acb2c5b0834ca
1
0
Architecture specific change in rpms/eclipse-launchbar.git
by githook-noreply＠fedoraproject.org 26 Mar '20
by githook-noreply＠fedoraproject.org 26 Mar '20
26 Mar '20
The package rpms/eclipse-launchbar.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse-launchbar.git/commit/?id=b9….
Change:
-ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit b92bbd5fa5aab01dcb93a5a65715b5b23b922549
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Mar 26 16:31:47 2020 +0000
This package was subsumed into eclipsre-cdt
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2166a03..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/org.eclipse.launchbar-*.tar.gz
-/org.eclipse.launchbar-*.tar.xz
-/org.eclipse.launchbar-*/
-/*.rpm
-/noarch
-/.build-*.log
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..eaa5cbe
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was subsumed into eclipsre-cdt
diff --git a/eclipse-launchbar.spec b/eclipse-launchbar.spec
deleted file mode 100644
index 47909c7..0000000
--- a/eclipse-launchbar.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-%global git_tag fe09ae9bae9780adc8b43a8eb020c4f3fd4aab2e
-
-# Set this to avoid building remote launching bundles to eliminate
-# a circular dep on CDT->launchbar->remote->CDT
-%bcond_without remote
-
-Epoch: 1
-Name: eclipse-launchbar
-Version: 2.2.3
-Release: 3%{?dist}
-Summary: Eclipse Launchbar plug-in
-License: EPL-1.0
-URL: https://wiki.eclipse.org/CDT/LaunchBar
-
-Source0: http://git.eclipse.org/c/cdt/org.eclipse.launchbar.git/snapshot/org.eclipse…
-
-BuildArch: noarch
-
-# Upstream Eclipse no longer supports non-64bit arches
-ExcludeArch: s390 %{arm} %{ix86}
-
-BuildRequires: tycho
-BuildRequires: tycho-extras
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-license
-%if %{with remote}
-BuildRequires: eclipse-remote
-%endif
-
-Requires: eclipse-platform
-
-%description
-An alternative to the default launcher toolbar in Eclipse.
-
-%prep
-%setup -q -n org.eclipse.launchbar-%{git_tag}
-
-find -name *.jar -exec rm -rf {} \;
-find -name *.class -exec rm -rf {} \;
-
-# No need to create update site/p2 repo for RPM builds
-%pom_disable_module repo
-
-# Disable tests for now
-%pom_disable_module tests/org.eclipse.launchbar.core.tests
-%pom_disable_module tests/org.eclipse.launchbar.ui.tests
-
-%if %{without remote}
-%pom_disable_module bundles/org.eclipse.launchbar.remote.core
-%pom_disable_module bundles/org.eclipse.launchbar.remote.ui
-%pom_disable_module features/org.eclipse.launchbar.remote
-%endif
-
-# No parent poms
-%mvn_package "::pom::" __noinstall
-
-%build
-%mvn_build -j
-
-%install
-%mvn_install
-
-%files -f .mfiles
-
-%changelog
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Mar 14 2019 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.3-1
-- Update to 2019-03 release
-- Restrict to same architectures as Eclipse itself
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 08 2019 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.2-2
-- Fix license tag
-
-* Sun Dec 09 2018 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.2-1
-- Update to 2018-12 release
-
-* Tue Jul 31 2018 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.1-1
-- Update to latest upstream version
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Mar 21 2018 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.0-3
-- Update to snapshot containing upstreamed patch
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 12 2018 Mat Booth <mat.booth(a)redhat.com> - 1:2.2.0-1
-- Update to latest upstream release
-- Drop upstreamed patch
-
-* Mon Sep 18 2017 Mat Booth <mat.booth(a)redhat.com> - 1:2.1.2-2
-- Synchronize access to listeners list in LaunchTargetManager
-
-* Mon Sep 18 2017 Mat Booth <mat.booth(a)redhat.com> - 1:2.1.2-1
-- Update to Oxygen.1 release
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.1.1-0.3.gitff9289d
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 19 2017 Mat Booth <mat.booth(a)redhat.com> - 1:2.1.1-0.2.gitff9289d
-- Allow conditionally building against eclipse-remote
-
-* Sat Jun 17 2017 Mat Booth <mat.booth(a)redhat.com> - 1:2.1.1-0.1.gitff9289d
-- Update to Oxygen snapshot
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 16 2017 Jeff Johnston <jjohnstn(a)redhat.com> - 1:2.1.0-1
-- Update to Neon.2 release
-- Remove javax.annotation patch
-
-* Tue Oct 04 2016 Mat Booth <mat.booth(a)redhat.com> - 1:2.0.1-1
-- Update to Neon.1 release
-
-* Mon Apr 25 2016 Sopot Cela <scela(a)redhat.com> - 1:2.0.0-0.1.git1f95c6c
-- Upstream version correction
-
-* Mon Apr 25 2016 Sopot Cela <scela(a)redhat.com> - 1:1.0.1-2.git1f95c6c
-- Upgrade for Neon
-
-* Thu Mar 10 2016 Mat Booth <mat.booth(a)redhat.com> - 1:1.0.1-1.gitedd5f69
-- Take a post-release snapshot of 1.0.1 due to API breakage in newer versions
-
-* Thu Mar 03 2016 Sopot Cela <scela(a)redhat.com> - 1.0.2-0.1.git93cdb07
-- Updated to 1.0.2 for Mars.2 release
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-0.2.git3c10977
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Sep 29 2015 Sopot Cela <scela(a)redhat.com> - 1.0.1-0.1.git3c10977
-- Updated to 1.0.1 for Mars.1 release
-
-* Wed Jul 15 2015 Sopot Cela <scela(a)redhat.com> - 1.0.0-0.3.gite1ac200
-- Added javax.annotation patch
-
-* Tue Jun 16 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1.0.0-0.2.git01bfa62
-- New snapshot
-
-* Wed Jun 3 2015 Sopot Cela <scela(a)redhat.com> - 1.0.0-0.1.gite1ac200
-- Initial packaging
diff --git a/sources b/sources
deleted file mode 100644
index 442bc63..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (org.eclipse.launchbar-fe09ae9bae9780adc8b43a8eb020c4f3fd4aab2e.tar.xz) = 2c7e93729792e470672bedd6b93e0622925bc1a81aa0b82d0d0b030bb93f904fbb333e1edc4355ce2c94b591bb3635b2625a95b01718a3b46bd9757b704fccb1
1
0
Architecture specific change in rpms/gnome-applets.git
by githook-noreply＠fedoraproject.org 26 Mar '20
by githook-noreply＠fedoraproject.org 26 Mar '20
26 Mar '20
The package rpms/gnome-applets.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=c8bba0…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=255475…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=800de2…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=6c4d74…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=203b9c…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=12f838…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=1ed9bb…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=199e97…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=e43fd6…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=99cbd2…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=511d72…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=c5de0e…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=da76eb…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=a7c5cc…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=bdd79d…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=aad156…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=0f6d04…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=037cb9…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=337ba9…
https://src.fedoraproject.org/cgit/rpms/gnome-applets.git/commit/?id=104390….
Change:
+%ifnarch %{no_apm_archs}
+%ifarch %{apmd_archs}
+%ifarch %{apmd_archs}
+%ifnarch %{no_apm_archs}
+%ifnarch %{no_apm_archs}
+%ifnarch %{no_apm_archs}
+%ifnarch s390 s390x sparc64
+%ifarch %{apmd_archs}
+%ifarch %{no_apm_archs}
+%ifnarch s390 s390x
-%ifnarch %{no_apm_archs}
+%ifarch ${apmd_archs}
-%ifarch %{apmd_archs}
-%ifnarch s390 s390x sparc64
-%ifarch %{no_apm_archs}
-%ifarch %{apmd_archs}
-%ifarch %{apmd_archs}
+%ifnarch s390 s390x
+%ifnarch s390 s390x sparc64
-%ifnarch %{no_apm_archs}
Thanks.
Full change:
============
commit 5c06a7343a6babfc015783b070b15b60d3dadc33
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Thu Mar 26 14:22:55 2020 +0200
Update to 3.36.1
diff --git a/.gitignore b/.gitignore
index d05b114..d7dcbe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.5.91.tar.xz
/gnome-applets-3.5.92.tar.xz
/gnome-applets-3.34.0.tar.xz
+/gnome-applets-3.36.1.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 337c001..f2a019e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,17 +1,17 @@
# LTO
-%global optflags %{optflags} -flto
-%global build_ldflags %{build_ldflags} -flto
+%global optflags %{optflags} -flto=auto
+%global build_ldflags %{build_ldflags} -flto=auto
%global po_package %{name}-3.0
Name: gnome-applets
-Version: 3.34.0
-Release: 6%{?dist}
-Summary: Small applications for the GNOME panel
+Version: 3.36.1
+Release: 1%{?dist}
+Summary: Small applications for the GNOME Flashback panel
License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeApplets
-Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
BuildRequires: autoconf
BuildRequires: automake
@@ -42,7 +42,7 @@ BuildRequires: pkgconfig(x11)
BuildRequires: kernel-tools-devel
%endif
-Requires: gnome-panel%{?_isa} >= 3.24.1
+Requires: gnome-panel%{?_isa} >= 3.36.0
Requires: hicolor-icon-theme
%description
@@ -106,7 +106,6 @@ rm -rf %{buildroot}%{_datadir}/xmodmap
%{_datadir}/gnome-panel/applets/
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_datadir}/pixmaps/*.png
%{_libdir}/%{name}/
%{_sysconfdir}/sound/events/battstat_applet.soundlist
%ifnarch s390 s390x
@@ -123,6 +122,9 @@ rm -rf %{buildroot}%{_datadir}/xmodmap
%changelog
+* Thu Mar 26 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.36.1-1
+- Update to 3.36.1
+
* Wed Mar 25 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.0-6
- Remove noarch doc package due to build error
diff --git a/sources b/sources
index f9f8a60..193a659 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-applets-3.34.0.tar.xz) = 5d16ca9d1f6c65fa59246a860f0d5723e77bf800c9362a254a8435750e52c4beb0e65aa8994e5578cfa1db7130dc92eaf4cb477ab401da402d31ea7f5aac1b51
+SHA512 (gnome-applets-3.36.1.tar.xz) = f00302e6c7aab9111935abdaeeccd465b109ff864754b8cee8c37db578d43de869bcdf7dfad8ef392655758e8ee638e8a006c6a0f947f85c7391b13a4e1ead9b
commit 9677c77828f843c1bb2457870cd0fe0b3ee195a5
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Mar 25 16:52:11 2020 +0200
Remove noarch doc package due to build error
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1de8b77..337c001 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -6,7 +6,7 @@
Name: gnome-applets
Version: 3.34.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Small applications for the GNOME panel
License: GPLv2+
@@ -45,8 +45,6 @@ BuildRequires: kernel-tools-devel
Requires: gnome-panel%{?_isa} >= 3.24.1
Requires: hicolor-icon-theme
-Suggests: %{name}-doc
-
%description
Gnome Applets component is part of the GnomeFlashback project. It currently
provides the following applets:
@@ -71,15 +69,6 @@ provides the following applets:
(windowpicker)
-# doc package
-%package doc
-Summary: Docs for %{name}
-BuildArch: noarch
-
-%description doc
-Docs for %{name}.
-
-
%prep
%autosetup -p1
autoreconf -fiv
@@ -128,11 +117,15 @@ rm -rf %{buildroot}%{_datadir}/xmodmap
%config %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%endif
-%files doc
+# Don't make it as separate noarch package since it builds differently on 's390x'
+# arch and we got build error here
%{_datadir}/help/
%changelog
+* Wed Mar 25 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.0-6
+- Remove noarch doc package due to build error
+
* Sun Feb 23 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.0-5
- Spec file improvements
- Drop obsolete macroses
commit 6b730a2c147f3301ab43771a720cec1d2a26cc60
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Mar 25 16:30:00 2020 +0200
Exclude '.enums.xml' from s390x arch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1d539a2..1de8b77 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -112,7 +112,6 @@ rm -rf %{buildroot}%{_datadir}/xmodmap
%license COPYING
%doc README AUTHORS NEWS
%{_datadir}/%{name}/
-%{_datadir}/glib-2.0/schemas/*.enums.xml
%{_datadir}/glib-2.0/schemas/*.gschema.xml
%dir %{_datadir}/gnome-panel
%{_datadir}/gnome-panel/applets/
@@ -124,6 +123,7 @@ rm -rf %{buildroot}%{_datadir}/xmodmap
%ifnarch s390 s390x
%{_bindir}/cpufreq-selector
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+%{_datadir}/glib-2.0/schemas/*.enums.xml
%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%config %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%endif
commit 99cbd2f71fefa28e01ee7f22f1306fffe2ec6127
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Mar 25 09:59:33 2020 +0200
Resurrect package for GNOME Flashback #1806539
diff --git a/.gitignore b/.gitignore
index c76bf58..d05b114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.5.1.tar.xz
/gnome-applets-3.5.91.tar.xz
/gnome-applets-3.5.92.tar.xz
+/gnome-applets-3.34.0.tar.xz
diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch
deleted file mode 100644
index 134a617..0000000
--- a/gnome-applets-cpupower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
---- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400
-+++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400
-@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
- LIBCPUFREQ_LIBS=
- if test "x$have_libcpufreq" = "xyes"; then
- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
-- LIBCPUFREQ_LIBS=-lcpufreq
-+ LIBCPUFREQ_LIBS=-lcpupower
- fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4965722..1d539a2 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,247 +1,193 @@
-%define glib2_version 2.22.0
-%define pango_version 1.2.0
-%define gtk3_version 3.0
-%define gnome_panel_version 2.91.90
-%define libgtop2_version 2.12.0
-%define gstreamer_version 0.10.14
-%define gstreamer_plugins_version 0.10.14
-%define gstreamer_plugins_good_version 0.10.6
-%define libxklavier_version 4.0
-%define libwnck_version 2.91.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.74
-%define libnotify_version 0.7
-%define pygobject_version 2.26
-%define gconf_version 2.14.0
-%define libgweather_version 3.5.0
-
-%define po_package gnome-applets-2.0
-
-%define build_stickynotes 0
+# LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+%global po_package %{name}-3.0
+
+Name: gnome-applets
+Version: 3.34.0
+Release: 5%{?dist}
Summary: Small applications for the GNOME panel
-Name: gnome-applets
-Version: 3.5.92
-Release: 4%{?dist}
-Epoch: 1
-License: GPLv2+ and GFDL
-Group: User Interface/Desktops
-URL: http://www.gnome.org/
-# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz
-Patch1: gnome-applets-cpupower.patch
-
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
-BuildRequires: libgtop2-devel >= %{libgtop2_version}
-BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: libxklavier-devel >= %{libxklavier_version}
-BuildRequires: gstreamer-devel >= %{gstreamer_version}
-BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
-BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
-BuildRequires: libwnck3-devel >= %{libwnck_version}
-BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: pygobject2-devel >= %{pygobject_version}
-BuildRequires: gucharmap-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-doc-utils
-BuildRequires: which
+
+License: GPLv2+
+URL: https://wiki.gnome.org/Projects/GnomeApplets
+Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc
BuildRequires: intltool
-BuildRequires: pkgconfig
-BuildRequires: gnome-icon-theme
-BuildRequires: libxslt
-BuildRequires: NetworkManager-devel
-BuildRequires: libgweather-devel >= %{libgweather_version}
-# For cpufreq
-BuildRequires: dbus-devel
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: scrollkeeper
BuildRequires: libSM-devel
+BuildRequires: libtool
+BuildRequires: libxslt
+BuildRequires: yelp-tools
+BuildRequires: pkgconfig(adwaita-icon-theme) >= 3.14.0
+BuildRequires: pkgconfig(dbus-1) >= 1.1.2
+BuildRequires: pkgconfig(dbus-glib-1) >= 0.74
+BuildRequires: pkgconfig(glib-2.0) >= 2.44.0
+BuildRequires: pkgconfig(gnome-settings-daemon)
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0
+BuildRequires: pkgconfig(gucharmap-2.90) >= 2.33.0
+BuildRequires: pkgconfig(gweather-3.0) >= 3.28.0
+BuildRequires: pkgconfig(libgtop-2.0) >= 2.11.92
+BuildRequires: pkgconfig(libnotify) >= 0.7
+BuildRequires: pkgconfig(libpanel-applet) >= 3.24.1
+BuildRequires: pkgconfig(libwnck-3.0) >= 3.14.1
+BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0
+BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97
+BuildRequires: pkgconfig(tracker-sparql-2.0)
+BuildRequires: pkgconfig(upower-glib) >= 0.9.4
+BuildRequires: pkgconfig(x11)
%ifnarch s390 s390x sparc64
BuildRequires: kernel-tools-devel
%endif
-BuildRequires: autoconf automake libtool
-
-Requires: gnome-panel >= %{gnome_panel_version}
-Requires: libxklavier >= %{libxklavier_version}
-Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
-Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
+Requires: gnome-panel%{?_isa} >= 3.24.1
+Requires: hicolor-icon-theme
-Requires: dbus >= %{dbus_version}
-
-Requires(pre): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
-Requires(post): GConf2 >= %{gconf_version}
-
-Obsoletes: battstat_applet
-Obsoletes: gnome-cpufreq-applet
+Suggests: %{name}-doc
%description
-The gnome-applets package contains small applications which generally
-run in the background and display their output to the GNOME panel.
-It includes a clock, a character palette, load monitors, little toys,
-and more.
+Gnome Applets component is part of the GnomeFlashback project. It currently
+provides the following applets:
+
+- Accessibility applet (accessx-status)
+- Battery status (battstat)
+- A symbol table (charpick)
+- A system monitor for cpu, memory and network usage information (cpufreq)
+- A drive mount applet (drivemount)
+- Geyes, a funny applet that shows a pair of eyes which follow the cursor
+ (geyes)
+- A weather applet (gweather)
+- A command execution and macro plugin (mini-commander)
+- A sound applet (deprecated and replaced by libsound-applet in GnomeFlashback
+ (mixer)
+- A model lights plugin for modems (modemlights)
+- A multi load plugin (multiload)
+- A notes applets (stickynotes)
+- A trash applet (trashapplet)
+- A window picker applet that shows open applications as icons. This saves a lot
+ of screen space and is very useful if many applications are open.
+ (windowpicker)
+
+
+# doc package
+%package doc
+Summary: Docs for %{name}
+BuildArch: noarch
+
+%description doc
+Docs for %{name}.
+
%prep
-%setup -q
-%patch1 -p1
+%autosetup -p1
+autoreconf -fiv
-autoreconf -i -f
%build
-%configure \
- --enable-suid=no \
- --disable-battstat \
- --disable-scrollkeeper \
- --enable-mini-commander \
- --enable-gtk-doc \
- --without-hal
+%configure \
+ --disable-scrollkeeper \
+ --disable-static \
+ --enable-gtk-doc \
+ --enable-mini-commander \
+ --enable-suid=no \
+ --with-cpufreq-lib=cpupower \
+ --without-hal
+%make_build
-# drop unneeded direct library deps with --as-needed
-# libtool doesn't make this easy, so we do it the hard way
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-make %{?_smp_mflags}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-%find_lang %{po_package} --all-name --with-gnome
+%make_install
+%find_lang %{po_package} --all-name
# Clean up unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
+find %{buildroot}%{_libdir}/%{name}/ -name '*.la' -delete
# drop non-XKB support files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+rm -rf %{buildroot}%{_datadir}/xmodmap
-%if ! %{build_stickynotes}
- rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet
+
+%files -f %{po_package}.lang
+%license COPYING
+%doc README AUTHORS NEWS
+%{_datadir}/%{name}/
+%{_datadir}/glib-2.0/schemas/*.enums.xml
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%dir %{_datadir}/gnome-panel
+%{_datadir}/gnome-panel/applets/
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/pixmaps/*.png
+%{_libdir}/%{name}/
+%{_sysconfdir}/sound/events/battstat_applet.soundlist
+%ifnarch s390 s390x
+%{_bindir}/cpufreq-selector
+%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
+%config %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%endif
+%files doc
+%{_datadir}/help/
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
-
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
- if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
- fi
- if [ -f %{_sysconfdir}/gconf/schemas/gweather.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gweather.schemas >& /dev/null || :
- fi
- if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
- fi
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
-fi
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
- glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
+%changelog
+* Sun Feb 23 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.0-5
+- Spec file improvements
+- Drop obsolete macroses
+- Enable LTO
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+* Thu Dec 26 2019 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.34.0-1
+- new version
-%files -f %{po_package}.lang
-%doc AUTHORS COPYING NEWS README
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-applets
-%{_bindir}/*
-%{python_sitelib}/invest/
-%{_libexecdir}/accessx-status-applet
-%{_libexecdir}/charpick_applet2
-%{_libexecdir}/cpufreq-applet
-%{_libexecdir}/drivemount_applet2
-%{_libexecdir}/geyes_applet2
-%{_libexecdir}/gnome-applets/
-%{_libexecdir}/gweather-applet-2
-%{_libexecdir}/mini_commander_applet
-%{_libexecdir}/multiload-applet-2
-%{_libexecdir}/null_applet
-
-%if %{build_stickynotes}
-%{_libexecdir}/stickynotes_applet
-%endif
+* Sun May 05 2019 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.32.0-1
+- new version
-%{_libexecdir}/trashapplet
-%{_libexecdir}/invest-applet
-%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
-%{_datadir}/glib-2.0/schemas/org.gnome.applets.GWeatherApplet.gschema.xml
-%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
-%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
-%{_datadir}/dbus-1/services/*
-%{_datadir}/gnome-panel/4.0/applets/*
+* Mon Nov 12 2018 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.30.0-1
+- new version
+* Mon Mar 26 2018 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.28.0-1
+- new version
+
+* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.26.0-1
+- new version
+
+* Tue Mar 28 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.24.0-1
+- new version
+
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.22.0-1
+- new version
+
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.20.0-2
+- Update cpupower patch for kernel 4.7
+
+* Mon Apr 18 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.20.0-1
+- Version bump for GNOME Flashback 3.20.
+
+* Thu Apr 14 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.18.2-1
+- new version
+
+* Tue Oct 13 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.18.1-1
+- Update to 3.18.1.
+
+* Fri Oct 02 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.18.0-1
+- Version bump for GNOME Flashback 3.18.0.
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.17.2-1
+- Unstable version bump
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.16.1-2
+- Enable battstat applet
+
+* Thu Apr 30 2015 Mike DePaulo <mikedep333(a)gmail.com> - 1:3.16.1-1
+- Version bump for GNOME Flashback 3.16.1.
+- Drop gnome-applets-cpupower.patch because we can call
+ --with-cpufreq-lib=cpupower now instead.
+
+* Mon Feb 09 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1:3.14.0-1
+- Version bump for GNOME Flashback 3.14.
-%changelog
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.92-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 7e2ab04..f9f8a60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e38a776431e648a2932fa5c6ebff40a4 gnome-applets-3.5.92.tar.xz
+SHA512 (gnome-applets-3.34.0.tar.xz) = 5d16ca9d1f6c65fa59246a860f0d5723e77bf800c9362a254a8435750e52c4beb0e65aa8994e5578cfa1db7130dc92eaf4cb477ab401da402d31ea7f5aac1b51
commit 337ba9e687bd1e9db8a8d32f462e466f12dab290
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Mar 25 08:30:01 2020 +0100
Revert "Package is retired, replaced by the GNOME Classic session in F19"
This reverts commit a7c5ccf15a48a978ef36feb3de19ffc5db80ea33.
Unretirement request: https://pagure.io/releng/issue/9349
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c76bf58
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+gnome-applets-2.31.5.tar.bz2
+gnome-applets-2.31.6.tar.bz2
+/gnome-applets-2.31.90.1.tar.bz2
+/gnome-applets-2.31.91.tar.bz2
+/gnome-applets-2.32.0.tar.bz2
+/gnome-applets-3.1.1.tar.bz2
+/gnome-applets-3.1.2.tar.xz
+/gnome-applets-3.1.3.tar.xz
+/gnome-applets-3.1.4.tar.xz
+/gnome-applets-3.1.5.tar.xz
+/gnome-applets-3.1.90.tar.xz
+/gnome-applets-3.1.91.tar.xz
+/gnome-applets-3.1.92.tar.xz
+/gnome-applets-3.2.0.tar.xz
+/gnome-applets-3.2.1.tar.xz
+/gnome-applets-3.3.1.tar.xz
+/gnome-applets-3.4.1.tar.xz
+/gnome-applets-3.5.1.tar.xz
+/gnome-applets-3.5.91.tar.xz
+/gnome-applets-3.5.92.tar.xz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index ec43253..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Package is retired, replaced by the GNOME Classic session in F19
diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch
new file mode 100644
index 0000000..134a617
--- /dev/null
+++ b/gnome-applets-cpupower.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
+--- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400
++++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400
+@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
+ LIBCPUFREQ_LIBS=
+ if test "x$have_libcpufreq" = "xyes"; then
+ AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+- LIBCPUFREQ_LIBS=-lcpufreq
++ LIBCPUFREQ_LIBS=-lcpupower
+ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
new file mode 100644
index 0000000..4965722
--- /dev/null
+++ b/gnome-applets.spec
@@ -0,0 +1,1347 @@
+%define glib2_version 2.22.0
+%define pango_version 1.2.0
+%define gtk3_version 3.0
+%define gnome_panel_version 2.91.90
+%define libgtop2_version 2.12.0
+%define gstreamer_version 0.10.14
+%define gstreamer_plugins_version 0.10.14
+%define gstreamer_plugins_good_version 0.10.6
+%define libxklavier_version 4.0
+%define libwnck_version 2.91.0
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.74
+%define libnotify_version 0.7
+%define pygobject_version 2.26
+%define gconf_version 2.14.0
+%define libgweather_version 3.5.0
+
+%define po_package gnome-applets-2.0
+
+%define build_stickynotes 0
+
+Summary: Small applications for the GNOME panel
+Name: gnome-applets
+Version: 3.5.92
+Release: 4%{?dist}
+Epoch: 1
+License: GPLv2+ and GFDL
+Group: User Interface/Desktops
+URL: http://www.gnome.org/
+# VCS: git:git://git.gnome.org/gnome-applets
+Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz
+Patch1: gnome-applets-cpupower.patch
+
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
+BuildRequires: libgtop2-devel >= %{libgtop2_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: libxklavier-devel >= %{libxklavier_version}
+BuildRequires: gstreamer-devel >= %{gstreamer_version}
+BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
+BuildRequires: libwnck3-devel >= %{libwnck_version}
+BuildRequires: libnotify-devel >= %{libnotify_version}
+BuildRequires: pygobject2-devel >= %{pygobject_version}
+BuildRequires: gucharmap-devel
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: gnome-doc-utils
+BuildRequires: which
+BuildRequires: intltool
+BuildRequires: pkgconfig
+BuildRequires: gnome-icon-theme
+BuildRequires: libxslt
+BuildRequires: NetworkManager-devel
+BuildRequires: libgweather-devel >= %{libgweather_version}
+# For cpufreq
+BuildRequires: dbus-devel
+BuildRequires: polkit-devel >= 0.92
+BuildRequires: scrollkeeper
+BuildRequires: libSM-devel
+%ifnarch s390 s390x sparc64
+BuildRequires: kernel-tools-devel
+%endif
+
+BuildRequires: autoconf automake libtool
+
+Requires: gnome-panel >= %{gnome_panel_version}
+Requires: libxklavier >= %{libxklavier_version}
+Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
+Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
+
+Requires: dbus >= %{dbus_version}
+
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): GConf2 >= %{gconf_version}
+
+Obsoletes: battstat_applet
+Obsoletes: gnome-cpufreq-applet
+
+%description
+The gnome-applets package contains small applications which generally
+run in the background and display their output to the GNOME panel.
+It includes a clock, a character palette, load monitors, little toys,
+and more.
+
+%prep
+%setup -q
+%patch1 -p1
+
+autoreconf -i -f
+
+%build
+%configure \
+ --enable-suid=no \
+ --disable-battstat \
+ --disable-scrollkeeper \
+ --enable-mini-commander \
+ --enable-gtk-doc \
+ --without-hal
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+make %{?_smp_mflags}
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+%find_lang %{po_package} --all-name --with-gnome
+
+# Clean up unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
+
+# drop non-XKB support files
+rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+
+%if ! %{build_stickynotes}
+ rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet
+%endif
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+%{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+ if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
+ fi
+ if [ -f %{_sysconfdir}/gconf/schemas/gweather.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas >& /dev/null || :
+ fi
+ if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
+ fi
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+fi
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f %{po_package}.lang
+%doc AUTHORS COPYING NEWS README
+%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
+%{_datadir}/gnome-applets
+%{_bindir}/*
+%{python_sitelib}/invest/
+%{_libexecdir}/accessx-status-applet
+%{_libexecdir}/charpick_applet2
+%{_libexecdir}/cpufreq-applet
+%{_libexecdir}/drivemount_applet2
+%{_libexecdir}/geyes_applet2
+%{_libexecdir}/gnome-applets/
+%{_libexecdir}/gweather-applet-2
+%{_libexecdir}/mini_commander_applet
+%{_libexecdir}/multiload-applet-2
+%{_libexecdir}/null_applet
+
+%if %{build_stickynotes}
+%{_libexecdir}/stickynotes_applet
+%endif
+
+%{_libexecdir}/trashapplet
+%{_libexecdir}/invest-applet
+%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
+%{_datadir}/glib-2.0/schemas/org.gnome.applets.GWeatherApplet.gschema.xml
+%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
+%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+%{_datadir}/dbus-1/services/*
+%{_datadir}/gnome-panel/4.0/applets/*
+
+
+%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.92-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-3
+- Remove gweather gconf schema handling
+
+* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
+- Update the icon cache scriptlets
+- Fix the build; add glib-compile-schemas scriptlets
+- Clean out some old cruft from the spec file
+
+* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
+- Update to 3.5.92
+
+* Tue Sep 04 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.91-1
+- Update to 3.5.91
+
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun May 06 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.1-1
+- Update to 3.5.1
+
+* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.4.1-1
+- Update to 3.4.1
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> = 1:3.3.1-1
+- Update to 3.3.1
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.2.1-2
+- Rebuilt for glibc bug#747377
+
+* Wed Oct 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 1:3.2.1-1
+- Update to 3.2.1
+
+* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
+- Update to 3.2.0
+
+* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
+- Update to 3.2.0
+
+* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
+* Thu Sep 08 2011 Dan Hork <dan[at]danny.cz> - 3.1.91-2
+- kernel-tools-devel isn't built on s390(x) and sparc64
+
+* Wed Sep 07 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-1
+- Update to 3.1.91
+
+* Wed Aug 31 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.90-1
+- Update to 3.1.90
+
+* Thu Aug 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
+* Tue Jul 26 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Mon Jul 04 2011 Bastien Nocera <bnocera(a)redhat.com> 3.1.3-1
+- Update to 3.1.3
+
+* Tue Jun 14 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.2-1
+- Update to 3.1.2
+
+* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-2
+- Fix package Requires
+
+* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-1
+- Update to 3.1.1
+- Restored basic functionality
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.32.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Nov 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-3
+- Rebuild against libnotify 0.7.0
+
+* Mon Oct 11 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-2
+- Rebuild without gucharmap support
+
+* Thu Sep 30 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-1
+- Update to 2.32.0
+
+* Tue Aug 31 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.91-1
+- Update to 2.31.91
+
+* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.90.1-1
+- Update to 2.31.90.1
+
+* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.6-1
+- Update to 2.31.6
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:2.31.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Mon Jul 12 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.5-1
+- 2.31.5
+
+* Wed Jun 16 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-3
+- Kill the scrollkeeper runtime dep
+
+* Thu Jun 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-2
+- Fix BRs
+
+* Sun Mar 28 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-1
+- Update to 2.30.0
+
+* Sun Feb 14 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-2
+- Add missing libs
+
+* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-1
+- Update to 2.29.5
+
+* Tue Oct 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-2
+- Fix a help file seriesid clash between accessx-status and invest-applet
+
+* Mon Sep 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
+* Tue Sep 8 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.92-1
+- Update to 2.27.92
+
+* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.91-1
+- 2.27.91
+
+* Wed Jul 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.4-1
+- Update to 2.27.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.27.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-5
+- Rebuild against new libgnomekbd
+
+* Mon Jul 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-4
+- Fix PolicyKit 1 patch
+
+* Tue Jun 30 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-3
+- Rebuild against new libxklavier
+
+* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-2
+- Drop sticky notes, now that we have gnotes
+
+* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-1
+- Update to 2.27.3
+
+* Sat Jun 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-3
+- Drop unneeded direct dependencies
+
+* Wed Jun 10 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-2
+- Port to PolicyKit 1
+
+* Sun May 31 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-1
+- Update to 2.27.2
+- http://download.gnome.org/sources/gnome-applets/2.27/gnome-applets-2.27.2.n…
+
+* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
+- Don't drop schemas translations from po files
+
+* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-2
+- Make gweather network status tracking work
+
+* Mon Apr 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+
+* Sun Mar 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-4
+- Make cpufreq applet work (#492741)
+
+* Sat Mar 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-3
+- Make the invest applet work
+
+* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-2
+- Support https in minicommander (#490387)
+
+* Mon Mar 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-1
+- Update to 2.25.92
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.25.91-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-2
+- Update to 2.25.91
+
+* Fri Feb 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-3
+- Keep the dead mixer applet from haunting the add to panel dialog
+
+* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-1
+- Update to 2.25.90
+
+* Wed Jan 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-2
+- Fix trash applet not starting up
+
+* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-1
+- Update to 2.25.4
+
+* Sun Jan 11 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-3
+- Fix the nullappletification of the mixer applet
+
+* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-2
+- Update to 2.25.3
+
+* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-4
+- Update to 2.25.2
+
+* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
+- Fix battstat nullification
+
+* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-7
+- Remove the mixer applet
+
+* Fri Dec 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-5
+- Fix the build
+
+* Thu Dec 18 2008 Jon McCann <jmccann(a)redhat.com> - 1:2.25.1-5
+- Rebuild for gnome-desktop
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1:2.25.1-4
+- Rebuild for Python 2.6
+
+* Sat Nov 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-4
+- Improve description
+
+* Fri Nov 21 2008 Ray Strode <rstrode(a)redhat.com> - 1:2.25.1-3
+- Install modemlights schema (bug 417031)
+
+* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-2
+- Rebuild
+
+* Wed Nov 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-1
+- Update to 2.25.1
+
+* Tue Oct 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.1-1
+- Update to 2.24.1
+
+* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-5
+- Fix some missing translations
+
+* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-4
+- Save space
+
+* Fri Sep 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-3
+- Small improvement to the drivemount applet
+
+* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-2
+- Update to 2.24.0.1
+
+* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-2
+- Update to 2.24.0
+
+* Tue Sep 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-2
+- Plug a leak in the trash applet
+
+* Tue Sep 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
+* Thu Sep 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.91-1
+- Update to 2.23.91
+
+* Fri Aug 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-2
+- Plug a memory leak in the keyboard applet
+
+* Fri Aug 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-1
+- Update to 2.23.90
+
+* Fri Aug 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-2
+- Undecorate the mixer popup
+
+* Mon Aug 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-1
+- Update to 2.23.4
+
+* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1:2.23.3-3
+- fix license tag
+
+* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.3-1
+- Update to 2.23.3
+
+* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-2
+- Rebuild
+
+* Tue May 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-1
+- Update to 2.23.2
+- Drop upstreamed patches
+
+* Tue May 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-3
+- Drop gnome-netstatus dependency (#445059)
+
+* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-2
+- Reduce the trash icon size (#438620)
+
+* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-1
+- Update to 2.22.1
+
+* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-2
+- Fix a bug in the keyboard accessibility applet
+
+* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-1
+- Update to 2.22.0
+
+* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.92-1
+- Update to 2.21.92
+
+* Tue Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.91-1
+- Update to 2.21.91
+
+* Thu Jan 31 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-5
+- Rebuild against new libxklavier
+
+* Fri Jan 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-4
+- Port trash applet to gvfs
+- Remove gnome-vfs dependency in gweather
+
+* Mon Jan 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-3
+- Fix the invest applet on vertical panels
+
+* Sun Jan 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-2
+- Make the weather applet find locations.xml again
+
+* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-1
+- Update to 2.21.4
+
+* Sun Dec 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-2
+- Silence the %%post script
+
+* Wed Dec 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-1
+- Update to 2.21.2
+- Drop the battstat applet
+
+* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-10
+- Fix a number of problems in the weather applet
+
+* Tue Oct 23 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-9
+- Rebuild against new dbus-glib
+
+* Sun Oct 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-8
+- Update weather info when going online
+
+* Fri Oct 12 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-7
+- Update out-of-sync patch to handle mute properly (#320451)
+
+* Thu Sep 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-6
+- Fix a memory leak in the mixer preferences
+
+* Tue Sep 25 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1.2.20.0-5
+- Fix possible crasher in the mixer messages when we receive an
+ unhandled message (#302881)
+
+* Sat Sep 22 2007 David Woodhouse <dwmw2(a)infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
+* Sat Sep 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-3
+- Make the gweather.pc file less useless
+
+* Thu Sep 20 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-2
+- Add patch to avoid the volume scale getting out-of sync with the
+ real hardware volume
+
+* Sun Sep 16 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
+* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
+* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 1:2.19.1-8
+- Rebuild for build ID
+
+* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-7
+- Fix Requires
+
+* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-6
+- Stop the mixer applet from polling the volume
+
+* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-5
+- Use %%find_lang for help files, too
+- Update the license field
+
+* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-4
+- gswitchit.schemas does not exist anymore
+
+* Thu Aug 2 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-3
+- Waste less space in Locations.xml
+
+* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-2
+- Fix scriptlets
+
+* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-1
+- Update to 2.19.1
+
+* Tue Jul 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-2
+- Rebuild
+
+* Mon Jul 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-1
+- Update to 2.19.0
+- Drop modemlights, since it doesn't build anymore
+
+* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-13
+- Another directory ownership fix
+
+* Fri Jul 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-12
+- Fix a directory ownership issue
+
+* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-11
+- Fix #237058
+
+* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-10
+- Rebuild again
+
+* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-9
+- Rebuild against new libwnck
+
+* Mon May 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-8
+- Split off a -devel package
+
+* Tue Apr 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-7
+- Fix a leak in the keyboard indicator applet
+
+* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-6
+- Fix the bug-buddy support of the accessx status applet
+
+* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-5
+- Add bug-buddy support to the keyboard indicator applet
+
+* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-4
+- make gweather applet preferences find feature work slightly
+ better (bug 209488)
+
+* Wed Mar 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-3
+- Remove non-XKB support files to save space
+
+* Wed Mar 21 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-2
+- rerun intltoolize to get latest version
+
+* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-1
+- Update to 2.18.0
+- Drop upstreamed patch
+
+* Tue Feb 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.90-1
+- Update to 2.17.90
+
+* Wed Jan 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.1-1
+- Update to 2.17.1
+
+* Wed Jan 10 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-6
+- fix null applet error on login for new users (bug 222104)
+
+* Tue Dec 12 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-5
+- fix mixer applet error on login for new users (bug 217919)
+
+* Sat Dec 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-4
+- Small spec file cleanups
+
+* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.16.2-3
+- rebuild for python 2.5
+
+* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-2
+- Fix the trashapplet opening a window on the wrong screen (#218447)
+
+* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-1
+- Update to 2.16.2
+- Drop obsolete patches
+
+* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-5
+- Fix muted icon in mixer again
+
+* Mon Nov 6 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.1-4
+- s/verion/version/ in dbus glib build requires
+
+* Fri Nov 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-3
+- Silence %%pre
+
+* Mon Oct 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-2
+- Make the cpufreq applet pick up preference changes (#209168)
+
+* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-1
+- Update to 2.16.1
+- Drop upstreamed patches
+
+* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-11
+- Fix scripts according to packaging guidelines
+
+* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
+- Fix up requirements (#202549)
+
+* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
+- Fix muting in the mixer applet (#208660)
+
+* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.0.1-6
+- Don't ask for password when changing CPU frequency
+
+* Mon Sep 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-5
+- Fix a segfault in the keyboard indicator applet
+
+* Fri Sep 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-4
+- Fix some icon size issues in the trash applet
+
+* Sun Sep 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-3
+- Make stickynotes not wake up 10 times per second (#205909)
+
+* Fri Sep 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-2
+- Fix the resizing behaviour of the mixer applet
+
+* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-1.fc6
+- Update to 2.16.0.1
+
+* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0-1.fc6
+- Update to 2.16.0
+
+* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-6.fc6
+- Make the battstat applet poll less often (204858)
+
+* Mon Aug 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-5.fc6
+- Make cpufreq-selector use the config-utils pam policy
+
+* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-4.fc6
+- Fix some redraw issues in the keyboard capplet
+
+* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-3.fc6
+- More keyboard drawing improvements
+
+* Thu Aug 24 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-2.fc6
+- Various improvements for the keyboard applet
+
+* Tue Aug 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-1.fc6
+- Update to 2.15.90
+- Drop upstreamed patches
+- Add a %%preun script
+- Require pkgconfig
+
+* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-2.fc6
+- Make the invest applet work
+
+* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-1.fc6
+- Update to 2.15.3
+
+* Tue Aug 8 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.2-4.fc6
+- destroy about dialog on close (bug 197975)
+
+* Sat Aug 5 2006 Caolan McNamara <caolanm(a)redhat.com> - 1:2.15.2-3.fc6
+- rebuild against new gucharmap
+
+* Fri Aug 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-2.fc6
+- Fix the multiload schema
+
+* Thu Aug 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-1.fc6
+- Update to 2.15.2
+
+* Wed Aug 2 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.1.1-7
+- don't require a display to build invest applet (bug 200970).
+ Problem discovered by Nalin Dahyabhai <nalin(a)redhat.com>
+
+* Sat Jul 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-6
+- Require gnome-python2-libegg for invest applet (#200640)
+
+* Wed Jul 19 2006 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.15.1.1-5
+- Add BR for dbus-glib-devel
+
+* Wed Jul 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-4
+- Rebuild against dbus
+
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.15.1.1-3.1
+- rebuild
+
+* Fri Jul 7 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-3
+- Try to make the invest applet actually work
+
+* Thu Jun 22 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.15.1.1-2
+- fix invest applet location
+
+* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.1.1-1
+- Update to 2.15.1.1
+
+* Thu Jun 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
+- Rebuild against new libxklavier
+
+* Thu Jun 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
+- Explicitly list the applets to be included
+
+* Tue Jun 6 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
+- Rebuild
+
+* Sun May 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
+- Update to 2.14.2
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
+- Update to 2.14.1
+- Update patches
+
+* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-3
+- apply patch
+
+ * Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-2
+- export symbols in gswitchit applet so applet plugins
+ work (bug 187168)
+
+* Sun Mar 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
+- update to 2.14.0
+
+* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-8
+- s/divemount/drivemount/
+
+* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-7
+- remove some bad trailing spaces introduced in 2.13.90-6
+
+* Wed Mar 8 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-6
+- improve package installation time by running gconftool-2 only
+ once in %%post
+
+* Wed Mar 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-5
+- Fix a crash in the mixer applet (#184285, #182957)
+
+* Tue Mar 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-4
+- ref some objects given to us by gstreamer
+
+* Wed Mar 1 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
+- More stock ticker fun (bug 179528)
+
+* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.90-2
+- BuildRequires: which
+
+* Sun Feb 26 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-1
+- Update to 2.13.90
+
+* Thu Feb 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-4
+- Make the stock ticker work with gcc 4.1 (#179528)
+
+* Sat Feb 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-3
+- Remove a warning from the stock ticker applet
+
+* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-2
+- Build with --enable-mini-commander
+
+* Sun Feb 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-1
+- Update to 2.13.4
+
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Feb 01 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-4
+- Fix an overflow in the weather applet
+
+* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-3
+- Update gstreamer requires
+
+* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
+- Update to 2.13.3
+
+* Wed Jan 18 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-2
+- BuildRequire gnome-doc-utils
+
+* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
+- Update to 2.13.2
+
+* Fri Jan 05 2006 John (J5) Palmieri <johnp(a)redhat.com> 2.13.1-4
+- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages
+ we need gstreamer08 for now
+
+* Wed Jan 04 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-3
+- Rebuild against new libgtop
+
+* Fri Dec 16 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-2
+- Rebuild against new libgtop
+
+* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-1
+- Update to 2.13.1
+- Update file lists
+
+* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> 2.12.2-1.1
+- rebuilt
+
+* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.2-1
+- Update to 2.12.2
+
+* Thu Dec 01 2005 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.12.1-4
+- rebuild for new dbus
+
+* Mon Nov 14 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-3
+- build correct command string for cpufreq-selection. Fix
+ spotted by Ingo Schaefer <ingo(a)ingo-shaefer.de> (Bug 164147).
+
+* Thu Oct 20 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-2
+- require libgtop2 >= 2.12.0, bug 171285
+
+* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.1-1
+- Update to 2.12.1
+
+* Thu Sep 8 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.0-1
+- Update to 2.12.0, drop upstreamed patches
+
+* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-5
+- fun with auto* to really get the build working
+
+* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-4
+- patch from upstream cvs to fix build with new pango (bgo #313368)
+
+* Tue Aug 16 2005 Warren Togami <wtogami(a)redhat.com> - 1:2.11.91-3
+- rebuild for new cairo
+
+* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
+- disable scrollkeeper database updates
+- add omf files to package list
+- require gnome-utils for gucharmap/charpick integration
+
+* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
+- New upstream version
+
+* Fri Aug 5 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.2-2
+- New upstream version
+
+* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-2
+- Rebuilt
+
+* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-1
+- Update to 2.11.1
+
+* Fri Jul 1 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.10.1-10
+- Backport from HEAD patch to remove lame warning dialog when the
+ mixer applet can't find a mixer device
+
+* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 1:2.10.1-9
+- remove setuid bit from cpufreq-selector, usermode-ify it
+
+* Thu May 19 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-8
+- Install modemlights gconf schema (bug 157764).
+
+* Fri May 13 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-7
+- Don't disable battstat on some platforms (bug 157683).
+
+* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.10.1-6
+- silence %%post
+
+* Tue Apr 26 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-5
+- Add back old patch to change ppp connect/disconnect commands
+ (bug 147675)
+
+* Wed Apr 20 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-4
+- Use builtin copy of apmlib instead of adding an external dependency
+ (bug 155125)
+
+* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-3
+- Apply patch from Jan de Groot <jan(a)jgc.homeip.net> to
+ silence scrollkeeper noise (bug 152236)
+
+* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-2
+- Add Obsoletes: gnome-cpufreq-applet (bug 154853)
+
+* Thu Apr 7 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-1
+- update to 2.10.1
+- actually build the old modemlights that were added in 2.10.0-4
+
+* Tue Apr 5 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-5
+- Don't use %%postun -p optimization now that we do more than
+ just /sbin/ldconfig in %%postun (bug 152236)
+
+* Mon Apr 4 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-4
+- use old modemlights applet that doesn't depend on gnome-system-tools
+
+* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-3
+- rebuilt
+
+* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
+- Update the GTK+ theme icon cache on (un)install
+
+* Wed Mar 16 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.10.0-1
+- Rebuild against new libwnck
+- Update to 2.10.0
+- Drop upstreamed patch
+
+* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
+- Stop libgswitchit using -Werror
+- Rebuild with gcc4
+
+* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.6-1
+- Update to 2.9.6
+
+* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-4
+- Add patch for mixer crash - #147282.
+ Thanks Neil Paris for tracking down.
+
+* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.5-2
+- Fix schemas list (#146880, #147011)
+
+* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.5-1
+- Update to 2.9.5
+
+* Sun Jan 30 2005 Florian La Roche <laroche(a)redhat.com>
+- rebuild against new libs
+
+* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-5
+- Add patch to fix crash with gweather preferences (#134572)
+
+* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-4
+- Fix mixer icons bugs - #134224 and #134773
+
+* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-3
+- Add new icons from upstream
+
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
+- Remove the wireless applet and add patch to use the netstatus
+ applet for backwards compat. bug #131652.
+
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
+- Update to 2.8.0
+
+* Wed Sep 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-2
+- Rebuild
+
+* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-1
+- Update to 2.7.3
+
+* Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
+- Run mc-install-default-macros in %%post
+- Fixed small-volume patch from Nathan Fredrickson <nathan(a)silverorange.com>
+
+* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
+- Update to 2.7.2
+
+* Wed Aug 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-2
+- Remove reference to cdplayer.schemas which has been removed (bug #129490)
+
+* Thu Aug 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-1
+- Update to 2.7.1
+- Remove battstat-arg patch - upstream now
+
+* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-2
+- rebuild
+
+* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-1
+- Update to 2.6.2.1
+- Re-do the way we decide whether to build the battstat applet.
+ Should fix 122379
+- Remove some patches that have gone upstream
+
+* Tue Jun 22 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-8
+- Fix typo with apmd requires
+
+* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+- Remove ifarch'd buildrequires on apmd
+
+* Thu May 05 2004 Nils Philippsen <nphilipp(a)redhat.com> 1:2.6.0-5
+- fix #120354 (mixer applet forgets channel settings)
+
+* Thu Apr 29 2004 Karsten Hopp <karsten(a)redhat.de> 1:2.6.0-4
+- fix error during update on s390(x) due to missing battery applet
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-3
+- Build battstat on ppc too
+
+* Wed Apr 14 2004 Alex Larsson <alexl(a)redhat.com> 1:2.6.0-2
+- Add gswitchit.schemas to SCHEMAS
+
+* Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
+- Update to 2.6.0
+
+* Tue Mar 16 2004 Jeremy Katz <katzj(a)redhat.com> 1:2.5.7-4
+- rebuild for new gstreamer
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-3
+- Update Requires/BuildRequires to include gstreamer-plugins
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-2
+- Rebuild
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-1
+- Update to 2.5.7
+- Add gnome-panel-devel BuildRequires
+
+* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Thu Feb 26 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.6-1
+- update to 2..5.6
+
+* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.4-1
+- update to 2.5.4
+
+* Fri Oct 3 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.4.1-1
+- 2.4.1
+
+* Wed Aug 27 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.7-1
+- Add missing schemas to post (fixes #102710)
+- Update to 2.3.7
+- Add ifnarch apmd buildreq
+
+* Mon Aug 18 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.6-1
+- update for gnome 2.3
+
+* Mon Jul 28 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-3
+- require the newer libgtop2 so it rebuilds vs. correct soname
+
+* Fri Jul 18 2003 <timp(a)redhat.com> 1:2.2.2-2
+- rebuild against new libgtop
+
+* Mon Jul 7 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-1
+- 2.2.2
+
+* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Mon Feb 24 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-8
+- change the volume applet size fix patch to work
+
+* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
+- debuginfo rebuild
+
+* Sat Feb 22 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-6
+- clamp size of volume applet to 24
+
+* Thu Feb 20 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-5
+- rebuild with datadir/wireless-applet and datadir/gen_util,
+ someone got overzealous deleting unpackaged files instead
+ of packaging them. #82279
+
+* Fri Feb 14 2003 Jonathan Blandford <jrb(a)redhat.com> 1:2.2.0-4
+- rebuild to get new gnome-panel
+
+* Fri Feb 14 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-3
+- nuke buildreq Xft
+
+* Mon Feb 10 2003 Bill Nottingham <notting(a)redhat.com> 1:2.2.0-2
+- fix path in modemlights patch
+
+* Wed Feb 5 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-1
+- 2.2.0
+
+* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
+- rebuilt
+
+* Mon Dec 23 2002 Jeremy Katz <katzj(a)redhat.com> 1:2.1.3-1
+- update to 2.1.3
+
+* Tue Dec 3 2002 Havoc Pennington <hp(a)redhat.com>
+- require newer panel, libgtop2
+- require newer libgnomeui, libbonoboui
+
+* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-2
+- remove unpackaged files from the buildroot
+
+* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-1
+- update to 2.1.1
+- add x86_64 to no_apm_archs
+
+* Tue Aug 27 2002 Owen Taylor <otaylor(a)redhat.com>
+- Register the cd player per-device (#72645).
+
+* Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
+- Keep the CD device closed except when actually accessing it
+ (bugzilla.gnome.org 91512)
+- Register CD player so we can start only one CD player
+ for display from magicdev. (#39208)
+
+* Tue Aug 13 2002 Havoc Pennington <hp(a)redhat.com>
+- add ppc ppc64 to no_apm_arches #67564
+
+* Wed Jul 31 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- include applets in libexecdir
+
+* Mon Jul 29 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.1, and build with new gail
+- 69971 (use correct ppp on/off commands)
+- remove scrollkeeper dtd-compliance patch,
+ fixed upstream apparently (patch doesn't apply anymore)
+
+* Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
+- Fix %%find_lang
+
+* Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild with new libs
+- remove temporary hack for too-old libgnomeui
+- add /etc/sound stuff to file list
+
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- rebuild in different environment
+
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- fix a scrollkeeper validation bug
+
+* Wed Jun 12 2002 Havoc Pennington <hp(a)redhat.com>
+- remove panel-menu.schemas from the list of schemas.
+- 2.0.0
+
+* Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Wed Jun 5 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.105.0
+
+* Sun May 26 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.103.0
+
+* Fri May 3 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.100.0
+
+* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
+- GNOME 2 version
+
+* Mon Apr 15 2002 Havoc Pennington <hp(a)redhat.com>
+- merge translations
+
+* Thu Apr 11 2002 Havoc Pennington <hp(a)redhat.com>
+- default battstat applet to vertical mode
+
+* Thu Mar 21 2002 Havoc Pennington <hp(a)redhat.com>
+- add patch to adapt to yahoo web site changes, #61561
+
+* Tue Mar 5 2002 Havoc Pennington <hp(a)redhat.com>
+- remove requires libghttp4
+
+* Mon Mar 4 2002 Havoc Pennington <hp(a)redhat.com>
+- no apm on sparc, #60538
+- obsolete battstat_applet for Ximian compat, #51427
+- use ifup/ifdown ppp0 instead of pppon/pppoff for default
+ ppp command in modemlights, #54199
+
+* Tue Feb 12 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.4.0.5, cross fingers
+- add gconf-devel buildreq, though this is dubious as hell
+ (pulled in by gtik using gnome-vfs, but if gtik actually
+ accessed gconf it would fail due to gnorba conflict)
+- patch totally busted charpick Makefile.am cflags override
+
+* Thu Jan 24 2002 Havoc Pennington <hp(a)redhat.com>
+- automake14
+
+* Thu Aug 30 2001 Alex Larsson <alexl(a)redhat.com>
+- Removed annoying broken battery full dialog #52861
+- Also fix mixer applet for USB sound #52603
+
+* Mon Aug 27 2001 Havoc Pennington <hp(a)redhat.com>
+- Add po files from sources.redhat.com
+
+* Wed Aug 15 2001 Alexander Larsson <alexl(a)redhat.com>
+- Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
+
+* Wed Jul 18 2001 Havoc Pennington <hp(a)redhat.com>
+- add some build requires
+- remove ifarch build requires, replace with check in setup
+
+* Wed Jul 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- sanitize specfile to RH style
+- do not require apmd for s390 s390x
+
+* Mon Jul 9 2001 Jonathan Blandford <jrb(a)redhat.com>
+- new version
+
+* Sun Jul 08 2001 Havoc Pennington <hp(a)redhat.com>
+- remove extra .desktop file for battstat
+
+* Sat Jul 07 2001 Havoc Pennington <hp(a)redhat.com>
+- add battstat applet
+- rearrange .desktop files for applets
+
+* Tue Jun 12 2001 Than Ngo <than(a)redhat.com>
+- fix isdn stuff to build against kernel-2.4.x
+- use %%{_tmppath}
+
+* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- allow newer gettext versions
+
+* Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
+- translations
+
+* Mon Feb 12 2001 Akira TAGOH <tagoh(a)redhat.com>
+- Updated Japanese translation (ja.po, .desktop).
+ Note: Please remove Source[23]: when release the next upstream version.
+
+* Fri Jan 19 2001 Havoc Pennington <hp(a)redhat.com>
+- 1.2.4
+
+* Fri Aug 11 2000 Jonathan Blandford <jrb(a)redhat.com>
+- Update Epoch
+
+* Wed Jul 19 2000 Jonathan Blandford <jrb(a)redhat.com>
+- Change slashapp to gnome-news app.
+
+* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
+- automatic rebuild
+
+* Mon Jun 19 2000 Owen Taylor <otaylor(a)redhat.com
+- %%defattr fixes
+- Remove Docdir:
+
+* Thu Jun 15 2000 Havoc Pennington <hp(a)redhat.com>
+- 1.2.1
+- use %%makeinstall
diff --git a/sources b/sources
new file mode 100644
index 0000000..7e2ab04
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+e38a776431e648a2932fa5c6ebff40a4 gnome-applets-3.5.92.tar.xz
commit a7c5ccf15a48a978ef36feb3de19ffc5db80ea33
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Wed May 1 23:00:56 2013 +0200
Package is retired, replaced by the GNOME Classic session in F19
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c76bf58..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-gnome-applets-2.31.5.tar.bz2
-gnome-applets-2.31.6.tar.bz2
-/gnome-applets-2.31.90.1.tar.bz2
-/gnome-applets-2.31.91.tar.bz2
-/gnome-applets-2.32.0.tar.bz2
-/gnome-applets-3.1.1.tar.bz2
-/gnome-applets-3.1.2.tar.xz
-/gnome-applets-3.1.3.tar.xz
-/gnome-applets-3.1.4.tar.xz
-/gnome-applets-3.1.5.tar.xz
-/gnome-applets-3.1.90.tar.xz
-/gnome-applets-3.1.91.tar.xz
-/gnome-applets-3.1.92.tar.xz
-/gnome-applets-3.2.0.tar.xz
-/gnome-applets-3.2.1.tar.xz
-/gnome-applets-3.3.1.tar.xz
-/gnome-applets-3.4.1.tar.xz
-/gnome-applets-3.5.1.tar.xz
-/gnome-applets-3.5.91.tar.xz
-/gnome-applets-3.5.92.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ec43253
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Package is retired, replaced by the GNOME Classic session in F19
diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch
deleted file mode 100644
index 134a617..0000000
--- a/gnome-applets-cpupower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
---- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400
-+++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400
-@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
- LIBCPUFREQ_LIBS=
- if test "x$have_libcpufreq" = "xyes"; then
- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
-- LIBCPUFREQ_LIBS=-lcpufreq
-+ LIBCPUFREQ_LIBS=-lcpupower
- fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
deleted file mode 100644
index 4965722..0000000
--- a/gnome-applets.spec
+++ /dev/null
@@ -1,1347 +0,0 @@
-%define glib2_version 2.22.0
-%define pango_version 1.2.0
-%define gtk3_version 3.0
-%define gnome_panel_version 2.91.90
-%define libgtop2_version 2.12.0
-%define gstreamer_version 0.10.14
-%define gstreamer_plugins_version 0.10.14
-%define gstreamer_plugins_good_version 0.10.6
-%define libxklavier_version 4.0
-%define libwnck_version 2.91.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.74
-%define libnotify_version 0.7
-%define pygobject_version 2.26
-%define gconf_version 2.14.0
-%define libgweather_version 3.5.0
-
-%define po_package gnome-applets-2.0
-
-%define build_stickynotes 0
-
-Summary: Small applications for the GNOME panel
-Name: gnome-applets
-Version: 3.5.92
-Release: 4%{?dist}
-Epoch: 1
-License: GPLv2+ and GFDL
-Group: User Interface/Desktops
-URL: http://www.gnome.org/
-# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz
-Patch1: gnome-applets-cpupower.patch
-
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
-BuildRequires: libgtop2-devel >= %{libgtop2_version}
-BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: libxklavier-devel >= %{libxklavier_version}
-BuildRequires: gstreamer-devel >= %{gstreamer_version}
-BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
-BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
-BuildRequires: libwnck3-devel >= %{libwnck_version}
-BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: pygobject2-devel >= %{pygobject_version}
-BuildRequires: gucharmap-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-doc-utils
-BuildRequires: which
-BuildRequires: intltool
-BuildRequires: pkgconfig
-BuildRequires: gnome-icon-theme
-BuildRequires: libxslt
-BuildRequires: NetworkManager-devel
-BuildRequires: libgweather-devel >= %{libgweather_version}
-# For cpufreq
-BuildRequires: dbus-devel
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: scrollkeeper
-BuildRequires: libSM-devel
-%ifnarch s390 s390x sparc64
-BuildRequires: kernel-tools-devel
-%endif
-
-BuildRequires: autoconf automake libtool
-
-Requires: gnome-panel >= %{gnome_panel_version}
-Requires: libxklavier >= %{libxklavier_version}
-Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
-Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
-
-Requires: dbus >= %{dbus_version}
-
-Requires(pre): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
-Requires(post): GConf2 >= %{gconf_version}
-
-Obsoletes: battstat_applet
-Obsoletes: gnome-cpufreq-applet
-
-%description
-The gnome-applets package contains small applications which generally
-run in the background and display their output to the GNOME panel.
-It includes a clock, a character palette, load monitors, little toys,
-and more.
-
-%prep
-%setup -q
-%patch1 -p1
-
-autoreconf -i -f
-
-%build
-%configure \
- --enable-suid=no \
- --disable-battstat \
- --disable-scrollkeeper \
- --enable-mini-commander \
- --enable-gtk-doc \
- --without-hal
-
-# drop unneeded direct library deps with --as-needed
-# libtool doesn't make this easy, so we do it the hard way
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-make %{?_smp_mflags}
-
-%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-%find_lang %{po_package} --all-name --with-gnome
-
-# Clean up unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
-
-# drop non-XKB support files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
-
-%if ! %{build_stickynotes}
- rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet
-%endif
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
-
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
- if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
- fi
- if [ -f %{_sysconfdir}/gconf/schemas/gweather.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gweather.schemas >& /dev/null || :
- fi
- if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
- fi
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/charpick.schemas \
- %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/drivemount.schemas \
- %{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
-%if %{build_stickynotes}
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
-%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
-fi
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
- glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%files -f %{po_package}.lang
-%doc AUTHORS COPYING NEWS README
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-applets
-%{_bindir}/*
-%{python_sitelib}/invest/
-%{_libexecdir}/accessx-status-applet
-%{_libexecdir}/charpick_applet2
-%{_libexecdir}/cpufreq-applet
-%{_libexecdir}/drivemount_applet2
-%{_libexecdir}/geyes_applet2
-%{_libexecdir}/gnome-applets/
-%{_libexecdir}/gweather-applet-2
-%{_libexecdir}/mini_commander_applet
-%{_libexecdir}/multiload-applet-2
-%{_libexecdir}/null_applet
-
-%if %{build_stickynotes}
-%{_libexecdir}/stickynotes_applet
-%endif
-
-%{_libexecdir}/trashapplet
-%{_libexecdir}/invest-applet
-%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
-%{_datadir}/glib-2.0/schemas/org.gnome.applets.GWeatherApplet.gschema.xml
-%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
-%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
-%{_datadir}/dbus-1/services/*
-%{_datadir}/gnome-panel/4.0/applets/*
-
-
-%changelog
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.92-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-3
-- Remove gweather gconf schema handling
-
-* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
-- Update the icon cache scriptlets
-- Fix the build; add glib-compile-schemas scriptlets
-- Clean out some old cruft from the spec file
-
-* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
-- Update to 3.5.92
-
-* Tue Sep 04 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.91-1
-- Update to 3.5.91
-
-* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun May 06 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.1-1
-- Update to 3.5.1
-
-* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.4.1-1
-- Update to 3.4.1
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> = 1:3.3.1-1
-- Update to 3.3.1
-
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.2.1-2
-- Rebuilt for glibc bug#747377
-
-* Wed Oct 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 1:3.2.1-1
-- Update to 3.2.1
-
-* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
-- Update to 3.2.0
-
-* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
-- Update to 3.2.0
-
-* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
-- Update to 3.1.92
-
-* Thu Sep 08 2011 Dan Hork <dan[at]danny.cz> - 3.1.91-2
-- kernel-tools-devel isn't built on s390(x) and sparc64
-
-* Wed Sep 07 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-1
-- Update to 3.1.91
-
-* Wed Aug 31 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.90-1
-- Update to 3.1.90
-
-* Thu Aug 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
-- Update to 3.1.5
-
-* Tue Jul 26 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.4-1
-- Update to 3.1.4
-
-* Mon Jul 04 2011 Bastien Nocera <bnocera(a)redhat.com> 3.1.3-1
-- Update to 3.1.3
-
-* Tue Jun 14 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.2-1
-- Update to 3.1.2
-
-* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-2
-- Fix package Requires
-
-* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-1
-- Update to 3.1.1
-- Restored basic functionality
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.32.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Nov 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-3
-- Rebuild against libnotify 0.7.0
-
-* Mon Oct 11 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-2
-- Rebuild without gucharmap support
-
-* Thu Sep 30 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-1
-- Update to 2.32.0
-
-* Tue Aug 31 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.91-1
-- Update to 2.31.91
-
-* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.90.1-1
-- Update to 2.31.90.1
-
-* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.6-1
-- Update to 2.31.6
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:2.31.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Mon Jul 12 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.5-1
-- 2.31.5
-
-* Wed Jun 16 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-3
-- Kill the scrollkeeper runtime dep
-
-* Thu Jun 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-2
-- Fix BRs
-
-* Sun Mar 28 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-1
-- Update to 2.30.0
-
-* Sun Feb 14 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-2
-- Add missing libs
-
-* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-1
-- Update to 2.29.5
-
-* Tue Oct 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-2
-- Fix a help file seriesid clash between accessx-status and invest-applet
-
-* Mon Sep 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-1
-- Update to 2.28.0
-
-* Tue Sep 8 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.92-1
-- Update to 2.27.92
-
-* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.91-1
-- 2.27.91
-
-* Wed Jul 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.4-1
-- Update to 2.27.4
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.27.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-5
-- Rebuild against new libgnomekbd
-
-* Mon Jul 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-4
-- Fix PolicyKit 1 patch
-
-* Tue Jun 30 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-3
-- Rebuild against new libxklavier
-
-* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-2
-- Drop sticky notes, now that we have gnotes
-
-* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-1
-- Update to 2.27.3
-
-* Sat Jun 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-3
-- Drop unneeded direct dependencies
-
-* Wed Jun 10 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-2
-- Port to PolicyKit 1
-
-* Sun May 31 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-1
-- Update to 2.27.2
-- http://download.gnome.org/sources/gnome-applets/2.27/gnome-applets-2.27.2.n…
-
-* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
-- Don't drop schemas translations from po files
-
-* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-2
-- Make gweather network status tracking work
-
-* Mon Apr 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-1
-- Update to 2.26.1
-
-* Sun Mar 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-4
-- Make cpufreq applet work (#492741)
-
-* Sat Mar 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-3
-- Make the invest applet work
-
-* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-2
-- Support https in minicommander (#490387)
-
-* Mon Mar 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-1
-- Update to 2.25.92
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.25.91-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-2
-- Update to 2.25.91
-
-* Fri Feb 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-3
-- Keep the dead mixer applet from haunting the add to panel dialog
-
-* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-1
-- Update to 2.25.90
-
-* Wed Jan 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-2
-- Fix trash applet not starting up
-
-* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-1
-- Update to 2.25.4
-
-* Sun Jan 11 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-3
-- Fix the nullappletification of the mixer applet
-
-* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-2
-- Update to 2.25.3
-
-* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-4
-- Update to 2.25.2
-
-* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
-- Fix battstat nullification
-
-* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-7
-- Remove the mixer applet
-
-* Fri Dec 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-5
-- Fix the build
-
-* Thu Dec 18 2008 Jon McCann <jmccann(a)redhat.com> - 1:2.25.1-5
-- Rebuild for gnome-desktop
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1:2.25.1-4
-- Rebuild for Python 2.6
-
-* Sat Nov 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-4
-- Improve description
-
-* Fri Nov 21 2008 Ray Strode <rstrode(a)redhat.com> - 1:2.25.1-3
-- Install modemlights schema (bug 417031)
-
-* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-2
-- Rebuild
-
-* Wed Nov 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-1
-- Update to 2.25.1
-
-* Tue Oct 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.1-1
-- Update to 2.24.1
-
-* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-5
-- Fix some missing translations
-
-* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-4
-- Save space
-
-* Fri Sep 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-3
-- Small improvement to the drivemount applet
-
-* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-2
-- Update to 2.24.0.1
-
-* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-2
-- Update to 2.24.0
-
-* Tue Sep 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-2
-- Plug a leak in the trash applet
-
-* Tue Sep 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-1
-- Update to 2.23.92
-
-* Thu Sep 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.91-1
-- Update to 2.23.91
-
-* Fri Aug 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-2
-- Plug a memory leak in the keyboard applet
-
-* Fri Aug 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-1
-- Update to 2.23.90
-
-* Fri Aug 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-2
-- Undecorate the mixer popup
-
-* Mon Aug 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-1
-- Update to 2.23.4
-
-* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1:2.23.3-3
-- fix license tag
-
-* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.3-1
-- Update to 2.23.3
-
-* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-2
-- Rebuild
-
-* Tue May 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-1
-- Update to 2.23.2
-- Drop upstreamed patches
-
-* Tue May 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-3
-- Drop gnome-netstatus dependency (#445059)
-
-* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-2
-- Reduce the trash icon size (#438620)
-
-* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-1
-- Update to 2.22.1
-
-* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-2
-- Fix a bug in the keyboard accessibility applet
-
-* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-1
-- Update to 2.22.0
-
-* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.92-1
-- Update to 2.21.92
-
-* Tue Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.91-1
-- Update to 2.21.91
-
-* Thu Jan 31 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-5
-- Rebuild against new libxklavier
-
-* Fri Jan 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-4
-- Port trash applet to gvfs
-- Remove gnome-vfs dependency in gweather
-
-* Mon Jan 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-3
-- Fix the invest applet on vertical panels
-
-* Sun Jan 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-2
-- Make the weather applet find locations.xml again
-
-* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-1
-- Update to 2.21.4
-
-* Sun Dec 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-2
-- Silence the %%post script
-
-* Wed Dec 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-1
-- Update to 2.21.2
-- Drop the battstat applet
-
-* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-10
-- Fix a number of problems in the weather applet
-
-* Tue Oct 23 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-9
-- Rebuild against new dbus-glib
-
-* Sun Oct 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-8
-- Update weather info when going online
-
-* Fri Oct 12 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-7
-- Update out-of-sync patch to handle mute properly (#320451)
-
-* Thu Sep 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-6
-- Fix a memory leak in the mixer preferences
-
-* Tue Sep 25 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1.2.20.0-5
-- Fix possible crasher in the mixer messages when we receive an
- unhandled message (#302881)
-
-* Sat Sep 22 2007 David Woodhouse <dwmw2(a)infradead.org> - 1.2.20.0-4
-- Build modemlights applet again (#301601)
-
-* Sat Sep 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-3
-- Make the gweather.pc file less useless
-
-* Thu Sep 20 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-2
-- Add patch to avoid the volume scale getting out-of sync with the
- real hardware volume
-
-* Sun Sep 16 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-1
-- Update to 2.20.0
-
-* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.91-1
-- Update to 2.19.91
-
-* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 1:2.19.1-8
-- Rebuild for build ID
-
-* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-7
-- Fix Requires
-
-* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-6
-- Stop the mixer applet from polling the volume
-
-* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-5
-- Use %%find_lang for help files, too
-- Update the license field
-
-* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-4
-- gswitchit.schemas does not exist anymore
-
-* Thu Aug 2 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-3
-- Waste less space in Locations.xml
-
-* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-2
-- Fix scriptlets
-
-* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-1
-- Update to 2.19.1
-
-* Tue Jul 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-2
-- Rebuild
-
-* Mon Jul 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-1
-- Update to 2.19.0
-- Drop modemlights, since it doesn't build anymore
-
-* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-13
-- Another directory ownership fix
-
-* Fri Jul 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-12
-- Fix a directory ownership issue
-
-* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-11
-- Fix #237058
-
-* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-10
-- Rebuild again
-
-* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-9
-- Rebuild against new libwnck
-
-* Mon May 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-8
-- Split off a -devel package
-
-* Tue Apr 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-7
-- Fix a leak in the keyboard indicator applet
-
-* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-6
-- Fix the bug-buddy support of the accessx status applet
-
-* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-5
-- Add bug-buddy support to the keyboard indicator applet
-
-* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-4
-- make gweather applet preferences find feature work slightly
- better (bug 209488)
-
-* Wed Mar 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-3
-- Remove non-XKB support files to save space
-
-* Wed Mar 21 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-2
-- rerun intltoolize to get latest version
-
-* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-1
-- Update to 2.18.0
-- Drop upstreamed patch
-
-* Tue Feb 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.90-1
-- Update to 2.17.90
-
-* Wed Jan 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.1-1
-- Update to 2.17.1
-
-* Wed Jan 10 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-6
-- fix null applet error on login for new users (bug 222104)
-
-* Tue Dec 12 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-5
-- fix mixer applet error on login for new users (bug 217919)
-
-* Sat Dec 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-4
-- Small spec file cleanups
-
-* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.16.2-3
-- rebuild for python 2.5
-
-* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-2
-- Fix the trashapplet opening a window on the wrong screen (#218447)
-
-* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-1
-- Update to 2.16.2
-- Drop obsolete patches
-
-* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-5
-- Fix muted icon in mixer again
-
-* Mon Nov 6 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.1-4
-- s/verion/version/ in dbus glib build requires
-
-* Fri Nov 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-3
-- Silence %%pre
-
-* Mon Oct 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-2
-- Make the cpufreq applet pick up preference changes (#209168)
-
-* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-1
-- Update to 2.16.1
-- Drop upstreamed patches
-
-* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-11
-- Fix scripts according to packaging guidelines
-
-* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
-- Fix up requirements (#202549)
-
-* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
-- Fix muting in the mixer applet (#208660)
-
-* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Thu Sep 21 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.0.1-6
-- Don't ask for password when changing CPU frequency
-
-* Mon Sep 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-5
-- Fix a segfault in the keyboard indicator applet
-
-* Fri Sep 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-4
-- Fix some icon size issues in the trash applet
-
-* Sun Sep 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-3
-- Make stickynotes not wake up 10 times per second (#205909)
-
-* Fri Sep 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-2
-- Fix the resizing behaviour of the mixer applet
-
-* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-1.fc6
-- Update to 2.16.0.1
-
-* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0-1.fc6
-- Update to 2.16.0
-
-* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-6.fc6
-- Make the battstat applet poll less often (204858)
-
-* Mon Aug 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-5.fc6
-- Make cpufreq-selector use the config-utils pam policy
-
-* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-4.fc6
-- Fix some redraw issues in the keyboard capplet
-
-* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-3.fc6
-- More keyboard drawing improvements
-
-* Thu Aug 24 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-2.fc6
-- Various improvements for the keyboard applet
-
-* Tue Aug 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-1.fc6
-- Update to 2.15.90
-- Drop upstreamed patches
-- Add a %%preun script
-- Require pkgconfig
-
-* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-2.fc6
-- Make the invest applet work
-
-* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-1.fc6
-- Update to 2.15.3
-
-* Tue Aug 8 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.2-4.fc6
-- destroy about dialog on close (bug 197975)
-
-* Sat Aug 5 2006 Caolan McNamara <caolanm(a)redhat.com> - 1:2.15.2-3.fc6
-- rebuild against new gucharmap
-
-* Fri Aug 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-2.fc6
-- Fix the multiload schema
-
-* Thu Aug 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-1.fc6
-- Update to 2.15.2
-
-* Wed Aug 2 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.1.1-7
-- don't require a display to build invest applet (bug 200970).
- Problem discovered by Nalin Dahyabhai <nalin(a)redhat.com>
-
-* Sat Jul 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-6
-- Require gnome-python2-libegg for invest applet (#200640)
-
-* Wed Jul 19 2006 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.15.1.1-5
-- Add BR for dbus-glib-devel
-
-* Wed Jul 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-4
-- Rebuild against dbus
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.15.1.1-3.1
-- rebuild
-
-* Fri Jul 7 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-3
-- Try to make the invest applet actually work
-
-* Thu Jun 22 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.15.1.1-2
-- fix invest applet location
-
-* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.1.1-1
-- Update to 2.15.1.1
-
-* Thu Jun 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
-- Rebuild against new libxklavier
-
-* Thu Jun 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
-- Explicitly list the applets to be included
-
-* Tue Jun 6 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
-- Rebuild
-
-* Sun May 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
-- Update to 2.14.2
-
-* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
-- Update to 2.14.1
-- Update patches
-
-* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-3
-- apply patch
-
- * Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-2
-- export symbols in gswitchit applet so applet plugins
- work (bug 187168)
-
-* Sun Mar 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
-- update to 2.14.0
-
-* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-8
-- s/divemount/drivemount/
-
-* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-7
-- remove some bad trailing spaces introduced in 2.13.90-6
-
-* Wed Mar 8 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-6
-- improve package installation time by running gconftool-2 only
- once in %%post
-
-* Wed Mar 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-5
-- Fix a crash in the mixer applet (#184285, #182957)
-
-* Tue Mar 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-4
-- ref some objects given to us by gstreamer
-
-* Wed Mar 1 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
-- More stock ticker fun (bug 179528)
-
-* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.90-2
-- BuildRequires: which
-
-* Sun Feb 26 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-1
-- Update to 2.13.90
-
-* Thu Feb 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-4
-- Make the stock ticker work with gcc 4.1 (#179528)
-
-* Sat Feb 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-3
-- Remove a warning from the stock ticker applet
-
-* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-2
-- Build with --enable-mini-commander
-
-* Sun Feb 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-1
-- Update to 2.13.4
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Feb 01 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-4
-- Fix an overflow in the weather applet
-
-* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-3
-- Update gstreamer requires
-
-* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
-- Update to 2.13.3
-
-* Wed Jan 18 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-2
-- BuildRequire gnome-doc-utils
-
-* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
-- Update to 2.13.2
-
-* Fri Jan 05 2006 John (J5) Palmieri <johnp(a)redhat.com> 2.13.1-4
-- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages
- we need gstreamer08 for now
-
-* Wed Jan 04 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-3
-- Rebuild against new libgtop
-
-* Fri Dec 16 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-2
-- Rebuild against new libgtop
-
-* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-1
-- Update to 2.13.1
-- Update file lists
-
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> 2.12.2-1.1
-- rebuilt
-
-* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.2-1
-- Update to 2.12.2
-
-* Thu Dec 01 2005 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.12.1-4
-- rebuild for new dbus
-
-* Mon Nov 14 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-3
-- build correct command string for cpufreq-selection. Fix
- spotted by Ingo Schaefer <ingo(a)ingo-shaefer.de> (Bug 164147).
-
-* Thu Oct 20 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-2
-- require libgtop2 >= 2.12.0, bug 171285
-
-* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.1-1
-- Update to 2.12.1
-
-* Thu Sep 8 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.0-1
-- Update to 2.12.0, drop upstreamed patches
-
-* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-5
-- fun with auto* to really get the build working
-
-* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-4
-- patch from upstream cvs to fix build with new pango (bgo #313368)
-
-* Tue Aug 16 2005 Warren Togami <wtogami(a)redhat.com> - 1:2.11.91-3
-- rebuild for new cairo
-
-* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
-- disable scrollkeeper database updates
-- add omf files to package list
-- require gnome-utils for gucharmap/charpick integration
-
-* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
-- New upstream version
-
-* Fri Aug 5 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.2-2
-- New upstream version
-
-* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-2
-- Rebuilt
-
-* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-1
-- Update to 2.11.1
-
-* Fri Jul 1 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.10.1-10
-- Backport from HEAD patch to remove lame warning dialog when the
- mixer applet can't find a mixer device
-
-* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 1:2.10.1-9
-- remove setuid bit from cpufreq-selector, usermode-ify it
-
-* Thu May 19 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-8
-- Install modemlights gconf schema (bug 157764).
-
-* Fri May 13 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-7
-- Don't disable battstat on some platforms (bug 157683).
-
-* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.10.1-6
-- silence %%post
-
-* Tue Apr 26 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-5
-- Add back old patch to change ppp connect/disconnect commands
- (bug 147675)
-
-* Wed Apr 20 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-4
-- Use builtin copy of apmlib instead of adding an external dependency
- (bug 155125)
-
-* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-3
-- Apply patch from Jan de Groot <jan(a)jgc.homeip.net> to
- silence scrollkeeper noise (bug 152236)
-
-* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-2
-- Add Obsoletes: gnome-cpufreq-applet (bug 154853)
-
-* Thu Apr 7 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-1
-- update to 2.10.1
-- actually build the old modemlights that were added in 2.10.0-4
-
-* Tue Apr 5 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-5
-- Don't use %%postun -p optimization now that we do more than
- just /sbin/ldconfig in %%postun (bug 152236)
-
-* Mon Apr 4 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-4
-- use old modemlights applet that doesn't depend on gnome-system-tools
-
-* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-3
-- rebuilt
-
-* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
-- Update the GTK+ theme icon cache on (un)install
-
-* Wed Mar 16 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.10.0-1
-- Rebuild against new libwnck
-- Update to 2.10.0
-- Drop upstreamed patch
-
-* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
-- Stop libgswitchit using -Werror
-- Rebuild with gcc4
-
-* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.6-1
-- Update to 2.9.6
-
-* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-4
-- Add patch for mixer crash - #147282.
- Thanks Neil Paris for tracking down.
-
-* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.5-2
-- Fix schemas list (#146880, #147011)
-
-* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.5-1
-- Update to 2.9.5
-
-* Sun Jan 30 2005 Florian La Roche <laroche(a)redhat.com>
-- rebuild against new libs
-
-* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-5
-- Add patch to fix crash with gweather preferences (#134572)
-
-* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-4
-- Fix mixer icons bugs - #134224 and #134773
-
-* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-3
-- Add new icons from upstream
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
-- Remove the wireless applet and add patch to use the netstatus
- applet for backwards compat. bug #131652.
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
-- Update to 2.8.0
-
-* Wed Sep 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-2
-- Rebuild
-
-* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-1
-- Update to 2.7.3
-
-* Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
-- Run mc-install-default-macros in %%post
-- Fixed small-volume patch from Nathan Fredrickson <nathan(a)silverorange.com>
-
-* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
-- Update to 2.7.2
-
-* Wed Aug 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-2
-- Remove reference to cdplayer.schemas which has been removed (bug #129490)
-
-* Thu Aug 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-1
-- Update to 2.7.1
-- Remove battstat-arg patch - upstream now
-
-* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-2
-- rebuild
-
-* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-1
-- Update to 2.6.2.1
-- Re-do the way we decide whether to build the battstat applet.
- Should fix 122379
-- Remove some patches that have gone upstream
-
-* Tue Jun 22 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-8
-- Fix typo with apmd requires
-
-* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-- Remove ifarch'd buildrequires on apmd
-
-* Thu May 05 2004 Nils Philippsen <nphilipp(a)redhat.com> 1:2.6.0-5
-- fix #120354 (mixer applet forgets channel settings)
-
-* Thu Apr 29 2004 Karsten Hopp <karsten(a)redhat.de> 1:2.6.0-4
-- fix error during update on s390(x) due to missing battery applet
-
-* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-3
-- Build battstat on ppc too
-
-* Wed Apr 14 2004 Alex Larsson <alexl(a)redhat.com> 1:2.6.0-2
-- Add gswitchit.schemas to SCHEMAS
-
-* Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
-- Update to 2.6.0
-
-* Tue Mar 16 2004 Jeremy Katz <katzj(a)redhat.com> 1:2.5.7-4
-- rebuild for new gstreamer
-
-* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-3
-- Update Requires/BuildRequires to include gstreamer-plugins
-
-* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-2
-- Rebuild
-
-* Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-1
-- Update to 2.5.7
-- Add gnome-panel-devel BuildRequires
-
-* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Thu Feb 26 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.6-1
-- update to 2..5.6
-
-* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.4-1
-- update to 2.5.4
-
-* Fri Oct 3 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.4.1-1
-- 2.4.1
-
-* Wed Aug 27 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.7-1
-- Add missing schemas to post (fixes #102710)
-- Update to 2.3.7
-- Add ifnarch apmd buildreq
-
-* Mon Aug 18 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.6-1
-- update for gnome 2.3
-
-* Mon Jul 28 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-3
-- require the newer libgtop2 so it rebuilds vs. correct soname
-
-* Fri Jul 18 2003 <timp(a)redhat.com> 1:2.2.2-2
-- rebuild against new libgtop
-
-* Mon Jul 7 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-1
-- 2.2.2
-
-* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Mon Feb 24 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-8
-- change the volume applet size fix patch to work
-
-* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
-- debuginfo rebuild
-
-* Sat Feb 22 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-6
-- clamp size of volume applet to 24
-
-* Thu Feb 20 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-5
-- rebuild with datadir/wireless-applet and datadir/gen_util,
- someone got overzealous deleting unpackaged files instead
- of packaging them. #82279
-
-* Fri Feb 14 2003 Jonathan Blandford <jrb(a)redhat.com> 1:2.2.0-4
-- rebuild to get new gnome-panel
-
-* Fri Feb 14 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-3
-- nuke buildreq Xft
-
-* Mon Feb 10 2003 Bill Nottingham <notting(a)redhat.com> 1:2.2.0-2
-- fix path in modemlights patch
-
-* Wed Feb 5 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-1
-- 2.2.0
-
-* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
-- rebuilt
-
-* Mon Dec 23 2002 Jeremy Katz <katzj(a)redhat.com> 1:2.1.3-1
-- update to 2.1.3
-
-* Tue Dec 3 2002 Havoc Pennington <hp(a)redhat.com>
-- require newer panel, libgtop2
-- require newer libgnomeui, libbonoboui
-
-* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-2
-- remove unpackaged files from the buildroot
-
-* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-1
-- update to 2.1.1
-- add x86_64 to no_apm_archs
-
-* Tue Aug 27 2002 Owen Taylor <otaylor(a)redhat.com>
-- Register the cd player per-device (#72645).
-
-* Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
-- Keep the CD device closed except when actually accessing it
- (bugzilla.gnome.org 91512)
-- Register CD player so we can start only one CD player
- for display from magicdev. (#39208)
-
-* Tue Aug 13 2002 Havoc Pennington <hp(a)redhat.com>
-- add ppc ppc64 to no_apm_arches #67564
-
-* Wed Jul 31 2002 Nalin Dahyabhai <nalin(a)redhat.com>
-- include applets in libexecdir
-
-* Mon Jul 29 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.1, and build with new gail
-- 69971 (use correct ppp on/off commands)
-- remove scrollkeeper dtd-compliance patch,
- fixed upstream apparently (patch doesn't apply anymore)
-
-* Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
-- Fix %%find_lang
-
-* Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild with new libs
-- remove temporary hack for too-old libgnomeui
-- add /etc/sound stuff to file list
-
-* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
-- rebuild in different environment
-
-* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
-- fix a scrollkeeper validation bug
-
-* Wed Jun 12 2002 Havoc Pennington <hp(a)redhat.com>
-- remove panel-menu.schemas from the list of schemas.
-- 2.0.0
-
-* Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Wed Jun 5 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.105.0
-
-* Sun May 26 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.103.0
-
-* Fri May 3 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.100.0
-
-* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
-- GNOME 2 version
-
-* Mon Apr 15 2002 Havoc Pennington <hp(a)redhat.com>
-- merge translations
-
-* Thu Apr 11 2002 Havoc Pennington <hp(a)redhat.com>
-- default battstat applet to vertical mode
-
-* Thu Mar 21 2002 Havoc Pennington <hp(a)redhat.com>
-- add patch to adapt to yahoo web site changes, #61561
-
-* Tue Mar 5 2002 Havoc Pennington <hp(a)redhat.com>
-- remove requires libghttp4
-
-* Mon Mar 4 2002 Havoc Pennington <hp(a)redhat.com>
-- no apm on sparc, #60538
-- obsolete battstat_applet for Ximian compat, #51427
-- use ifup/ifdown ppp0 instead of pppon/pppoff for default
- ppp command in modemlights, #54199
-
-* Tue Feb 12 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.4.0.5, cross fingers
-- add gconf-devel buildreq, though this is dubious as hell
- (pulled in by gtik using gnome-vfs, but if gtik actually
- accessed gconf it would fail due to gnorba conflict)
-- patch totally busted charpick Makefile.am cflags override
-
-* Thu Jan 24 2002 Havoc Pennington <hp(a)redhat.com>
-- automake14
-
-* Thu Aug 30 2001 Alex Larsson <alexl(a)redhat.com>
-- Removed annoying broken battery full dialog #52861
-- Also fix mixer applet for USB sound #52603
-
-* Mon Aug 27 2001 Havoc Pennington <hp(a)redhat.com>
-- Add po files from sources.redhat.com
-
-* Wed Aug 15 2001 Alexander Larsson <alexl(a)redhat.com>
-- Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
-
-* Wed Jul 18 2001 Havoc Pennington <hp(a)redhat.com>
-- add some build requires
-- remove ifarch build requires, replace with check in setup
-
-* Wed Jul 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- sanitize specfile to RH style
-- do not require apmd for s390 s390x
-
-* Mon Jul 9 2001 Jonathan Blandford <jrb(a)redhat.com>
-- new version
-
-* Sun Jul 08 2001 Havoc Pennington <hp(a)redhat.com>
-- remove extra .desktop file for battstat
-
-* Sat Jul 07 2001 Havoc Pennington <hp(a)redhat.com>
-- add battstat applet
-- rearrange .desktop files for applets
-
-* Tue Jun 12 2001 Than Ngo <than(a)redhat.com>
-- fix isdn stuff to build against kernel-2.4.x
-- use %%{_tmppath}
-
-* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- allow newer gettext versions
-
-* Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
-- translations
-
-* Mon Feb 12 2001 Akira TAGOH <tagoh(a)redhat.com>
-- Updated Japanese translation (ja.po, .desktop).
- Note: Please remove Source[23]: when release the next upstream version.
-
-* Fri Jan 19 2001 Havoc Pennington <hp(a)redhat.com>
-- 1.2.4
-
-* Fri Aug 11 2000 Jonathan Blandford <jrb(a)redhat.com>
-- Update Epoch
-
-* Wed Jul 19 2000 Jonathan Blandford <jrb(a)redhat.com>
-- Change slashapp to gnome-news app.
-
-* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
-- automatic rebuild
-
-* Mon Jun 19 2000 Owen Taylor <otaylor(a)redhat.com
-- %%defattr fixes
-- Remove Docdir:
-
-* Thu Jun 15 2000 Havoc Pennington <hp(a)redhat.com>
-- 1.2.1
-- use %%makeinstall
diff --git a/sources b/sources
deleted file mode 100644
index 7e2ab04..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-e38a776431e648a2932fa5c6ebff40a4 gnome-applets-3.5.92.tar.xz
commit b78eb7147306f9a9d513c28470c6e68479bc8217
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 17:55:11 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 55f47fb..4965722 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -22,7 +22,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.5.92
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -242,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.92-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-3
- Remove gweather gconf schema handling
commit 9ae72cb089f07951770afd4d76e3765afcf5bcdf
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Sep 22 17:54:16 2012 +0200
Remove gweather gconf schema handling
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1afffdb..55f47fb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -22,7 +22,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.5.92
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -137,7 +137,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%if %{build_stickynotes}
@@ -156,7 +155,6 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
%{_sysconfdir}/gconf/schemas/gswitchit.schemas \
- %{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%if %{build_stickynotes}
@@ -167,6 +165,10 @@ if [ "$1" -gt 1 ]; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
fi
+ if [ -f %{_sysconfdir}/gconf/schemas/gweather.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas >& /dev/null || :
+ fi
if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
@@ -181,7 +183,6 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%if %{build_stickynotes}
@@ -241,6 +242,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-3
+- Remove gweather gconf schema handling
+
* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
- Update the icon cache scriptlets
- Fix the build; add glib-compile-schemas scriptlets
commit 84e411c28605528faf743736d00955cb0e2e3dbd
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Sep 22 14:41:50 2012 +0200
Clean out some old cruft from the spec file
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 99b8fee..1afffdb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,34 +1,22 @@
%define glib2_version 2.22.0
%define pango_version 1.2.0
%define gtk3_version 3.0
-# %define libgnome_version 2.8.0
-# %define libgnomeui_version 2.8.0
-# %define libglade_version 2.4.0
%define gnome_panel_version 2.91.90
%define libgtop2_version 2.12.0
-# %define gail_version 1.2.0
-# %define libbonoboui_version 2.3.0
%define gstreamer_version 0.10.14
%define gstreamer_plugins_version 0.10.14
%define gstreamer_plugins_good_version 0.10.6
%define libxklavier_version 4.0
%define libwnck_version 2.91.0
-# %define libgnome_desktop_version 2.11.1
-# %define gnome_utils_version 2.8.1
%define dbus_version 1.1.2
%define dbus_glib_version 0.74
%define libnotify_version 0.7
%define pygobject_version 2.26
-# %define pygtk_version 2.6
-# %define gnome_python_version 2.10
%define gconf_version 2.14.0
-# %define libgnomekbd_version 2.27.4
%define libgweather_version 3.5.0
%define po_package gnome-applets-2.0
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
%define build_stickynotes 0
Summary: Small applications for the GNOME panel
@@ -52,7 +40,6 @@ BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
-BuildRequires: /usr/bin/automake
BuildRequires: libwnck3-devel >= %{libwnck_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
@@ -62,7 +49,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
BuildRequires: which
-BuildRequires: libtool autoconf gettext intltool
+BuildRequires: intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: libxslt
@@ -93,9 +80,6 @@ Requires(post): GConf2 >= %{gconf_version}
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
-# since we are installing .pc files
-Requires: pkgconfig
-
%description
The gnome-applets package contains small applications which generally
run in the background and display their output to the GNOME panel.
@@ -227,10 +211,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/32x32/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
-# %{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-applets
%{_bindir}/*
-# %{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/charpick_applet2
@@ -240,7 +222,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/gnome-applets/
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
-# %{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -263,6 +244,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
- Update the icon cache scriptlets
- Fix the build; add glib-compile-schemas scriptlets
+- Clean out some old cruft from the spec file
* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
- Update to 3.5.92
commit 256e8c12b13bad55a1f7902642005019590da075
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Sep 22 13:52:11 2012 +0200
Fix the build; add glib-compile-schemas scriptlets
diff --git a/gnome-applets.spec b/gnome-applets.spec
index de1941a..99b8fee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -23,7 +23,7 @@
# %define gnome_python_version 2.10
%define gconf_version 2.14.0
# %define libgnomekbd_version 2.27.4
-%define libgweather_version 2.91.0
+%define libgweather_version 3.5.0
%define po_package gnome-applets-2.0
@@ -209,11 +209,13 @@ fi
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{po_package}.lang
@@ -250,6 +252,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/invest-applet
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
+%{_datadir}/glib-2.0/schemas/org.gnome.applets.GWeatherApplet.gschema.xml
%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
%{_datadir}/dbus-1/services/*
@@ -259,6 +262,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
- Update the icon cache scriptlets
+- Fix the build; add glib-compile-schemas scriptlets
* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
- Update to 3.5.92
commit f12923d26d170060fabfaf8519da5daf2524cd4d
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Sep 22 14:35:31 2012 +0200
Update the icon cache scriptlets
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bbecab7..de1941a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.5.92
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -145,10 +145,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
%post
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
@@ -211,11 +208,14 @@ fi
%postun
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files -f %{po_package}.lang
%doc AUTHORS COPYING NEWS README
%{_datadir}/pixmaps/*
@@ -257,6 +257,9 @@ fi
%changelog
+* Sat Sep 22 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.92-2
+- Update the icon cache scriptlets
+
* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
- Update to 3.5.92
commit 038ba79473851ed44a79e3d4165fac073db0255c
Author: Richard Hughes <richard(a)hughsie.com>
Date: Thu Sep 20 10:53:25 2012 +0100
Update to 3.5.92
diff --git a/.gitignore b/.gitignore
index bbc2c8f..c76bf58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.4.1.tar.xz
/gnome-applets-3.5.1.tar.xz
/gnome-applets-3.5.91.tar.xz
+/gnome-applets-3.5.92.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 32de81b..bbecab7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.5.91
+Version: 3.5.92
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -257,6 +257,9 @@ fi
%changelog
+* Thu Sep 20 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.92-1
+- Update to 3.5.92
+
* Tue Sep 04 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.91-1
- Update to 3.5.91
diff --git a/sources b/sources
index 86f8fc0..7e2ab04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-291f09aac9c670218a011c9ba2f3e695 gnome-applets-3.5.91.tar.xz
+e38a776431e648a2932fa5c6ebff40a4 gnome-applets-3.5.92.tar.xz
commit f6cf4fe274164b956cdb60193ae0d61eed8225c6
Author: Richard Hughes <richard(a)hughsie.com>
Date: Tue Sep 4 13:23:25 2012 +0100
Update to 3.5.91
diff --git a/.gitignore b/.gitignore
index a7ca0a7..bbc2c8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.3.1.tar.xz
/gnome-applets-3.4.1.tar.xz
/gnome-applets-3.5.1.tar.xz
+/gnome-applets-3.5.91.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2751c7e..32de81b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.5.1
-Release: 2%{?dist}
+Version: 3.5.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Tue Sep 04 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.5.91-1
+- Update to 3.5.91
+
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1481231..86f8fc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3c3c9045a6b85a68ac2d90758bfcb2b gnome-applets-3.5.1.tar.xz
+291f09aac9c670218a011c9ba2f3e695 gnome-applets-3.5.91.tar.xz
commit a4af0ce345600ef6246f6dc7a250c3b29724333e
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jul 27 00:17:22 2012 -0500
Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1dcc488..2751c7e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sun May 06 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.1-1
- Update to 3.5.1
commit c3a0c9ab54aaa2d97aff23475bb79bc8c9d5093c
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat May 5 23:59:36 2012 +0300
3.5.1
diff --git a/.gitignore b/.gitignore
index 27b2f1b..a7ca0a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.2.1.tar.xz
/gnome-applets-3.3.1.tar.xz
/gnome-applets-3.4.1.tar.xz
+/gnome-applets-3.5.1.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4bac34f..1dcc488 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,14 +33,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.4.1
+Version: 3.5.1
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz
Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
@@ -257,6 +257,9 @@ fi
%changelog
+* Sun May 06 2012 Kalev Lember <kalevlember(a)gmail.com> - 1:3.5.1-1
+- Update to 3.5.1
+
* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.4.1-1
- Update to 3.4.1
diff --git a/sources b/sources
index a8bbafa..1481231 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82a4946d10257239214cf18edeeb34c1 gnome-applets-3.4.1.tar.xz
+a3c3c9045a6b85a68ac2d90758bfcb2b gnome-applets-3.5.1.tar.xz
commit 3f9c94886f7ae628863b4c8ee75b68b08a7a72df
Author: Richard Hughes <richard(a)hughsie.com>
Date: Mon Apr 16 09:09:52 2012 +0100
Update to 3.4.1
diff --git a/.gitignore b/.gitignore
index ed81ccc..27b2f1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.2.0.tar.xz
/gnome-applets-3.2.1.tar.xz
/gnome-applets-3.3.1.tar.xz
+/gnome-applets-3.4.1.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c456dea..4bac34f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.3.1
-Release: 2%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 1:3.4.1-1
+- Update to 3.4.1
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index b243704..a8bbafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c2ca92d019f9ff0bda0cb544f751d7e gnome-applets-3.3.1.tar.xz
+82a4946d10257239214cf18edeeb34c1 gnome-applets-3.4.1.tar.xz
commit 062f6e85a3dc184bfe9193e277d3be2c809a43e6
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jan 12 21:45:39 2012 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7b1f8fa..c456dea 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> = 1:3.3.1-1
- Update to 3.3.1
commit 1e205ba6e466a923804c357999a65249fc09103e
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Nov 2 22:34:12 2011 -0400
3.3.1
diff --git a/.gitignore b/.gitignore
index 52cfa4b..ed81ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.92.tar.xz
/gnome-applets-3.2.0.tar.xz
/gnome-applets-3.2.1.tar.xz
+/gnome-applets-3.3.1.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4d651f8..7b1f8fa 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,14 +33,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.2.1
-Release: 2%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
@@ -257,6 +257,9 @@ fi
%changelog
+* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> = 1:3.3.1-1
+- Update to 3.3.1
+
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.2.1-2
- Rebuilt for glibc bug#747377
diff --git a/sources b/sources
index 6162b16..b243704 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bce6d49f3bb2caff8d91c78599ffcfd0 gnome-applets-3.2.1.tar.xz
+1c2ca92d019f9ff0bda0cb544f751d7e gnome-applets-3.3.1.tar.xz
commit a57bd04c202469629ae8fff74cf3e53ec16c1e4d
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Oct 26 18:51:40 2011 -0500
- Rebuilt for glibc bug#747377
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fd4f542..4d651f8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:3.2.1-2
+- Rebuilt for glibc bug#747377
+
* Wed Oct 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 1:3.2.1-1
- Update to 3.2.1
commit b067316b5eef32448456ad3836d051cd438c79f9
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Oct 19 06:31:24 2011 -0400
3.2.1
diff --git a/.gitignore b/.gitignore
index 21ff89f..52cfa4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.91.tar.xz
/gnome-applets-3.1.92.tar.xz
/gnome-applets-3.2.0.tar.xz
+/gnome-applets-3.2.1.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8d038d2..fd4f542 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,14 +33,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.2.0
+Version: 3.2.1
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz
Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
@@ -257,6 +257,12 @@ fi
%changelog
+* Wed Oct 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 1:3.2.1-1
+- Update to 3.2.1
+
+* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
+- Update to 3.2.0
+
* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
- Update to 3.2.0
diff --git a/sources b/sources
index 633c33c..6162b16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ff3c42fdb4e3a6c7335c3e9f2d4f400 gnome-applets-3.2.0.tar.xz
+bce6d49f3bb2caff8d91c78599ffcfd0 gnome-applets-3.2.1.tar.xz
commit 5fceaf61db4fd5cd1cc8a2da50159f9f7c099f2d
Author: Ray Strode <rstrode(a)redhat.com>
Date: Wed Sep 28 21:18:58 2011 -0400
Update to 3.2.0
diff --git a/.gitignore b/.gitignore
index 87e1589..21ff89f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.90.tar.xz
/gnome-applets-3.1.91.tar.xz
/gnome-applets-3.1.92.tar.xz
+/gnome-applets-3.2.0.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cab8be6..8d038d2 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.92
+Version: 3.2.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -257,6 +257,9 @@ fi
%changelog
+* Wed Sep 28 2011 Ray <rstrode(a)redhat.com> - 1:3.2.0-1
+- Update to 3.2.0
+
* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
- Update to 3.1.92
diff --git a/sources b/sources
index be739b8..633c33c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4f46f6be12626f90be5e05eef29d08c gnome-applets-3.1.92.tar.xz
+6ff3c42fdb4e3a6c7335c3e9f2d4f400 gnome-applets-3.2.0.tar.xz
commit 33bdd0c7106d608639aea266f37d200db7c97919
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Sep 20 19:15:55 2011 -0400
3.1.92
diff --git a/.gitignore b/.gitignore
index 6f3963e..87e1589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.5.tar.xz
/gnome-applets-3.1.90.tar.xz
/gnome-applets-3.1.91.tar.xz
+/gnome-applets-3.1.92.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f9c1b4a..cab8be6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.91
-Release: 2%{?dist}
+Version: 3.1.92
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -257,6 +257,9 @@ fi
%changelog
+* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
* Thu Sep 08 2011 Dan Hork <dan[at]danny.cz> - 3.1.91-2
- kernel-tools-devel isn't built on s390(x) and sparc64
diff --git a/sources b/sources
index 53e6f7e..be739b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c3f2842a808499e38174f24d957ef72 gnome-applets-3.1.91.tar.xz
+e4f46f6be12626f90be5e05eef29d08c gnome-applets-3.1.92.tar.xz
commit 1ed9bbb0faa49eb60b2be20f61f4a7fdbca73bd8
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Sep 8 19:48:10 2011 +0200
kernel-tools-devel isn't built on s390(x) and sparc64
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 16ded8f..f9c1b4a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.1.91
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -73,7 +73,9 @@ BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
BuildRequires: scrollkeeper
BuildRequires: libSM-devel
+%ifnarch s390 s390x sparc64
BuildRequires: kernel-tools-devel
+%endif
BuildRequires: autoconf automake libtool
@@ -255,6 +257,9 @@ fi
%changelog
+* Thu Sep 08 2011 Dan Hork <dan[at]danny.cz> - 3.1.91-2
+- kernel-tools-devel isn't built on s390(x) and sparc64
+
* Wed Sep 07 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-1
- Update to 3.1.91
commit ef55ac5eb16e029ba45dc48395b9acf701cc7f75
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Wed Sep 7 02:21:14 2011 +0300
Update to 3.1.91
diff --git a/.gitignore b/.gitignore
index fd61143..6f3963e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.4.tar.xz
/gnome-applets-3.1.5.tar.xz
/gnome-applets-3.1.90.tar.xz
+/gnome-applets-3.1.91.tar.xz
diff --git a/0001-Explicitly-link-against-libm.patch b/0001-Explicitly-link-against-libm.patch
deleted file mode 100644
index 6f61419..0000000
--- a/0001-Explicitly-link-against-libm.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d9020e1eb228e780fc0bbc316a6741ed5b6cb3c5 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember(a)gmail.com>
-Date: Thu, 1 Sep 2011 00:23:04 +0300
-Subject: [PATCH] Explicitly link against libm
-
-gdk-pixbuf used to include libm in its pkgconfig libs line, but that was
-recently changed.
----
- configure.in | 3 +++
- geyes/Makefile.am | 3 ++-
- multiload/Makefile.am | 3 ++-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 118e34b..a089ac8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -51,6 +51,9 @@ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- AC_SUBST(X_LIBS)
-
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- GNOME_COMPILE_WARNINGS
-
- dnl Check for non-portable headers
-diff --git a/geyes/Makefile.am b/geyes/Makefile.am
-index 935d932..46abd31 100644
---- a/geyes/Makefile.am
-+++ b/geyes/Makefile.am
-@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
- geyes.h
-
- geyes_applet2_LDADD = \
-- $(GNOME_APPLETS_LIBS)
-+ $(GNOME_APPLETS_LIBS) \
-+ $(LIBM)
-
- appletdir = $(datadir)/gnome-panel/4.0/applets
- applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
-diff --git a/multiload/Makefile.am b/multiload/Makefile.am
-index a659f07..94da298 100644
---- a/multiload/Makefile.am
-+++ b/multiload/Makefile.am
-@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
- multiload_applet_2_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(GTOP_APPLETS_LIBS) \
-- $(GIO_UNIX_LIBS)
-+ $(GIO_UNIX_LIBS) \
-+ $(LIBM)
-
- schemasdir = @GCONF_SCHEMA_FILE_DIR@
- schemas_in_files = multiload.schemas.in
---
-1.7.6.1
-
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bd4f198..16ded8f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.90
+Version: 3.1.91
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -41,7 +41,6 @@ Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-Patch0: 0001-Explicitly-link-against-libm.patch
Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
@@ -103,7 +102,6 @@ and more.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
autoreconf -i -f
@@ -257,6 +255,9 @@ fi
%changelog
+* Wed Sep 07 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-1
+- Update to 3.1.91
+
* Wed Aug 31 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.90-1
- Update to 3.1.90
diff --git a/sources b/sources
index aa6aef7..53e6f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39e5564749361c7bfc7056a79bcd8ceb gnome-applets-3.1.90.tar.xz
+6c3f2842a808499e38174f24d957ef72 gnome-applets-3.1.91.tar.xz
commit 28fc315252cf3949b97c5adbd9ef34d234c59a68
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 31 19:20:16 2011 -0400
try to fix BRs
diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch
new file mode 100644
index 0000000..134a617
--- /dev/null
+++ b/gnome-applets-cpupower.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
+--- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400
++++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400
+@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
+ LIBCPUFREQ_LIBS=
+ if test "x$have_libcpufreq" = "xyes"; then
+ AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+- LIBCPUFREQ_LIBS=-lcpufreq
++ LIBCPUFREQ_LIBS=-lcpupower
+ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1952988..bd4f198 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -42,6 +42,7 @@ URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
Patch0: 0001-Explicitly-link-against-libm.patch
+Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -69,10 +70,11 @@ BuildRequires: libxslt
BuildRequires: NetworkManager-devel
BuildRequires: libgweather-devel >= %{libgweather_version}
# For cpufreq
-BuildRequires: dbus-devel
+BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
BuildRequires: scrollkeeper
BuildRequires: libSM-devel
+BuildRequires: kernel-tools-devel
BuildRequires: autoconf automake libtool
@@ -102,6 +104,7 @@ and more.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
autoreconf -i -f
commit 0ab4846aba665af613fde8786b6d12e4a1679d24
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 31 18:29:54 2011 -0400
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0318ff5..1952988 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -41,7 +41,7 @@ Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-Patch: 0001-Explicitly-link-against-libm.patch
+Patch0: 0001-Explicitly-link-against-libm.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
commit 8eef86e7a43410a70dc2e4e9c75aebf059c795c1
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 31 18:27:36 2011 -0400
gah, better to actually apply a patch
diff --git a/0001-Explicitly-link-against-libm.patch b/0001-Explicitly-link-against-libm.patch
new file mode 100644
index 0000000..6f61419
--- /dev/null
+++ b/0001-Explicitly-link-against-libm.patch
@@ -0,0 +1,58 @@
+From d9020e1eb228e780fc0bbc316a6741ed5b6cb3c5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember(a)gmail.com>
+Date: Thu, 1 Sep 2011 00:23:04 +0300
+Subject: [PATCH] Explicitly link against libm
+
+gdk-pixbuf used to include libm in its pkgconfig libs line, but that was
+recently changed.
+---
+ configure.in | 3 +++
+ geyes/Makefile.am | 3 ++-
+ multiload/Makefile.am | 3 ++-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 118e34b..a089ac8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -51,6 +51,9 @@ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
+ X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ AC_SUBST(X_LIBS)
+
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ GNOME_COMPILE_WARNINGS
+
+ dnl Check for non-portable headers
+diff --git a/geyes/Makefile.am b/geyes/Makefile.am
+index 935d932..46abd31 100644
+--- a/geyes/Makefile.am
++++ b/geyes/Makefile.am
+@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
+ geyes.h
+
+ geyes_applet2_LDADD = \
+- $(GNOME_APPLETS_LIBS)
++ $(GNOME_APPLETS_LIBS) \
++ $(LIBM)
+
+ appletdir = $(datadir)/gnome-panel/4.0/applets
+ applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
+diff --git a/multiload/Makefile.am b/multiload/Makefile.am
+index a659f07..94da298 100644
+--- a/multiload/Makefile.am
++++ b/multiload/Makefile.am
+@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
+ multiload_applet_2_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(GTOP_APPLETS_LIBS) \
+- $(GIO_UNIX_LIBS)
++ $(GIO_UNIX_LIBS) \
++ $(LIBM)
+
+ schemasdir = @GCONF_SCHEMA_FILE_DIR@
+ schemas_in_files = multiload.schemas.in
+--
+1.7.6.1
+
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
deleted file mode 100644
index 46758fe..0000000
--- a/gnome-applets-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-3.1.90/configure.in.libs gnome-applets-3.1.90/configure.in
-diff -up gnome-applets-3.1.90/geyes/Makefile.am.libs gnome-applets-3.1.90/geyes/Makefile.am
---- gnome-applets-3.1.90/geyes/Makefile.am.libs 2011-08-31 17:56:23.111738179 -0400
-+++ gnome-applets-3.1.90/geyes/Makefile.am 2011-08-31 17:56:31.948738762 -0400
-@@ -16,7 +16,7 @@ geyes_applet2_SOURCES = \
- geyes.h
-
- geyes_applet2_LDADD = \
-- $(GNOME_APPLETS_LIBS)
-+ $(GNOME_APPLETS_LIBS) -lm
-
- appletdir = $(datadir)/gnome-panel/4.0/applets
- applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d4343cb..0318ff5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -41,7 +41,7 @@ Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-Patch: gnome-applets-libs.patch
+Patch: 0001-Explicitly-link-against-libm.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -101,6 +101,7 @@ and more.
%prep
%setup -q
+%patch0 -p1
autoreconf -i -f
commit b4c4e56f3633d587a37fe1ad902448e4beaa7fa7
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 31 18:03:48 2011 -0400
fix linking
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
new file mode 100644
index 0000000..46758fe
--- /dev/null
+++ b/gnome-applets-libs.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-3.1.90/configure.in.libs gnome-applets-3.1.90/configure.in
+diff -up gnome-applets-3.1.90/geyes/Makefile.am.libs gnome-applets-3.1.90/geyes/Makefile.am
+--- gnome-applets-3.1.90/geyes/Makefile.am.libs 2011-08-31 17:56:23.111738179 -0400
++++ gnome-applets-3.1.90/geyes/Makefile.am 2011-08-31 17:56:31.948738762 -0400
+@@ -16,7 +16,7 @@ geyes_applet2_SOURCES = \
+ geyes.h
+
+ geyes_applet2_LDADD = \
+- $(GNOME_APPLETS_LIBS)
++ $(GNOME_APPLETS_LIBS) -lm
+
+ appletdir = $(datadir)/gnome-panel/4.0/applets
+ applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1fc8651..d4343cb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -41,6 +41,7 @@ Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
+Patch: gnome-applets-libs.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -73,6 +74,8 @@ BuildRequires: polkit-devel >= 0.92
BuildRequires: scrollkeeper
BuildRequires: libSM-devel
+BuildRequires: autoconf automake libtool
+
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
@@ -99,6 +102,8 @@ and more.
%prep
%setup -q
+autoreconf -i -f
+
%build
%configure \
--enable-suid=no \
commit bc4af14d8fcff8953f0b9ddfac4c31f6afaf8ac9
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 31 17:20:09 2011 -0400
3.1.90
diff --git a/.gitignore b/.gitignore
index d5b8714..fd61143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.3.tar.xz
/gnome-applets-3.1.4.tar.xz
/gnome-applets-3.1.5.tar.xz
+/gnome-applets-3.1.90.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c25fa86..1fc8651 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.5
+Version: 3.1.90
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -248,6 +248,9 @@ fi
%changelog
+* Wed Aug 31 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.90-1
+- Update to 3.1.90
+
* Thu Aug 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
- Update to 3.1.5
diff --git a/sources b/sources
index a717654..aa6aef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58607cd7b28b2bd2f23231cfb105e920 gnome-applets-3.1.5.tar.xz
+39e5564749361c7bfc7056a79bcd8ceb gnome-applets-3.1.90.tar.xz
commit a4ea3711dcdd90dce7ca369f96ca17363023a6f6
Author: Matthias Clasen <mclasen(a)lemur.(none)>
Date: Thu Aug 18 09:04:34 2011 -0400
3.1.5
diff --git a/.gitignore b/.gitignore
index 92834b0..d5b8714 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.2.tar.xz
/gnome-applets-3.1.3.tar.xz
/gnome-applets-3.1.4.tar.xz
+/gnome-applets-3.1.5.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b81ab22..c25fa86 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.4
+Version: 3.1.5
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -208,7 +208,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
%files -f %{po_package}.lang
-%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/16x16/apps/*
@@ -249,6 +248,9 @@ fi
%changelog
+* Thu Aug 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
* Tue Jul 26 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.4-1
- Update to 3.1.4
diff --git a/sources b/sources
index 468214e..a717654 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4063e8594b8493d318d8fe14a190e509 gnome-applets-3.1.4.tar.xz
+58607cd7b28b2bd2f23231cfb105e920 gnome-applets-3.1.5.tar.xz
commit 1248c55befdc7b4cedce683cd2067b626d717588
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Jul 26 10:53:34 2011 -0400
3.1.4
diff --git a/.gitignore b/.gitignore
index 5b5617a..92834b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.1.tar.bz2
/gnome-applets-3.1.2.tar.xz
/gnome-applets-3.1.3.tar.xz
+/gnome-applets-3.1.4.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c772cee..b81ab22 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.3
+Version: 3.1.4
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -119,23 +119,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-# save space by linking identical images in translated docs
-for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do
- for f in $helpdir/C/figures/*.png; do
- b="$(basename $f)"
- for d in $helpdir/*; do
- if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
- g="$d/figures/$b"
- if [ -f "$g" ]; then
- if cmp -s $f $g; then
- rm "$g"; ln -s "../../C/figures/$b" "$g"
- fi
- fi
- fi
- done
- done
-done
-
%find_lang %{po_package} --all-name --with-gnome
# Clean up unpackaged files
@@ -266,6 +249,9 @@ fi
%changelog
+* Tue Jul 26 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.4-1
+- Update to 3.1.4
+
* Mon Jul 04 2011 Bastien Nocera <bnocera(a)redhat.com> 3.1.3-1
- Update to 3.1.3
diff --git a/sources b/sources
index 7b3c06a..468214e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-909e59e8b991c44e9c10c2ce8bd28103 gnome-applets-3.1.3.tar.xz
+4063e8594b8493d318d8fe14a190e509 gnome-applets-3.1.4.tar.xz
commit 04688fe19b66bf5ae7f9832745e2bb228887a201
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Mon Jul 4 11:33:04 2011 +0100
Update to 3.1.3
diff --git a/.gitignore b/.gitignore
index 4d6bf6e..5b5617a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.32.0.tar.bz2
/gnome-applets-3.1.1.tar.bz2
/gnome-applets-3.1.2.tar.xz
+/gnome-applets-3.1.3.tar.xz
diff --git a/copy.xsl b/copy.xsl
deleted file mode 100644
index 0e64463..0000000
--- a/copy.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns="http://www.w3.org/1999/xhtml"
- version="1.0">
-
-<xsl:output method="xml" doctype-system="location.dtd"/>
-<xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
-</xsl:template>
-<xsl:template match="name">
- <xsl:choose>
- <xsl:when test="@xml:lang">
- <xsl:variable name="ctext" select="../name[1]"/>
- <xsl:variable name="thistext" select="."/>
- <xsl:if test="$ctext != $thistext">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:if>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/cpufreq-selector.app b/cpufreq-selector.app
deleted file mode 100644
index 6a738ec..0000000
--- a/cpufreq-selector.app
+++ /dev/null
@@ -1 +0,0 @@
-FALLBACK=true
diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam
deleted file mode 100644
index 34bb38a..0000000
--- a/cpufreq-selector.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_console.so
-account required pam_permit.so
diff --git a/gnome-applets-2.15.1.1-dont-require-display.patch b/gnome-applets-2.15.1.1-dont-require-display.patch
deleted file mode 100644
index f6fcada..0000000
--- a/gnome-applets-2.15.1.1-dont-require-display.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-applets-2.15.1.1/configure.in.dont-require-display 2006-08-02 11:43:36.000000000 -0400
-+++ gnome-applets-2.15.1.1/configure.in 2006-08-02 11:44:55.000000000 -0400
-@@ -545,8 +545,9 @@ dnl *** invest-applet specific checks
- dnl ***************************************************************************
-
- if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
-- AM_CHECK_PYMOD(gnomeapplet,,
-- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-+dnl AM_CHECK_PYMOD(gnomeapplet,,
-+dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-+ BUILD_INVEST_APPLET="yes"
- else
- BUILD_INVEST_APPLET="no"
- fi
diff --git a/gnome-applets-2.15.2-use-old-modemlights.patch b/gnome-applets-2.15.2-use-old-modemlights.patch
deleted file mode 100644
index f0bef45..0000000
--- a/gnome-applets-2.15.2-use-old-modemlights.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up gnome-applets-2.31.90.1/configure.in.use-old-modemlights gnome-applets-2.31.90.1/configure.in
---- gnome-applets-2.31.90.1/configure.in.use-old-modemlights 2010-08-18 18:30:01.000000000 -0400
-+++ gnome-applets-2.31.90.1/configure.in 2010-08-19 19:40:12.344849004 -0400
-@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
- AC_SUBST(GNOME_APPLETS3_CFLAGS)
- AC_SUBST(GNOME_APPLETS3_LIBS)
-
-+dnl -- check for libgnome (required) ------------------------------------------
-+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
-+AC_SUBST(GNOME_LIBS2_CFLAGS)
-+AC_SUBST(GNOME_LIBS2_LIBS)
-+
- dnl -- check for gnome-desktop (required) -------------------------------------
- PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
- AC_SUBST(GNOMEDESKTOP_CFLAGS)
-@@ -407,12 +412,10 @@ if test x$disable_battstat = xno; then
- case "${host}" in
- powerpc-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that use libapm
- *-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that do not use libapm
- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-@@ -554,14 +557,16 @@ fi
- AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
- AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
- AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes)
-+AM_CONDITIONAL(APPLET_MODEMLIGHTS, true)
-
- dnl ***************************************************************************
- dnl *** invest-applet specific checks ***
- dnl ***************************************************************************
-
- if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
-- AM_CHECK_PYMOD(gnomeapplet,,
-- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-+dnl AM_CHECK_PYMOD(gnomeapplet,,
-+dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-+ BUILD_INVEST_APPLET="yes"
- else
- BUILD_INVEST_APPLET="no"
- fi
-@@ -688,6 +693,9 @@ mini-commander/help/Makefile
- drivemount/Makefile
- drivemount/help/Makefile
- modemlights/Makefile
-+modemlights/docs/Makefile
-+modemlights/docs/C/Makefile
-+modemlights/docs/eu/Makefile
- multiload/Makefile
- multiload/docs/Makefile
- gkb-new/Makefile
diff --git a/gnome-applets-2.23.3-use-builtin-apm.patch b/gnome-applets-2.23.3-use-builtin-apm.patch
deleted file mode 100644
index c91aadb..0000000
--- a/gnome-applets-2.23.3-use-builtin-apm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up gnome-applets-2.23.3/configure.in.use-builtin-apm gnome-applets-2.23.3/configure.in
---- gnome-applets-2.23.3/configure.in.use-builtin-apm 2008-07-31 21:52:11.000000000 -0400
-+++ gnome-applets-2.23.3/configure.in 2008-07-31 21:53:29.000000000 -0400
-@@ -414,12 +414,10 @@ if test x$disable_battstat = xno; then
- case "${host}" in
- powerpc-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that use libapm
- *-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that do not use libapm
- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
deleted file mode 100644
index 2cb1526..0000000
--- a/gnome-applets-2.3.6-ppp-command.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command gnome-applets-2.23.4/modemlights/modemlights.schemas.in
---- gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command 2003-07-26 08:50:45.000000000 -0400
-+++ gnome-applets-2.23.4/modemlights/modemlights.schemas.in 2008-08-04 23:27:17.000000000 -0400
-@@ -27,7 +27,7 @@
- <key>/schemas/apps/modemlights/prefs/connect</key>
- <owner>modemlights_applet2</owner>
- <type>string</type>
-- <default>pppon</default>
-+ <default>/sbin/ifup ppp0</default>
- <locale name="C">
- <short>Command executed when connecting</short>
- <long>Use this command to connect the modem.</long>
-@@ -38,7 +38,7 @@
- <key>/schemas/apps/modemlights/prefs/disconnect</key>
- <owner>modemlights_applet2</owner>
- <type>string</type>
-- <default>pppoff</default>
-+ <default>/sbin/ifdown ppp0</default>
- <locale name="C">
- <short>Command executed when disconnecting</short>
- <long>Use this command to disconnect the modem.</long>
diff --git a/gnome-applets-dbus-glib.patch b/gnome-applets-dbus-glib.patch
deleted file mode 100644
index fcece10..0000000
--- a/gnome-applets-dbus-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.32.0/configure.in.dbus-glib gnome-applets-2.32.0/configure.in
---- gnome-applets-2.32.0/configure.in.dbus-glib 2010-11-03 16:46:18.251241996 -0400
-+++ gnome-applets-2.32.0/configure.in 2010-11-03 16:46:55.642242004 -0400
-@@ -273,7 +273,7 @@ AC_SUBST(XML2_LIBS)
-
- dnl -- check for libgweather (required for gweather applet) ------------------
- build_libgweather_applets=false
--PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED,
-+PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED dbus-glib-1,
- build_libgweather_applets=true,
- AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
- AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
deleted file mode 100644
index b2b3347..0000000
--- a/gnome-applets-libs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am
---- gnome-applets-2.31.90.1/geyes/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
-+++ gnome-applets-2.31.90.1/geyes/Makefile.am 2010-08-19 20:02:37.640849001 -0400
-@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
- geyes.h
-
- geyes_applet2_LDADD = \
-- $(GNOME_APPLETS3_LIBS)
-+ $(GNOME_APPLETS3_LIBS) \
-+ -lm
-
- appletdir = $(datadir)/gnome-panel/applets
- applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
-diff -up gnome-applets-2.31.90.1/multiload/Makefile.am.libs gnome-applets-2.31.90.1/multiload/Makefile.am
---- gnome-applets-2.31.90.1/multiload/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
-+++ gnome-applets-2.31.90.1/multiload/Makefile.am 2010-08-19 20:03:22.087849003 -0400
-@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
- multiload_applet_2_LDADD = \
- $(GNOME_APPLETS3_LIBS) \
- $(GTOP_APPLETS_LIBS) \
-- $(GNOMEDESKTOP_LIBS)
-+ $(GNOMEDESKTOP_LIBS) \
-+ -lm
-
- schemasdir = @GCONF_SCHEMA_FILE_DIR@
- schemas_in_files = multiload.schemas.in
-diff -up gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs gnome-applets-2.31.90.1/trashapplet/src/Makefile.am
---- gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
-+++ gnome-applets-2.31.90.1/trashapplet/src/Makefile.am 2010-08-19 20:03:52.609849003 -0400
-@@ -14,6 +14,7 @@ trashapplet_SOURCES = \
-
- trashapplet_LDADD = \
- $(GNOME_APPLETS3_LIBS) \
-- $(GIO_LIBS)
-+ $(GIO_LIBS) \
-+ -lX11
-
- -include $(top_srcdir)/git.mk
diff --git a/gnome-applets-no-mixer-icon.patch b/gnome-applets-no-mixer-icon.patch
deleted file mode 100644
index 79b57cf..0000000
--- a/gnome-applets-no-mixer-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in
---- gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon 2009-02-06 14:31:43.000000000 -0500
-+++ gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in 2009-02-06 14:32:54.000000000 -0500
-@@ -11,7 +11,6 @@
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
- <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
-- <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
- <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
- <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>
diff --git a/gnome-applets-notify.patch b/gnome-applets-notify.patch
deleted file mode 100644
index e8514e2..0000000
--- a/gnome-applets-notify.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-2.32.0/gweather/gweather-applet.c.notify gnome-applets-2.32.0/gweather/gweather-applet.c
---- gnome-applets-2.32.0/gweather/gweather-applet.c.notify 2010-11-03 16:59:56.081241996 -0400
-+++ gnome-applets-2.32.0/gweather/gweather-applet.c 2010-11-03 17:00:04.367241996 -0400
-@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint
- if (icon == NULL)
- icon = "stock-unknown";
-
-- n = notify_notification_new (message, detail, icon,
-- gw_applet->container);
-+ n = notify_notification_new (message, detail, icon);
-
- notify_notification_show (n, &error);
- if (error)
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
deleted file mode 100644
index 760bc1c..0000000
--- a/gnome-applets-null-battstat.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -up gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in
---- gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null 2010-03-28 23:21:03.987012192 -0400
-+++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-28 23:21:03.988012052 -0400
-@@ -0,0 +1,22 @@
-+<oaf_info>
-+
-+<oaf_server iid="OAFIID:GNOME_BattstatApplet"
-+ type="factory"
-+ location="OAFIID:GNOME_NullApplet_Factory">
-+
-+ <oaf_attribute name="repo_ids" type="stringv">
-+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+ <item value="IDL:Bonobo/Control:1.0"/>
-+ <item value="IDL:Bonobo/Unknown:1.0"/>
-+ </oaf_attribute>
-+ <oaf_attribute name="name" type="string" _value="Battery Charge Monitor"/>
-+ <oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
-+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="battery"/>
-+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
-+
-+
-+</oaf_server>
-+
-+</oaf_info>
-diff -up gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null gnome-applets-2.30.0/null_applet/Makefile.am
---- gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null 2010-03-28 01:29:51.000000000 -0400
-+++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:23:29.771762645 -0400
-@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
- mixer_server_in = GNOME_MixerApplet.server.in
- endif
-
-+if !BUILD_BATTSTAT_APPLET
-+battstat_applet=GNOME_BattstatApplet.server.in
-+endif
-+
- libexec_PROGRAMS = null_applet
-
- null_applet_SOURCES = null_applet.c
-@@ -21,6 +25,7 @@ server_in_files = \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_KeyboardApplet.server.in \
-+ $(battstat_applet) \
- $(mixer_server_in)
- server_DATA = $(server_in_files:.server.in=.server)
-
-@@ -39,6 +44,7 @@ EXTRA_DIST = \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_MixerApplet.server.in \
-+ GNOME_BattstatApplet.server.in \
- GNOME_KeyboardApplet.server.in
-
- -include $(top_srcdir)/git.mk
-diff -up gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null gnome-applets-2.30.0/null_applet/null_applet.c
---- gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null 2010-03-28 01:29:51.000000000 -0400
-+++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:24:15.766774031 -0400
-@@ -46,6 +46,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_MixerApplet", _("Volume Control"));
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
- }
-
- static gboolean already_running;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index db528f2..c772cee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,60 +33,28 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.2
-Release: 2%{?dist}
+Version: 3.1.3
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-# Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
-
-
-Patch3: gnome-applets-2.3.6-ppp-command.patch
-
-Patch34: ppp-includes.patch
-Patch35: modemlights-libgnome.patch
-
-# do the nullapplet dance for battstat
-Patch40: gnome-applets-null-battstat.patch
-# and keep the mixer hidden away from the add to panel dialog
-Patch41: gnome-applets-no-mixer-icon.patch
-# do the nullapplet dance for stickynotes
-Patch42: stickynotes-null.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=609945
-Patch50: gnome-applets-libs.patch
-Patch51: pymod-check.patch
-
-Patch52: gnome-applets-dbus-glib.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=632803
-Patch53: gnome-applets-notify.patch
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
-# BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-# BuildRequires: libgnome-devel >= %{libgnome_version}
BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
-# BuildRequires: libglade2-devel >= %{libglade_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
-# BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
BuildRequires: /usr/bin/automake
-# BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck3-devel >= %{libwnck_version}
-# BuildRequires: gnome-desktop3-devel >= %{libgnome_desktop_version}
-# BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
-# BuildRequires: pygtk2-devel >= %{pygtk_version}
-# BuildRequires: gnome-python2-devel >= %{gnome_python_version}
-# BuildRequires: gnome-python2-applet
BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -96,13 +64,11 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
-# BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
-# for patch 39
BuildRequires: NetworkManager-devel
BuildRequires: libgweather-devel >= %{libgweather_version}
# For cpufreq
-BuildRequires: dbus-devel
+BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
BuildRequires: scrollkeeper
BuildRequires: libSM-devel
@@ -118,10 +84,6 @@ Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
-# For invest-applet
-# Requires: gnome-python2-applet
-# Requires: gnome-python2-libegg
-
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -137,26 +99,6 @@ and more.
%prep
%setup -q
-# TODO: port these three to new infrastructure
-# %patch40 -p1 -b .battstat-null
-# %patch41 -p1 -b .no-mixer-icon
-# %patch42 -p1 -b .stickynotes-null
-
-# We don't ship gnome-system-tools
-# rm -rf modemlights
-# tar xjf %{SOURCE2}
-
-# %patch3 -p1 -b .ppp-command
-# %patch34 -p1 -b .ppp-includes
-# %patch35 -p1 -b .modemlights-libgnome
-# %patch50 -p1 -b .libs
-# %patch51 -p1 -b .pymod
-# %patch52 -p1 -b .dbus-glib
-# %patch53 -p1 -b .notify
-
-# autoreconf -i -f
-
-
%build
%configure \
--enable-suid=no \
@@ -324,6 +266,9 @@ fi
%changelog
+* Mon Jul 04 2011 Bastien Nocera <bnocera(a)redhat.com> 3.1.3-1
+- Update to 3.1.3
+
* Tue Jun 14 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.2-1
- Update to 3.1.2
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
deleted file mode 100644
index 956ed67..0000000
--- a/modemlights-libgnome.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -up gnome-applets-2.31.91/configure.in.modemlights-libgnome gnome-applets-2.31.91/configure.in
---- gnome-applets-2.31.91/configure.in.modemlights-libgnome 2010-08-30 06:11:48.000000000 -0400
-+++ gnome-applets-2.31.91/configure.in 2010-09-01 10:16:20.595940001 -0400
-@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
- AC_SUBST(GNOME_APPLETS3_CFLAGS)
- AC_SUBST(GNOME_APPLETS3_LIBS)
-
-+dnl -- check for libgnome (required) ------------------------------------------
-+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
-+AC_SUBST(GNOME_LIBS2_CFLAGS)
-+AC_SUBST(GNOME_LIBS2_LIBS)
-+
- dnl -- check for gnome-desktop (required) -------------------------------------
- PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
- AC_SUBST(GNOMEDESKTOP_CFLAGS)
-@@ -495,8 +500,7 @@ dnl AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR
- dnl AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
- dnl BUILD_MODEM_LIGHTS=yes
- dnl else
-- AC_MSG_WARN([*** modemlights applet will not be built ***])
-- BUILD_MODEM_LIGHTS=no
-+ BUILD_MODEM_LIGHTS=yes
- dnl fi
-
- AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
-@@ -688,6 +692,9 @@ mini-commander/help/Makefile
- drivemount/Makefile
- drivemount/help/Makefile
- modemlights/Makefile
-+modemlights/docs/Makefile
-+modemlights/docs/C/Makefile
-+modemlights/docs/eu/Makefile
- multiload/Makefile
- multiload/docs/Makefile
- gkb-new/Makefile
-diff -up gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.91/modemlights/Makefile.am
---- gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.31.91/modemlights/Makefile.am 2010-09-01 10:10:27.119940001 -0400
-@@ -2,6 +2,7 @@ SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DVERSION=\""$(VERSION)"\"
-
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- properties.c
-
- modemlights_applet2_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
-diff -up gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.91/po/POTFILES.in
---- gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome 2010-08-30 06:11:15.000000000 -0400
-+++ gnome-applets-2.31.91/po/POTFILES.in 2010-09-01 10:10:27.181940002 -0400
-@@ -72,7 +72,7 @@ mixer/applet.c
- mixer/dock.c
- mixer/load.c
- mixer/mixer.schemas.in
--mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
-+[type: gettext/ini]mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
- mixer/preferences.c
- modemlights/modem-applet.c
- [type: gettext/glade]modemlights/modemlights.ui
diff --git a/ppp-includes.patch b/ppp-includes.patch
deleted file mode 100644
index a3056c8..0000000
--- a/ppp-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
---- gnome-applets-2.19.0/modemlights/modemlights.c.includes 2007-07-30 18:05:02.000000000 -0400
-+++ gnome-applets-2.19.0/modemlights/modemlights.c 2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,8 @@
- #endif
-
- #ifdef __linux__
-+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-+#include <linux/types.h>
- #include <linux/if_ppp.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
diff --git a/pymod-check.patch b/pymod-check.patch
deleted file mode 100644
index 26721f2..0000000
--- a/pymod-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up gnome-applets-2.31.91/m4/python.m4.pymod gnome-applets-2.31.91/m4/python.m4
---- gnome-applets-2.31.91/m4/python.m4.pymod 2010-09-01 11:45:44.141940000 -0400
-+++ gnome-applets-2.31.91/m4/python.m4 2010-09-01 11:45:59.292940002 -0400
-@@ -14,6 +14,7 @@ except ImportError:
- sys.exit(1)
- except:
- sys.exit(0)
-+
- sys.exit(0)"], [prog="
- import $1
- $1.$2"])
-diff -up gnome-applets-2.31.91/configure.in.gnomeapplet gnome-applets-2.31.91/configure.in
---- gnome-applets-2.31.91/configure.in.gnomeapplet 2010-09-01 13:40:56.170939997 -0400
-+++ gnome-applets-2.31.91/configure.in 2010-09-01 13:44:44.248940002 -0400
-@@ -564,8 +564,7 @@ dnl *** invest-applet specific checks
- dnl ***************************************************************************
-
- if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
-- AM_CHECK_PYMOD(gnomeapplet,,
-- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-+ BUILD_INVEST_APPLET="yes"
- else
- BUILD_INVEST_APPLET="no"
- fi
diff --git a/seriesid-clash.patch b/seriesid-clash.patch
deleted file mode 100644
index 0dd346d..0000000
--- a/seriesid-clash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in
---- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid 2009-10-27 00:25:35.351806142 -0400
-+++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in 2009-10-27 00:29:15.578549690 -0400
-@@ -3,7 +3,7 @@
- <resource>
- <subject category="GNOME|Applets|Utility"/>
- <type>user's guide</type>
-- <relation seriesid="df109296-40e7-11d6-935f-beaae1cfe4f9"/>
-+ <relation seriesid="04cc2ede-586b-2643-7e6f-37a004e0fbd470"/>
- <rights type="GNU FDL" license.version="1.1" holder="Terence Hall"/>
- </resource>
- </omf>
diff --git a/sources b/sources
index 760ff50..7b3c06a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40378b28964eff66ed5db18444b5e5da gnome-applets-3.1.2.tar.xz
+909e59e8b991c44e9c10c2ce8bd28103 gnome-applets-3.1.3.tar.xz
diff --git a/stickynotes-null.patch b/stickynotes-null.patch
deleted file mode 100644
index 810d874..0000000
--- a/stickynotes-null.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -up gnome-applets-2.30.0/Makefile.am.stickynotes-null gnome-applets-2.30.0/Makefile.am
---- gnome-applets-2.30.0/Makefile.am.stickynotes-null 2010-03-28 01:29:51.000000000 -0400
-+++ gnome-applets-2.30.0/Makefile.am 2010-03-28 23:24:47.360759295 -0400
-@@ -42,7 +42,6 @@ always_built_SUBDIRS = \
- geyes \
- mini-commander \
- gkb-new \
-- stickynotes \
- trashapplet \
- null_applet
-
-diff -up gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in
---- gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null 2010-03-28 23:24:47.362759364 -0400
-+++ gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in 2010-03-28 23:24:47.363762926 -0400
-@@ -0,0 +1,17 @@
-+<?xml version="1.0"?>
-+<oaf_info>
-+ <oaf_server iid="OAFIID:GNOME_StickyNotesApplet" type="factory" location="OAFIID:GNOME_NullApplet_Factory">
-+ <oaf_attribute name="repo_ids" type="stringv">
-+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+ <item value="IDL:Bonobo/Control:1.0"/>
-+ <item value="IDL:Bonobo/Unknown:1.0"/>
-+ </oaf_attribute>
-+ <oaf_attribute name="name" type="string" _value="Sticky Notes (Deprecated)"/>
-+ <oaf_attribute name="description" type="string" _value="Create, view, and manage sticky notes on the desktop"/>
-+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="stickynotes"/>
-+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="stickynotes_applet"/>
-+ </oaf_server>
-+</oaf_info>
-+
-diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-applets-2.30.0/null_applet/Makefile.am
---- gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null 2010-03-28 23:24:47.000000000 -0400
-+++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:26:45.638021343 -0400
-@@ -25,6 +25,7 @@ server_in_files = \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_KeyboardApplet.server.in \
-+ GNOME_StickyNotesApplet.server.in \
- $(battstat_applet) \
- $(mixer_server_in)
- server_DATA = $(server_in_files:.server.in=.server)
-@@ -44,6 +45,7 @@ EXTRA_DIST = \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_MixerApplet.server.in \
-+ GNOME_StickyNotesApplet.server.in \
- GNOME_BattstatApplet.server.in \
- GNOME_KeyboardApplet.server.in
-
-diff -up gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null gnome-applets-2.30.0/null_applet/null_applet.c
---- gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null 2010-03-28 23:24:47.000000000 -0400
-+++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:27:18.451011564 -0400
-@@ -47,7 +47,9 @@ insert_oafiids (GHashTable *hash_table)
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
- g_hash_table_insert (hash_table,
-- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+ "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor"));
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_StickyNotesApplet", _("Sticky Notes"));
- }
-
- static gboolean already_running;
commit 6f1aa16885ad557198afa5d4db600e62cc2afbff
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Tue Jun 14 15:31:13 2011 +0200
Update to 3.1.2
diff --git a/.gitignore b/.gitignore
index e722321..4d6bf6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.31.91.tar.bz2
/gnome-applets-2.32.0.tar.bz2
/gnome-applets-3.1.1.tar.bz2
+/gnome-applets-3.1.2.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fea2d4c..db528f2 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,14 +33,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.1
+Version: 3.1.2
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
# Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -324,6 +324,9 @@ fi
%changelog
+* Tue Jun 14 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.2-1
+- Update to 3.1.2
+
* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-2
- Fix package Requires
diff --git a/sources b/sources
index f4e3e7e..760ff50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e01c38412b9f2622b026f3b964f275ca gnome-applets-3.1.1.tar.bz2
+40378b28964eff66ed5db18444b5e5da gnome-applets-3.1.2.tar.xz
commit 7483ddbe6c45382553aad0c066f8b01626beeb8f
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Mon May 9 17:34:29 2011 +0200
Fix package Requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dd87be7..fea2d4c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 3.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -119,8 +119,8 @@ Requires(preun): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
# For invest-applet
-Requires: gnome-python2-applet
-Requires: gnome-python2-libegg
+# Requires: gnome-python2-applet
+# Requires: gnome-python2-libegg
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -225,7 +225,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -245,7 +244,6 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -271,7 +269,6 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -327,6 +324,9 @@ fi
%changelog
+* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-2
+- Fix package Requires
+
* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-1
- Update to 3.1.1
- Restored basic functionality
commit 2c3694c4125f941633f114944abe33861970289d
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Mon May 9 17:13:02 2011 +0200
Update to 3.1.1
Restored basic functionality
diff --git a/.gitignore b/.gitignore
index 0760b02..e722321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.31.90.1.tar.bz2
/gnome-applets-2.31.91.tar.bz2
/gnome-applets-2.32.0.tar.bz2
+/gnome-applets-3.1.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 562e287..dd87be7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,28 +1,29 @@
-%define glib2_version 2.15.3
+%define glib2_version 2.22.0
%define pango_version 1.2.0
-%define gtk2_version 2.6.0
-%define libgnome_version 2.8.0
-%define libgnomeui_version 2.8.0
-%define libglade_version 2.4.0
-%define gnome_panel_version 2.20.1-5
+%define gtk3_version 3.0
+# %define libgnome_version 2.8.0
+# %define libgnomeui_version 2.8.0
+# %define libglade_version 2.4.0
+%define gnome_panel_version 2.91.90
%define libgtop2_version 2.12.0
-%define gail_version 1.2.0
-%define libbonoboui_version 2.3.0
+# %define gail_version 1.2.0
+# %define libbonoboui_version 2.3.0
%define gstreamer_version 0.10.14
%define gstreamer_plugins_version 0.10.14
%define gstreamer_plugins_good_version 0.10.6
%define libxklavier_version 4.0
-%define libwnck_version 2.9.3
-%define libgnome_desktop_version 2.11.1
-%define gnome_utils_version 2.8.1
-%define dbus_version 0.90
-%define dbus_glib_version 0.70
-%define libnotify_version 0.3.2
-%define pygobject_version 2.6
-%define pygtk_version 2.6
-%define gnome_python_version 2.10
+%define libwnck_version 2.91.0
+# %define libgnome_desktop_version 2.11.1
+# %define gnome_utils_version 2.8.1
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.74
+%define libnotify_version 0.7
+%define pygobject_version 2.26
+# %define pygtk_version 2.6
+# %define gnome_python_version 2.10
%define gconf_version 2.14.0
-%define libgnomekbd_version 2.27.4
+# %define libgnomekbd_version 2.27.4
+%define libgweather_version 2.91.0
%define po_package gnome-applets-2.0
@@ -32,15 +33,15 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.32.0
-Release: 4%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
-Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
+# Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch3: gnome-applets-2.3.6-ppp-command.patch
@@ -64,30 +65,29 @@ Patch52: gnome-applets-dbus-glib.patch
Patch53: gnome-applets-notify.patch
BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
+# BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+# BuildRequires: libgnome-devel >= %{libgnome_version}
BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
-BuildRequires: libglade2-devel >= %{libglade_version}
+# BuildRequires: libglade2-devel >= %{libglade_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gail-devel >= %{gail_version}
+# BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
BuildRequires: /usr/bin/automake
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
-BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
-BuildRequires: gnome-utils >= %{gnome_utils_version}
+# BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires: libwnck3-devel >= %{libwnck_version}
+# BuildRequires: gnome-desktop3-devel >= %{libgnome_desktop_version}
+# BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
-BuildRequires: pygtk2-devel >= %{pygtk_version}
-BuildRequires: gnome-python2-devel >= %{gnome_python_version}
-BuildRequires: gnome-python2-applet
-# libgucharmap is linked against gtk3, so drop it until gnome-applets is ported
-#BuildRequires: gucharmap-devel
+# BuildRequires: pygtk2-devel >= %{pygtk_version}
+# BuildRequires: gnome-python2-devel >= %{gnome_python_version}
+# BuildRequires: gnome-python2-applet
+BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
@@ -96,11 +96,11 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
-BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
+# BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
-BuildRequires: libgweather-devel >= 2.22.1
+BuildRequires: libgweather-devel >= %{libgweather_version}
# For cpufreq
BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
@@ -137,41 +137,40 @@ and more.
%prep
%setup -q
-%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .stickynotes-null
+# TODO: port these three to new infrastructure
+# %patch40 -p1 -b .battstat-null
+# %patch41 -p1 -b .no-mixer-icon
+# %patch42 -p1 -b .stickynotes-null
# We don't ship gnome-system-tools
-rm -rf modemlights
-tar xjf %{SOURCE2}
+# rm -rf modemlights
+# tar xjf %{SOURCE2}
-%patch3 -p1 -b .ppp-command
-%patch34 -p1 -b .ppp-includes
-%patch35 -p1 -b .modemlights-libgnome
-%patch50 -p1 -b .libs
-%patch51 -p1 -b .pymod
-%patch52 -p1 -b .dbus-glib
-%patch53 -p1 -b .notify
+# %patch3 -p1 -b .ppp-command
+# %patch34 -p1 -b .ppp-includes
+# %patch35 -p1 -b .modemlights-libgnome
+# %patch50 -p1 -b .libs
+# %patch51 -p1 -b .pymod
+# %patch52 -p1 -b .dbus-glib
+# %patch53 -p1 -b .notify
-autoreconf -i -f
+# autoreconf -i -f
%build
%configure \
--enable-suid=no \
-%if %{build_stickynotes}
- --enable-stickynotes \
-%endif
--disable-battstat \
--disable-scrollkeeper \
--enable-mini-commander \
- --enable-gtk-doc
+ --enable-gtk-doc \
+ --without-hal
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-make
+make %{?_smp_mflags}
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -205,6 +204,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
# drop non-XKB support files
rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+%if ! %{build_stickynotes}
+ rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet
+%endif
+
%post
/sbin/ldconfig
@@ -292,10 +295,10 @@ fi
%{_datadir}/icons/hicolor/32x32/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-2.0/ui/*
+# %{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-applets
%{_bindir}/*
-%{_libdir}/bonobo/servers/*
+# %{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/charpick_applet2
@@ -305,7 +308,7 @@ fi
%{_libexecdir}/gnome-applets/
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
-%{_libexecdir}/modemlights_applet2
+# %{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -320,10 +323,14 @@ fi
%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
%{_datadir}/dbus-1/services/*
-%{_datadir}/gnome-panel/applets/*
+%{_datadir}/gnome-panel/4.0/applets/*
%changelog
+* Mon May 9 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 1:3.1.1-1
+- Update to 3.1.1
+- Restored basic functionality
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.32.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 60b80ab..f4e3e7e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d2fb61c5cfdba1f87302d972bc62dd81 gnome-applets-2.32.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+e01c38412b9f2622b026f3b964f275ca gnome-applets-3.1.1.tar.bz2
commit ce3cedf78afa427c78a37533eebb43ccde90a9b7
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Feb 8 21:49:41 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fd84c26..562e287 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.32.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -324,6 +324,9 @@ fi
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.32.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Wed Nov 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-3
- Rebuild against libnotify 0.7.0
commit 9d5f0d8b060d2eb2b6c8ac4be67d5a52ca9c39dd
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Nov 3 17:09:24 2010 -0400
rebuild against new libnotify
diff --git a/gnome-applets-dbus-glib.patch b/gnome-applets-dbus-glib.patch
new file mode 100644
index 0000000..fcece10
--- /dev/null
+++ b/gnome-applets-dbus-glib.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.32.0/configure.in.dbus-glib gnome-applets-2.32.0/configure.in
+--- gnome-applets-2.32.0/configure.in.dbus-glib 2010-11-03 16:46:18.251241996 -0400
++++ gnome-applets-2.32.0/configure.in 2010-11-03 16:46:55.642242004 -0400
+@@ -273,7 +273,7 @@ AC_SUBST(XML2_LIBS)
+
+ dnl -- check for libgweather (required for gweather applet) ------------------
+ build_libgweather_applets=false
+-PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED,
++PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED dbus-glib-1,
+ build_libgweather_applets=true,
+ AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
+ AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/gnome-applets-notify.patch b/gnome-applets-notify.patch
new file mode 100644
index 0000000..e8514e2
--- /dev/null
+++ b/gnome-applets-notify.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-2.32.0/gweather/gweather-applet.c.notify gnome-applets-2.32.0/gweather/gweather-applet.c
+--- gnome-applets-2.32.0/gweather/gweather-applet.c.notify 2010-11-03 16:59:56.081241996 -0400
++++ gnome-applets-2.32.0/gweather/gweather-applet.c 2010-11-03 17:00:04.367241996 -0400
+@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint
+ if (icon == NULL)
+ icon = "stock-unknown";
+
+- n = notify_notification_new (message, detail, icon,
+- gw_applet->container);
++ n = notify_notification_new (message, detail, icon);
+
+ notify_notification_show (n, &error);
+ if (error)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 656d105..fd84c26 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.32.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -59,6 +59,10 @@ Patch42: stickynotes-null.patch
Patch50: gnome-applets-libs.patch
Patch51: pymod-check.patch
+Patch52: gnome-applets-dbus-glib.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=632803
+Patch53: gnome-applets-notify.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -146,6 +150,8 @@ tar xjf %{SOURCE2}
%patch35 -p1 -b .modemlights-libgnome
%patch50 -p1 -b .libs
%patch51 -p1 -b .pymod
+%patch52 -p1 -b .dbus-glib
+%patch53 -p1 -b .notify
autoreconf -i -f
@@ -318,6 +324,9 @@ fi
%changelog
+* Wed Nov 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-3
+- Rebuild against libnotify 0.7.0
+
* Mon Oct 11 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-2
- Rebuild without gucharmap support
commit e41f25aebe0fd1dffb1cb5cfa8065b54328bc2e3
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Oct 11 11:41:14 2010 -0400
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ba772e3..656d105 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.32.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -82,7 +82,8 @@ BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: gnome-python2-devel >= %{gnome_python_version}
BuildRequires: gnome-python2-applet
-BuildRequires: gucharmap-devel
+# libgucharmap is linked against gtk3, so drop it until gnome-applets is ported
+#BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
@@ -317,6 +318,9 @@ fi
%changelog
+* Mon Oct 11 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-2
+- Rebuild without gucharmap support
+
* Thu Sep 30 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-1
- Update to 2.32.0
commit b431503f6158af17a2235b124b9676a38b58d887
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Sep 30 09:16:09 2010 -0400
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0f4e4f6..ba772e3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -100,6 +100,7 @@ BuildRequires: libgweather-devel >= 2.22.1
BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
BuildRequires: scrollkeeper
+BuildRequires: libSM-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit 7bdbdaa37ea99e6488aa1ee9d031e0578328d297
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Sep 30 07:53:50 2010 -0400
2.32.0
diff --git a/.gitignore b/.gitignore
index 2dd930a..0760b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gnome-applets-2.31.5.tar.bz2
gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.31.90.1.tar.bz2
/gnome-applets-2.31.91.tar.bz2
+/gnome-applets-2.32.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 878ac1b..0f4e4f6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,14 +32,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.31.91
+Version: 2.32.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -316,6 +316,9 @@ fi
%changelog
+* Thu Sep 30 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.32.0-1
+- Update to 2.32.0
+
* Tue Aug 31 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.91-1
- Update to 2.31.91
diff --git a/sources b/sources
index 9882887..60b80ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-43bce1a45b32ae8e7d00cd8ed8df2ec1 gnome-applets-2.31.91.tar.bz2
+d2fb61c5cfdba1f87302d972bc62dd81 gnome-applets-2.32.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit b5d73276c42c692258c3ca4624f86e57879d947d
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Sep 1 14:19:20 2010 -0400
forgotten patch
diff --git a/pymod-check.patch b/pymod-check.patch
new file mode 100644
index 0000000..26721f2
--- /dev/null
+++ b/pymod-check.patch
@@ -0,0 +1,24 @@
+diff -up gnome-applets-2.31.91/m4/python.m4.pymod gnome-applets-2.31.91/m4/python.m4
+--- gnome-applets-2.31.91/m4/python.m4.pymod 2010-09-01 11:45:44.141940000 -0400
++++ gnome-applets-2.31.91/m4/python.m4 2010-09-01 11:45:59.292940002 -0400
+@@ -14,6 +14,7 @@ except ImportError:
+ sys.exit(1)
+ except:
+ sys.exit(0)
++
+ sys.exit(0)"], [prog="
+ import $1
+ $1.$2"])
+diff -up gnome-applets-2.31.91/configure.in.gnomeapplet gnome-applets-2.31.91/configure.in
+--- gnome-applets-2.31.91/configure.in.gnomeapplet 2010-09-01 13:40:56.170939997 -0400
++++ gnome-applets-2.31.91/configure.in 2010-09-01 13:44:44.248940002 -0400
+@@ -564,8 +564,7 @@ dnl *** invest-applet specific checks
+ dnl ***************************************************************************
+
+ if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
+- AM_CHECK_PYMOD(gnomeapplet,,
+- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++ BUILD_INVEST_APPLET="yes"
+ else
+ BUILD_INVEST_APPLET="no"
+ fi
commit 592584c1c5f9ac907e732742a1898a9fb38098ec
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Sep 1 14:10:19 2010 -0400
try to get this damn thing to build
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index b4297ce..b2b3347 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -1,16 +1,3 @@
-diff -up gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs gnome-applets-2.31.90.1/cpufreq/src/Makefile.am
---- gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
-+++ gnome-applets-2.31.90.1/cpufreq/src/Makefile.am 2010-08-19 20:02:09.776849002 -0400
-@@ -31,7 +31,8 @@ cpufreq_applet_SOURCES = \
- cpufreq_applet_LDADD = \
- $(GNOME_APPLETS3_LIBS) \
- $(LIBGLADE_LIBS) \
-- $(LIBCPUFREQ_LIBS)
-+ $(LIBCPUFREQ_LIBS) \
-+ $(DBUS_LIBS)
-
-
-
diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am
--- gnome-applets-2.31.90.1/geyes/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
+++ gnome-applets-2.31.90.1/geyes/Makefile.am 2010-08-19 20:02:37.640849001 -0400
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f9a84ee..878ac1b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -57,6 +57,7 @@ Patch42: stickynotes-null.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=609945
Patch50: gnome-applets-libs.patch
+Patch51: pymod-check.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -142,6 +143,7 @@ tar xjf %{SOURCE2}
%patch34 -p1 -b .ppp-includes
%patch35 -p1 -b .modemlights-libgnome
%patch50 -p1 -b .libs
+%patch51 -p1 -b .pymod
autoreconf -i -f
@@ -309,6 +311,8 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+%{_datadir}/dbus-1/services/*
+%{_datadir}/gnome-panel/applets/*
%changelog
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 24a63f8..956ed67 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,6 +1,6 @@
-diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets-2.31.90.1/configure.in
---- gnome-applets-2.31.90.1/configure.in.modemlights-libgnome 2010-08-18 18:30:01.000000000 -0400
-+++ gnome-applets-2.31.90.1/configure.in 2010-08-19 23:38:59.508849002 -0400
+diff -up gnome-applets-2.31.91/configure.in.modemlights-libgnome gnome-applets-2.31.91/configure.in
+--- gnome-applets-2.31.91/configure.in.modemlights-libgnome 2010-08-30 06:11:48.000000000 -0400
++++ gnome-applets-2.31.91/configure.in 2010-09-01 10:16:20.595940001 -0400
@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
AC_SUBST(GNOME_APPLETS3_CFLAGS)
AC_SUBST(GNOME_APPLETS3_LIBS)
@@ -13,9 +13,29 @@ diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets
dnl -- check for gnome-desktop (required) -------------------------------------
PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
AC_SUBST(GNOMEDESKTOP_CFLAGS)
-diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.90.1/modemlights/Makefile.am
---- gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.31.90.1/modemlights/Makefile.am 2010-08-19 23:38:59.509849002 -0400
+@@ -495,8 +500,7 @@ dnl AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR
+ dnl AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
+ dnl BUILD_MODEM_LIGHTS=yes
+ dnl else
+- AC_MSG_WARN([*** modemlights applet will not be built ***])
+- BUILD_MODEM_LIGHTS=no
++ BUILD_MODEM_LIGHTS=yes
+ dnl fi
+
+ AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
+@@ -688,6 +692,9 @@ mini-commander/help/Makefile
+ drivemount/Makefile
+ drivemount/help/Makefile
+ modemlights/Makefile
++modemlights/docs/Makefile
++modemlights/docs/C/Makefile
++modemlights/docs/eu/Makefile
+ multiload/Makefile
+ multiload/docs/Makefile
+ gkb-new/Makefile
+diff -up gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.91/modemlights/Makefile.am
+--- gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.31.91/modemlights/Makefile.am 2010-09-01 10:10:27.119940001 -0400
@@ -2,6 +2,7 @@ SUBDIRS = docs
INCLUDES = -I. -I$(srcdir) \
@@ -32,9 +52,9 @@ diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gn
$(GNOME_APPLETS_LIBS)
uidir = $(datadir)/gnome-2.0/ui
-diff -up gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.90.1/po/POTFILES.in
---- gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome 2010-08-18 18:09:58.000000000 -0400
-+++ gnome-applets-2.31.90.1/po/POTFILES.in 2010-08-19 23:41:28.694849003 -0400
+diff -up gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.91/po/POTFILES.in
+--- gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome 2010-08-30 06:11:15.000000000 -0400
++++ gnome-applets-2.31.91/po/POTFILES.in 2010-09-01 10:10:27.181940002 -0400
@@ -72,7 +72,7 @@ mixer/applet.c
mixer/dock.c
mixer/load.c
commit 0850308ebdd7606e5682f4a6a72fd1b6485f7834
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 31 13:28:45 2010 -0400
fix sources
diff --git a/sources b/sources
index 14f2c76..9882887 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
43bce1a45b32ae8e7d00cd8ed8df2ec1 gnome-applets-2.31.91.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-
commit 15e2bf10a48d8608c34888f3175850b0f95d3790
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 31 13:20:19 2010 -0400
fix sources
diff --git a/sources b/sources
index 263d208..14f2c76 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
43bce1a45b32ae8e7d00cd8ed8df2ec1 gnome-applets-2.31.91.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+
commit 957d84f6d896daf58089bf989d07640e81e7f4fa
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 31 13:10:43 2010 -0400
2.31.91
diff --git a/.gitignore b/.gitignore
index 9b1b3a0..2dd930a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gnome-applets-2.31.5.tar.bz2
gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.31.90.1.tar.bz2
+/gnome-applets-2.31.91.tar.bz2
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index 211e035..b4297ce 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -1,10 +1,9 @@
-diff -up gnome-applets-2.29.5/configure.in.libs gnome-applets-2.29.5/configure.in
-diff -up gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs gnome-applets-2.29.5/cpufreq/src/Makefile.am
---- gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs 2010-02-14 15:23:17.133904122 -0500
-+++ gnome-applets-2.29.5/cpufreq/src/Makefile.am 2010-02-14 15:23:51.214903773 -0500
-@@ -32,7 +32,8 @@ cpufreq_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(GNOME_LIBS2_LIBS) \
+diff -up gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs gnome-applets-2.31.90.1/cpufreq/src/Makefile.am
+--- gnome-applets-2.31.90.1/cpufreq/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/cpufreq/src/Makefile.am 2010-08-19 20:02:09.776849002 -0400
+@@ -31,7 +31,8 @@ cpufreq_applet_SOURCES = \
+ cpufreq_applet_LDADD = \
+ $(GNOME_APPLETS3_LIBS) \
$(LIBGLADE_LIBS) \
- $(LIBCPUFREQ_LIBS)
+ $(LIBCPUFREQ_LIBS) \
@@ -12,39 +11,39 @@ diff -up gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs gnome-applets-2.29.5/
-diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/Makefile.am
---- gnome-applets-2.29.5/geyes/Makefile.am.libs 2010-02-14 14:27:43.528930009 -0500
-+++ gnome-applets-2.29.5/geyes/Makefile.am 2010-02-14 14:27:54.382903748 -0500
-@@ -17,7 +17,8 @@ geyes_applet2_SOURCES = \
+diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am
+--- gnome-applets-2.31.90.1/geyes/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/geyes/Makefile.am 2010-08-19 20:02:37.640849001 -0400
+@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
+ geyes.h
geyes_applet2_LDADD = \
- $(GNOME_APPLETS_LIBS) \
-- $(GNOME_LIBS2_LIBS)
-+ $(GNOME_LIBS2_LIBS) \
+- $(GNOME_APPLETS3_LIBS)
++ $(GNOME_APPLETS3_LIBS) \
+ -lm
- serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_GeyesApplet.server.in
-diff -up gnome-applets-2.29.5/multiload/Makefile.am.libs gnome-applets-2.29.5/multiload/Makefile.am
---- gnome-applets-2.29.5/multiload/Makefile.am.libs 2010-02-14 14:55:18.556153943 -0500
-+++ gnome-applets-2.29.5/multiload/Makefile.am 2010-02-14 15:10:36.987158084 -0500
-@@ -25,7 +25,8 @@ multiload_applet_2_LDADD = \
- $(GNOME_APPLETS_LIBS) \
+ appletdir = $(datadir)/gnome-panel/applets
+ applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
+diff -up gnome-applets-2.31.90.1/multiload/Makefile.am.libs gnome-applets-2.31.90.1/multiload/Makefile.am
+--- gnome-applets-2.31.90.1/multiload/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/multiload/Makefile.am 2010-08-19 20:03:22.087849003 -0400
+@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
+ multiload_applet_2_LDADD = \
+ $(GNOME_APPLETS3_LIBS) \
$(GTOP_APPLETS_LIBS) \
- $(GNOMEDESKTOP_LIBS) \
-- $(GNOME_LIBS2_LIBS)
-+ $(GNOME_LIBS2_LIBS) \
+- $(GNOMEDESKTOP_LIBS)
++ $(GNOMEDESKTOP_LIBS) \
+ -lm
schemasdir = @GCONF_SCHEMA_FILE_DIR@
schemas_in_files = multiload.schemas.in
-diff -up gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs gnome-applets-2.29.5/trashapplet/src/Makefile.am
---- gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs 2010-02-14 14:41:41.502904384 -0500
-+++ gnome-applets-2.29.5/trashapplet/src/Makefile.am 2010-02-14 14:42:17.442905215 -0500
-@@ -15,6 +15,7 @@ trashapplet_SOURCES = \
+diff -up gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs gnome-applets-2.31.90.1/trashapplet/src/Makefile.am
+--- gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400
++++ gnome-applets-2.31.90.1/trashapplet/src/Makefile.am 2010-08-19 20:03:52.609849003 -0400
+@@ -14,6 +14,7 @@ trashapplet_SOURCES = \
+
trashapplet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS3_LIBS) \
- $(GIO_LIBS)
+ $(GIO_LIBS) \
+ -lX11
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cad003d..f9a84ee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.31.90.1
-Release: 2%{?dist}
+Version: 2.31.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -43,10 +43,7 @@ Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.b
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
-Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
-Patch2: gnome-applets-2.23.3-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
Patch34: ppp-includes.patch
Patch35: modemlights-libgnome.patch
@@ -132,9 +129,6 @@ and more.
%prep
%setup -q
-%patch0 -p1 -b .use-old-modemlights
-%patch2 -p1 -b .use-builtin-apm
-%patch11 -p1 -b .dont-require-display
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
@@ -169,23 +163,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dyn
make
-# strip unneeded translations from .mo files
-# ideally intltool (ha!) would do that for us
-# http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
-# some files go missing due to our modemlights surgery
-grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
-mv POTFILES.keep2 POTFILES.in
-intltool-update --pot
-for p in *.po; do
- msgmerge $p %{po_package}.pot > $p.out
- msgfmt -o `basename $p .po`.gmo $p.out
-done
-
%install
-rm -rf $RPM_BUILD_ROOT
-
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -218,9 +196,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
@@ -337,6 +312,9 @@ fi
%changelog
+* Tue Aug 31 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.91-1
+- Update to 2.31.91
+
* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.90.1-1
- Update to 2.31.90.1
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 65bc674..24a63f8 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,9 +1,9 @@
-diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.29.5/configure.in
---- gnome-applets-2.29.5/configure.in.modemlights-libgnome 2010-01-17 16:37:16.249288488 -0500
-+++ gnome-applets-2.29.5/configure.in 2010-01-17 16:39:50.185529959 -0500
-@@ -120,6 +120,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
- AC_SUBST(GNOME_APPLETS_CFLAGS)
- AC_SUBST(GNOME_APPLETS_LIBS)
+diff -up gnome-applets-2.31.90.1/configure.in.modemlights-libgnome gnome-applets-2.31.90.1/configure.in
+--- gnome-applets-2.31.90.1/configure.in.modemlights-libgnome 2010-08-18 18:30:01.000000000 -0400
++++ gnome-applets-2.31.90.1/configure.in 2010-08-19 23:38:59.508849002 -0400
+@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
+ AC_SUBST(GNOME_APPLETS3_CFLAGS)
+ AC_SUBST(GNOME_APPLETS3_LIBS)
+dnl -- check for libgnome (required) ------------------------------------------
+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
@@ -13,9 +13,9 @@ diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.
dnl -- check for gnome-desktop (required) -------------------------------------
PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
AC_SUBST(GNOMEDESKTOP_CFLAGS)
-diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.29.5/modemlights/Makefile.am
---- gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.29.5/modemlights/Makefile.am 2010-01-17 16:37:16.326303959 -0500
+diff -up gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.90.1/modemlights/Makefile.am
+--- gnome-applets-2.31.90.1/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.31.90.1/modemlights/Makefile.am 2010-08-19 23:38:59.509849002 -0400
@@ -2,6 +2,7 @@ SUBDIRS = docs
INCLUDES = -I. -I$(srcdir) \
@@ -32,3 +32,15 @@ diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome
$(GNOME_APPLETS_LIBS)
uidir = $(datadir)/gnome-2.0/ui
+diff -up gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.90.1/po/POTFILES.in
+--- gnome-applets-2.31.90.1/po/POTFILES.in.modemlights-libgnome 2010-08-18 18:09:58.000000000 -0400
++++ gnome-applets-2.31.90.1/po/POTFILES.in 2010-08-19 23:41:28.694849003 -0400
+@@ -72,7 +72,7 @@ mixer/applet.c
+ mixer/dock.c
+ mixer/load.c
+ mixer/mixer.schemas.in
+-mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
++[type: gettext/ini]mixer/org.gnome.applets.MixerApplet.panel-applet.in.in
+ mixer/preferences.c
+ modemlights/modem-applet.c
+ [type: gettext/glade]modemlights/modemlights.ui
diff --git a/sources b/sources
index eb43230..263d208 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-540a0c6c25619e33443c4f35e96b1758 gnome-applets-2.31.90.1.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+43bce1a45b32ae8e7d00cd8ed8df2ec1 gnome-applets-2.31.91.tar.bz2
commit 3e639558478a24424496a234b61e0e86d68cc650
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 19:40:47 2010 -0400
fix patch
diff --git a/gnome-applets-2.15.2-use-old-modemlights.patch b/gnome-applets-2.15.2-use-old-modemlights.patch
index 5f9bc50..f0bef45 100644
--- a/gnome-applets-2.15.2-use-old-modemlights.patch
+++ b/gnome-applets-2.15.2-use-old-modemlights.patch
@@ -1,6 +1,32 @@
---- gnome-applets-2.15.2/configure.in.use-old-modemlights 2006-07-26 11:36:14.000000000 -0400
-+++ gnome-applets-2.15.2/configure.in 2006-08-03 19:31:07.000000000 -0400
-@@ -575,6 +575,7 @@
+diff -up gnome-applets-2.31.90.1/configure.in.use-old-modemlights gnome-applets-2.31.90.1/configure.in
+--- gnome-applets-2.31.90.1/configure.in.use-old-modemlights 2010-08-18 18:30:01.000000000 -0400
++++ gnome-applets-2.31.90.1/configure.in 2010-08-19 19:40:12.344849004 -0400
+@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan
+ AC_SUBST(GNOME_APPLETS3_CFLAGS)
+ AC_SUBST(GNOME_APPLETS3_LIBS)
+
++dnl -- check for libgnome (required) ------------------------------------------
++PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
++AC_SUBST(GNOME_LIBS2_CFLAGS)
++AC_SUBST(GNOME_LIBS2_LIBS)
++
+ dnl -- check for gnome-desktop (required) -------------------------------------
+ PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+ AC_SUBST(GNOMEDESKTOP_CFLAGS)
+@@ -407,12 +412,10 @@ if test x$disable_battstat = xno; then
+ case "${host}" in
+ powerpc-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that use libapm
+ *-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that do not use libapm
+ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
+@@ -554,14 +557,16 @@ fi
AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes)
@@ -8,7 +34,18 @@
dnl ***************************************************************************
dnl *** invest-applet specific checks ***
-@@ -697,6 +698,9 @@
+ dnl ***************************************************************************
+
+ if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
+- AM_CHECK_PYMOD(gnomeapplet,,
+- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++dnl AM_CHECK_PYMOD(gnomeapplet,,
++dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++ BUILD_INVEST_APPLET="yes"
+ else
+ BUILD_INVEST_APPLET="no"
+ fi
+@@ -688,6 +693,9 @@ mini-commander/help/Makefile
drivemount/Makefile
drivemount/help/Makefile
modemlights/Makefile
commit 6c6c75c216bc9df7960b1fc4205ec15e4d43d0b0
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 19:28:24 2010 -0400
fix sources file
diff --git a/sources b/sources
index 8cc430c..eb43230 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
540a0c6c25619e33443c4f35e96b1758 gnome-applets-2.31.90.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-
commit 68e70ae16990d978083d402f63c2d4a7f2f2d7f5
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 18:54:33 2010 -0400
fix sources
diff --git a/sources b/sources
index 29f2cbb..8cc430c 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
540a0c6c25619e33443c4f35e96b1758 gnome-applets-2.31.90.1.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+
commit 4bcc46d3a356755028726c08ecb153c7a058f7e6
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 18:48:04 2010 -0400
2.31.90.1
diff --git a/.gitignore b/.gitignore
index 148d07f..9b1b3a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gnome-applets-2.31.5.tar.bz2
gnome-applets-2.31.6.tar.bz2
+/gnome-applets-2.31.90.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ff681a6..cad003d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.31.6
+Version: 2.31.90.1
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -337,6 +337,9 @@ fi
%changelog
+* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.90.1-1
+- Update to 2.31.90.1
+
* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.6-1
- Update to 2.31.6
diff --git a/sources b/sources
index 266ce9d..29f2cbb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-8352ade6d8df071cd356b0bc51e29229 gnome-applets-2.31.6.tar.bz2
+540a0c6c25619e33443c4f35e96b1758 gnome-applets-2.31.90.1.tar.bz2
commit 2d0e4f7ab3ce26f1b6e0dce41a9789dc74f47135
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 3 21:28:20 2010 -0400
2.31.6
diff --git a/sources b/sources
index 696c5c2..266ce9d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-
8352ade6d8df071cd356b0bc51e29229 gnome-applets-2.31.6.tar.bz2
commit 469879ed9beef7815734632889702a659cfa2878
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 3 21:26:42 2010 -0400
2.31.6
diff --git a/.gitignore b/.gitignore
index 4b9a089..148d07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gnome-applets-2.31.5.tar.bz2
+gnome-applets-2.31.6.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a0d209e..ff681a6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.31.5
+Version: 2.31.6
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -337,6 +337,9 @@ fi
%changelog
+* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.6-1
+- Update to 2.31.6
+
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:2.31.5-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/sources b/sources
index b5b22d3..696c5c2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c80e7381b08d77e92f9139913793a009 gnome-applets-2.31.5.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+8352ade6d8df071cd356b0bc51e29229 gnome-applets-2.31.6.tar.bz2
commit 294d97bb502e472b62c6e3d85e4c6f20f1d369cc
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Wed Jul 28 16:08:39 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 4b9a089..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-gnome-applets-2.31.5.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b9a089
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+gnome-applets-2.31.5.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b4c7919..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: gnome-applets
-# $Id: Makefile,v 1.2 2007/10/15 18:47:54 notting Exp $
-NAME := gnome-applets
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit dba2f3e6415633afa36d0caeecb252c0fb6a1d57
Author: dmalcolm <dmalcolm(a)fedoraproject.org>
Date: Thu Jul 22 01:37:57 2010 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fb21ff5..a0d209e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.31.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -337,6 +337,9 @@ fi
%changelog
+* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:2.31.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
* Mon Jul 12 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.5-1
- 2.31.5
commit 0741ffd843ef0bc1bd9cef8682cbbb4927b6c8ef
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jul 13 02:43:34 2010 +0000
drop upstreamed patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f9483c8..fb21ff5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -58,9 +58,6 @@ Patch41: gnome-applets-no-mixer-icon.patch
# do the nullapplet dance for stickynotes
Patch42: stickynotes-null.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599728
-Patch44: seriesid-clash.patch
-
# https://bugzilla.gnome.org/show_bug.cgi?id=609945
Patch50: gnome-applets-libs.patch
@@ -150,7 +147,6 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
%patch35 -p1 -b .modemlights-libgnome
-%patch44 -p1 -b .seriesid
%patch50 -p1 -b .libs
autoreconf -i -f
commit 525a3ae51f603a7a283f086ef52129114e77162e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jul 13 02:30:18 2010 +0000
2.31.5
diff --git a/.cvsignore b/.cvsignore
index c04924e..4b9a089 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.30.0.tar.bz2
+gnome-applets-2.31.5.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 94e70d5..f9483c8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,14 +32,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.30.0
-Release: 3%{?dist}
+Version: 2.31.5
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
-Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -341,6 +341,9 @@ fi
%changelog
+* Mon Jul 12 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.31.5-1
+- 2.31.5
+
* Wed Jun 16 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-3
- Kill the scrollkeeper runtime dep
diff --git a/sources b/sources
index fa4e3fe..b5b22d3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-2afcbedc10b1a0e8072ac4eefdc8d770 gnome-applets-2.30.0.tar.bz2
+c80e7381b08d77e92f9139913793a009 gnome-applets-2.31.5.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit dce5b106ad16bc60eb22aa2ca651d52f2015b5fd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 17 03:03:57 2010 +0000
Kill the scrollkeeper dep
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9d609a0..94e70d5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.30.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -117,9 +117,6 @@ Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-
# For invest-applet
Requires: gnome-python2-applet
Requires: gnome-python2-libegg
@@ -230,7 +227,6 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
-scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -300,7 +296,6 @@ fi
%postun
/sbin/ldconfig
-scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -346,6 +341,9 @@ fi
%changelog
+* Wed Jun 16 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-3
+- Kill the scrollkeeper runtime dep
+
* Thu Jun 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-2
- Fix BRs
commit ec579618028a71f8425402c59ef9f03f1e53bc11
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Jun 4 00:01:07 2010 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 62c4476..9d609a0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.30.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -104,6 +104,7 @@ BuildRequires: libgweather-devel >= 2.22.1
# For cpufreq
BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
+BuildRequires: scrollkeeper
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -345,6 +346,9 @@ fi
%changelog
+* Thu Jun 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-2
+- Fix BRs
+
* Sun Mar 28 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-1
- Update to 2.30.0
commit c12c8078798b3d62e05f6b9910e2268ed9ff0ac8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 29 03:41:19 2010 +0000
fix patch
diff --git a/stickynotes-null.patch b/stickynotes-null.patch
index ef863df..810d874 100644
--- a/stickynotes-null.patch
+++ b/stickynotes-null.patch
@@ -37,7 +37,7 @@ diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-app
GNOME_MailcheckApplet_Factory.server.in \
GNOME_Panel_WirelessApplet.server.in \
GNOME_KeyboardApplet.server.in \
-++GNOME_StickyNotesApplet.server.in\
++ GNOME_StickyNotesApplet.server.in \
$(battstat_applet) \
$(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
@@ -45,7 +45,7 @@ diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-app
GNOME_MailcheckApplet_Factory.server.in \
GNOME_Panel_WirelessApplet.server.in \
GNOME_MixerApplet.server.in \
-++GNOME_StickyNotesApplet.server.in\
++ GNOME_StickyNotesApplet.server.in \
GNOME_BattstatApplet.server.in \
GNOME_KeyboardApplet.server.in
commit 8fa21884f4545fed7161d4a9a0847e35b919843f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 29 03:30:26 2010 +0000
update patches
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 7fbfaca..760bc1c 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null 2009-04-12 17:29:07.367057280 -0400
-+++ gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in 2009-04-13 00:29:58.095336633 -0400
+diff -up gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in
+--- gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null 2010-03-28 23:21:03.987012192 -0400
++++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-28 23:21:03.988012052 -0400
@@ -0,0 +1,22 @@
+<oaf_info>
+
@@ -24,9 +24,9 @@ diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.
+</oaf_server>
+
+</oaf_info>
-diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applets-2.26.1/null_applet/Makefile.am
---- gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null 2009-03-16 19:38:50.000000000 -0400
-+++ gnome-applets-2.26.1/null_applet/Makefile.am 2009-04-13 00:29:58.096337117 -0400
+diff -up gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null gnome-applets-2.30.0/null_applet/Makefile.am
+--- gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null 2010-03-28 01:29:51.000000000 -0400
++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:23:29.771762645 -0400
@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
mixer_server_in = GNOME_MixerApplet.server.in
endif
@@ -38,22 +38,29 @@ diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applet
libexec_PROGRAMS = null_applet
null_applet_SOURCES = null_applet.c
-@@ -19,7 +23,7 @@ server_in_files = \
- GNOME_NullApplet_Factory.server.in \
- GNOME_CDPlayerApplet.server.in \
+@@ -21,6 +25,7 @@ server_in_files = \
GNOME_MailcheckApplet_Factory.server.in \
-- GNOME_Panel_WirelessApplet.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
+ GNOME_KeyboardApplet.server.in \
+ $(battstat_applet) \
$(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
-diff -up gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null gnome-applets-2.26.1/null_applet/null_applet.c
---- gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null 2009-04-12 21:09:18.000000000 -0400
-+++ gnome-applets-2.26.1/null_applet/null_applet.c 2009-04-13 00:31:10.112337087 -0400
-@@ -44,6 +44,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control"));
- g_hash_table_insert (hash_table,
+@@ -39,6 +44,7 @@ EXTRA_DIST = \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
+ GNOME_MixerApplet.server.in \
++ GNOME_BattstatApplet.server.in \
+ GNOME_KeyboardApplet.server.in
+
+ -include $(top_srcdir)/git.mk
+diff -up gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null gnome-applets-2.30.0/null_applet/null_applet.c
+--- gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null 2010-03-28 01:29:51.000000000 -0400
++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:24:15.766774031 -0400
+@@ -46,6 +46,8 @@ insert_oafiids (GHashTable *hash_table)
"OAFIID:GNOME_MixerApplet", _("Volume Control"));
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
}
diff --git a/stickynotes-null.patch b/stickynotes-null.patch
index 3be27f9..ef863df 100644
--- a/stickynotes-null.patch
+++ b/stickynotes-null.patch
@@ -1,7 +1,7 @@
-diff -up gnome-applets-2.27.3/Makefile.am.stickynotes-null gnome-applets-2.27.3/Makefile.am
---- gnome-applets-2.27.3/Makefile.am.stickynotes-null 2009-06-03 21:38:36.000000000 -0400
-+++ gnome-applets-2.27.3/Makefile.am 2009-06-17 14:53:55.169810518 -0400
-@@ -46,7 +46,6 @@ always_built_SUBDIRS = \
+diff -up gnome-applets-2.30.0/Makefile.am.stickynotes-null gnome-applets-2.30.0/Makefile.am
+--- gnome-applets-2.30.0/Makefile.am.stickynotes-null 2010-03-28 01:29:51.000000000 -0400
++++ gnome-applets-2.30.0/Makefile.am 2010-03-28 23:24:47.360759295 -0400
+@@ -42,7 +42,6 @@ always_built_SUBDIRS = \
geyes \
mini-commander \
gkb-new \
@@ -9,9 +9,9 @@ diff -up gnome-applets-2.27.3/Makefile.am.stickynotes-null gnome-applets-2.27.3/
trashapplet \
null_applet
-diff -up /dev/null gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in
---- /dev/null 2009-06-17 09:23:25.885275610 -0400
-+++ gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in 2009-06-17 15:04:20.931811206 -0400
+diff -up gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in
+--- gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null 2010-03-28 23:24:47.362759364 -0400
++++ gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in 2010-03-28 23:24:47.363762926 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<oaf_info>
@@ -30,23 +30,31 @@ diff -up /dev/null gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.serv
+ </oaf_server>
+</oaf_info>
+
-diff -up gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null gnome-applets-2.27.3/null_applet/Makefile.am
---- gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null 2009-06-17 14:53:55.151807673 -0400
-+++ gnome-applets-2.27.3/null_applet/Makefile.am 2009-06-17 14:53:55.171812401 -0400
-@@ -23,6 +23,7 @@ server_in_files = \
- GNOME_NullApplet_Factory.server.in \
- GNOME_CDPlayerApplet.server.in \
+diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-applets-2.30.0/null_applet/Makefile.am
+--- gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null 2010-03-28 23:24:47.000000000 -0400
++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:26:45.638021343 -0400
+@@ -25,6 +25,7 @@ server_in_files = \
GNOME_MailcheckApplet_Factory.server.in \
-+ GNOME_StickyNotesApplet.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
+ GNOME_KeyboardApplet.server.in \
+++GNOME_StickyNotesApplet.server.in\
$(battstat_applet) \
$(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
-diff -up gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null gnome-applets-2.27.3/null_applet/null_applet.c
---- gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null 2009-06-17 14:53:55.152817798 -0400
-+++ gnome-applets-2.27.3/null_applet/null_applet.c 2009-06-17 14:53:55.173825460 -0400
-@@ -45,7 +45,9 @@ insert_oafiids (GHashTable *hash_table)
+@@ -44,6 +45,7 @@ EXTRA_DIST = \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
+ GNOME_MixerApplet.server.in \
+++GNOME_StickyNotesApplet.server.in\
+ GNOME_BattstatApplet.server.in \
+ GNOME_KeyboardApplet.server.in
+
+diff -up gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null gnome-applets-2.30.0/null_applet/null_applet.c
+--- gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null 2010-03-28 23:24:47.000000000 -0400
++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:27:18.451011564 -0400
+@@ -47,7 +47,9 @@ insert_oafiids (GHashTable *hash_table)
g_hash_table_insert (hash_table,
- "OAFIID:GNOME_MixerApplet", _("Volume Control"));
+ "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
g_hash_table_insert (hash_table,
- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor"));
commit 12a6457aa8b11c9ab01ac3a358a5fe62bae21fb5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 29 03:07:14 2010 +0000
2.30.0
diff --git a/.cvsignore b/.cvsignore
index 66ad5a9..c04924e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.29.5.tar.bz2
+gnome-applets-2.30.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 17b6dc4..62c4476 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,13 +32,14 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.29.5
-Release: 3%{?dist}
+Version: 2.30.0
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+# VCS: git:git://git.gnome.org/gnome-applets
+Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -344,6 +345,9 @@ fi
%changelog
+* Sun Mar 28 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.30.0-1
+- Update to 2.30.0
+
* Sun Feb 14 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-2
- Add missing libs
diff --git a/sources b/sources
index 008ae07..fa4e3fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-0bd6c765fe5e5514a1fa69d7088cc1b0 gnome-applets-2.29.5.tar.bz2
+2afcbedc10b1a0e8072ac4eefdc8d770 gnome-applets-2.30.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+
commit 627f3a9d7fdc1c9d7a394d57e888a5dddb276502
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 14 20:44:27 2010 +0000
add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 97b0412..17b6dc4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -60,7 +60,7 @@ Patch42: stickynotes-null.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=599728
Patch44: seriesid-clash.patch
-#
+# https://bugzilla.gnome.org/show_bug.cgi?id=609945
Patch50: gnome-applets-libs.patch
BuildRequires: glib2-devel >= %{glib2_version}
commit 0455c33d58812d95477edc6b667cc640131839cb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 14 20:25:59 2010 +0000
more missing libs
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index 0ae6649..211e035 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -1,3 +1,17 @@
+diff -up gnome-applets-2.29.5/configure.in.libs gnome-applets-2.29.5/configure.in
+diff -up gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs gnome-applets-2.29.5/cpufreq/src/Makefile.am
+--- gnome-applets-2.29.5/cpufreq/src/Makefile.am.libs 2010-02-14 15:23:17.133904122 -0500
++++ gnome-applets-2.29.5/cpufreq/src/Makefile.am 2010-02-14 15:23:51.214903773 -0500
+@@ -32,7 +32,8 @@ cpufreq_applet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(GNOME_LIBS2_LIBS) \
+ $(LIBGLADE_LIBS) \
+- $(LIBCPUFREQ_LIBS)
++ $(LIBCPUFREQ_LIBS) \
++ $(DBUS_LIBS)
+
+
+
diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/Makefile.am
--- gnome-applets-2.29.5/geyes/Makefile.am.libs 2010-02-14 14:27:43.528930009 -0500
+++ gnome-applets-2.29.5/geyes/Makefile.am 2010-02-14 14:27:54.382903748 -0500
commit 5501ad32a16078f8e1e6b43476548698e11f4395
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 14 20:12:52 2010 +0000
more libs
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index 8de62dc..0ae6649 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -11,6 +11,19 @@ diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GeyesApplet.server.in
+diff -up gnome-applets-2.29.5/multiload/Makefile.am.libs gnome-applets-2.29.5/multiload/Makefile.am
+--- gnome-applets-2.29.5/multiload/Makefile.am.libs 2010-02-14 14:55:18.556153943 -0500
++++ gnome-applets-2.29.5/multiload/Makefile.am 2010-02-14 15:10:36.987158084 -0500
+@@ -25,7 +25,8 @@ multiload_applet_2_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(GTOP_APPLETS_LIBS) \
+ $(GNOMEDESKTOP_LIBS) \
+- $(GNOME_LIBS2_LIBS)
++ $(GNOME_LIBS2_LIBS) \
++ -lm
+
+ schemasdir = @GCONF_SCHEMA_FILE_DIR@
+ schemas_in_files = multiload.schemas.in
diff -up gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs gnome-applets-2.29.5/trashapplet/src/Makefile.am
--- gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs 2010-02-14 14:41:41.502904384 -0500
+++ gnome-applets-2.29.5/trashapplet/src/Makefile.am 2010-02-14 14:42:17.442905215 -0500
commit b87473407de857964374b55356a7c166dcfc925b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 14 19:44:34 2010 +0000
more missing libs
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
index 1d1408c..8de62dc 100644
--- a/gnome-applets-libs.patch
+++ b/gnome-applets-libs.patch
@@ -11,3 +11,15 @@ diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GeyesApplet.server.in
+diff -up gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs gnome-applets-2.29.5/trashapplet/src/Makefile.am
+--- gnome-applets-2.29.5/trashapplet/src/Makefile.am.libs 2010-02-14 14:41:41.502904384 -0500
++++ gnome-applets-2.29.5/trashapplet/src/Makefile.am 2010-02-14 14:42:17.442905215 -0500
+@@ -15,6 +15,7 @@ trashapplet_SOURCES = \
+ trashapplet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(GNOME_LIBS2_LIBS) \
+- $(GIO_LIBS)
++ $(GIO_LIBS) \
++ -lX11
+
+ -include $(top_srcdir)/git.mk
commit d6577739badb7141daef6d56b09a8aed3d4212c1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 14 19:34:05 2010 +0000
add missing libs
diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch
new file mode 100644
index 0000000..1d1408c
--- /dev/null
+++ b/gnome-applets-libs.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-2.29.5/geyes/Makefile.am.libs gnome-applets-2.29.5/geyes/Makefile.am
+--- gnome-applets-2.29.5/geyes/Makefile.am.libs 2010-02-14 14:27:43.528930009 -0500
++++ gnome-applets-2.29.5/geyes/Makefile.am 2010-02-14 14:27:54.382903748 -0500
+@@ -17,7 +17,8 @@ geyes_applet2_SOURCES = \
+
+ geyes_applet2_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+- $(GNOME_LIBS2_LIBS)
++ $(GNOME_LIBS2_LIBS) \
++ -lm
+
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = GNOME_GeyesApplet.server.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dce6e70..97b0412 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.29.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -41,7 +41,6 @@ URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.23.3-use-builtin-apm.patch
@@ -61,6 +60,9 @@ Patch42: stickynotes-null.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=599728
Patch44: seriesid-clash.patch
+#
+Patch50: gnome-applets-libs.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -150,6 +152,7 @@ tar xjf %{SOURCE2}
%patch34 -p1 -b .ppp-includes
%patch35 -p1 -b .modemlights-libgnome
%patch44 -p1 -b .seriesid
+%patch50 -p1 -b .libs
autoreconf -i -f
@@ -341,6 +344,9 @@ fi
%changelog
+* Sun Feb 14 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-2
+- Add missing libs
+
* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-1
- Update to 2.29.5
commit 0bf050026a1f89615b0fcac2596d897aaaf8f8e7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 17 22:21:45 2010 +0000
fix file list
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 95496a9..dce6e70 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -322,7 +322,6 @@ fi
%{_libexecdir}/drivemount_applet2
%{_libexecdir}/geyes_applet2
%{_libexecdir}/gnome-applets/
-%{_libexecdir}/gnome-keyboard-applet
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
%{_libexecdir}/modemlights_applet2
commit 1aa0d549ecf65c658604ea46b8ade0a40e722f79
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 17 21:45:07 2010 +0000
2.29.5
diff --git a/.cvsignore b/.cvsignore
index 9670514..66ad5a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.28.0.tar.bz2
+gnome-applets-2.29.5.tar.bz2
diff --git a/gnome-applets-2.18.0-fix-find.patch b/gnome-applets-2.18.0-fix-find.patch
deleted file mode 100644
index 0be4ed5..0000000
--- a/gnome-applets-2.18.0-fix-find.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-applets-2.18.0/gweather/gweather-pref.c.fix-find 2007-03-30 14:41:33.000000000 -0400
-+++ gnome-applets-2.18.0/gweather/gweather-pref.c 2007-03-30 16:59:27.000000000 -0400
-@@ -618,8 +618,10 @@
-
- if (go_parent) {
- iter_parent = *iter;
-- if (gtk_tree_model_iter_parent (model, iter, &iter_parent) && gtk_tree_model_iter_next (model, iter)) {
-- return find_location (model, iter, location, TRUE);
-+ while (gtk_tree_model_iter_parent (model, iter, &iter_parent)) {
-+ if (gtk_tree_model_iter_next (model, iter))
-+ return find_location (model, iter, location, TRUE);
-+ iter_parent = *iter;
- }
- }
-
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f586c22..95496a9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,13 +32,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.28.0
+Version: 2.29.5
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,9 +48,6 @@ Patch2: gnome-applets-2.23.3-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=424639
-Patch31: gnome-applets-2.18.0-fix-find.patch
-
Patch34: ppp-includes.patch
Patch35: modemlights-libgnome.patch
@@ -141,7 +138,6 @@ and more.
%patch2 -p1 -b .use-builtin-apm
%patch11 -p1 -b .dont-require-display
-%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
%patch42 -p1 -b .stickynotes-null
@@ -346,6 +342,9 @@ fi
%changelog
+* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> - 1:2.29.5-1
+- Update to 2.29.5
+
* Tue Oct 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-2
- Fix a help file seriesid clash between accessx-status and invest-applet
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 7c69fd0..65bc674 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,30 +1,21 @@
-diff -up gnome-applets-2.25.90/configure.in.modemlights-libgnome gnome-applets-2.25.90/configure.in
---- gnome-applets-2.25.90/configure.in.modemlights-libgnome 2009-02-03 21:58:39.000000000 -0500
-+++ gnome-applets-2.25.90/configure.in 2009-02-03 21:59:31.000000000 -0500
-@@ -14,6 +14,8 @@ dnl ************************************
- GTK_REQUIRED=2.13.0
- GLIB_REQUIRED=2.18.0
- GIO_REQUIRED=2.15.3
-+LIBGNOME_REQUIRED=2.8.0
-+LIBGNOMEUI_REQUIRED=2.8.0
- GCONF_REQUIRED=2.8.0
- SCROLLKEEPER_REQUIRED=0.1.4
- LIBPANEL_REQUIRED=2.13.4
-@@ -120,6 +122,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
+diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.29.5/configure.in
+--- gnome-applets-2.29.5/configure.in.modemlights-libgnome 2010-01-17 16:37:16.249288488 -0500
++++ gnome-applets-2.29.5/configure.in 2010-01-17 16:39:50.185529959 -0500
+@@ -120,6 +120,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
AC_SUBST(GNOME_APPLETS_CFLAGS)
AC_SUBST(GNOME_APPLETS_LIBS)
+dnl -- check for libgnome (required) ------------------------------------------
-+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
++PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
+AC_SUBST(GNOME_LIBS2_CFLAGS)
+AC_SUBST(GNOME_LIBS2_LIBS)
+
dnl -- check for gnome-desktop (required) -------------------------------------
PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
AC_SUBST(GNOMEDESKTOP_CFLAGS)
-diff -up gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.25.90/modemlights/Makefile.am
---- gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.25.90/modemlights/Makefile.am 2009-02-03 21:57:24.000000000 -0500
+diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.29.5/modemlights/Makefile.am
+--- gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.29.5/modemlights/Makefile.am 2010-01-17 16:37:16.326303959 -0500
@@ -2,6 +2,7 @@ SUBDIRS = docs
INCLUDES = -I. -I$(srcdir) \
diff --git a/sources b/sources
index 25f6211..008ae07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9eb00e9dc468d2c5c71b70c9fb2b751c gnome-applets-2.28.0.tar.bz2
+0bd6c765fe5e5514a1fa69d7088cc1b0 gnome-applets-2.29.5.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 74bfde812b6b77fa8d7b6fb43f81af2b1093435b
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 23:19:35 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index 139806a..b4c7919 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: gnome-applets
-# $Id: Makefile,v 1.1 2004/09/09 05:20:42 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:47:54 notting Exp $
NAME := gnome-applets
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit e2109133b585554dd62f92ef12200d5ee7cc79fa
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Nov 2 05:42:40 2009 +0000
Copy F12 work over
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1159b96..f586c22 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch41: gnome-applets-no-mixer-icon.patch
# do the nullapplet dance for stickynotes
Patch42: stickynotes-null.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599728
+Patch44: seriesid-clash.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -150,6 +153,7 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
%patch35 -p1 -b .modemlights-libgnome
+%patch44 -p1 -b .seriesid
autoreconf -i -f
@@ -342,6 +346,9 @@ fi
%changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-2
+- Fix a help file seriesid clash between accessx-status and invest-applet
+
* Mon Sep 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-1
- Update to 2.28.0
diff --git a/gweather-network.patch b/gweather-network.patch
deleted file mode 100644
index 95bc83e..0000000
--- a/gweather-network.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-applets-2.26.1/gweather/gweather-applet.c.network gnome-applets-2.26.1/gweather/gweather-applet.c
---- gnome-applets-2.26.1/gweather/gweather-applet.c.network 2009-04-15 18:53:13.123633124 -0400
-+++ gnome-applets-2.26.1/gweather/gweather-applet.c 2009-04-15 18:54:17.438384718 -0400
-@@ -17,6 +17,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-
- #include <gconf/gconf-client.h>
- #include <panel-applet.h>
-@@ -552,6 +555,8 @@ state_notify (DBusPendingCall *pending,
- DBUS_TYPE_UINT32, &result,
- DBUS_TYPE_INVALID)) {
- if (result == NM_STATE_CONNECTED) {
-+ /* thank you, glibc */
-+ res_init ();
- gweather_update (gw_applet);
- }
- }
diff --git a/polkit1.patch b/polkit1.patch
deleted file mode 100644
index 801e1f5..0000000
--- a/polkit1.patch
+++ /dev/null
@@ -1,745 +0,0 @@
-diff -up gnome-applets-2.27.3/configure.in.polkit1 gnome-applets-2.27.3/configure.in
---- gnome-applets-2.27.3/configure.in.polkit1 2009-07-13 01:24:29.668203682 -0400
-+++ gnome-applets-2.27.3/configure.in 2009-07-13 01:24:29.812193607 -0400
-@@ -33,7 +35,7 @@ LIBXML_REQUIRED=2.5.0
- GWEATHER_REQUIRED=2.22.1
- GUCHARMAP2_REQUIRED=2.23.0
- GUCHARMAP_REQUIRED=1.4.0
--POLKIT_REQUIRED=0.7
-+POLKIT_REQUIRED=0.92
- NETWORKMANAGER_REQUIRED=0.7
- GST10_REQUIRED=0.10.2
- dnl ***************************************************************************
-@@ -210,7 +217,7 @@ AC_ARG_ENABLE([polkit],
- enable_polkit=$enableval,
- enable_polkit=auto)
- if test "x$enable_polkit" != "xno"; then
-- PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
-+ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
- if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno"; then
- AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
- fi
-@@ -226,22 +233,6 @@ AM_CONDITIONAL(HAVE_POLKIT, test "x$HAVE
- AC_SUBST(POLKIT_CFLAGS)
- AC_SUBST(POLKIT_LIBS)
-
--POLKIT_GNOME_CFLAGS=
--POLKIT_GNOME_LIBS=
--polkit_gnome=no
--if test "x$enable_polkit" != "xno"; then
-- PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
-- if test "x$enable_polkit" = "xyes" -a "x$polkit_gnome" = "xno"; then
-- AC_MSG_ERROR([PolicyKit-gnome support explicitly requested but dependencies not found])
-- fi
--fi
--if test "x$polkit_gnome" = "xyes"; then
-- AC_DEFINE(HAVE_POLKIT_GNOME, [1], [PolicyKit-gnome available])
--fi
--AM_CONDITIONAL(HAVE_POLKIT_GNOME, test "x$polkit_gnome" = "xyes")
--AC_SUBST(POLKIT_GNOME_CFLAGS)
--AC_SUBST(POLKIT_GNOME_LIBS)
--
-
- dnl -- check for libhal (optional) --------------------------------------------
- HAL_CFLAGS=
-@@ -797,7 +788,6 @@ gnome-applets-$VERSION configure summary
- - cpufreq $build_cpufreq_applet
- - building selector $enable_selector
- - using PolicyKit $HAVE_POLKIT
-- - using PolicyKit-gnome $polkit_gnome
- - enabling suid bit $suid
- - drivemount always
- - geyes always
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c 2009-07-13 01:24:29.710444190 -0400
-@@ -19,19 +19,18 @@
-
- #include <config.h>
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- #include <dbus/dbus-glib.h>
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-
- #include "cpufreq-selector.h"
-
- struct _CPUFreqSelector {
- GObject parent;
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- DBusGConnection *system_bus;
-- DBusGConnection *session_bus;
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
- };
-
- struct _CPUFreqSelectorClass {
-@@ -45,10 +44,9 @@ cpufreq_selector_finalize (GObject *obje
- {
- CPUFreqSelector *selector = CPUFREQ_SELECTOR (object);
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- selector->system_bus = NULL;
-- selector->session_bus = NULL;
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-
- G_OBJECT_CLASS (cpufreq_selector_parent_class)->finalize (object);
- }
-@@ -77,7 +75,7 @@ cpufreq_selector_get_default (void)
- return selector;
- }
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- typedef enum {
- FREQUENCY,
- GOVERNOR
-@@ -114,90 +112,12 @@ cpufreq_selector_connect_to_system_bus (
- {
- if (selector->system_bus)
- return TRUE;
--
-+
- selector->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, error);
-
- return (selector->system_bus != NULL);
- }
-
--static gboolean
--cpufreq_selector_connect_to_session_bus (CPUFreqSelector *selector,
-- GError **error)
--{
-- if (selector->session_bus)
-- return TRUE;
--
-- selector->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, error);
--
-- return (selector->session_bus != NULL);
--}
--
--static void
--dbus_auth_call_notify_cb (DBusGProxy *proxy,
-- DBusGProxyCall *call,
-- gpointer user_data)
--{
-- SelectorAsyncData *data;
-- gboolean gained_privilege;
-- GError *error = NULL;
--
-- data = (SelectorAsyncData *)user_data;
--
-- if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
-- g_warning ("%s", error->message);
-- g_error_free (error);
--
-- selector_async_data_free (data);
--
-- return;
-- }
--
-- if (gained_privilege) {
-- switch (data->call) {
-- case FREQUENCY:
-- selector_set_frequency_async (data);
-- break;
-- case GOVERNOR:
-- selector_set_governor_async (data);
-- break;
-- default:
-- g_assert_not_reached ();
-- }
-- } else {
-- selector_async_data_free (data);
-- }
--}
--
--static void
--do_auth_async (SelectorAsyncData *data)
--{
-- DBusGProxy *proxy;
-- GError *error = NULL;
--
-- if (!cpufreq_selector_connect_to_session_bus (data->selector, &error)) {
-- g_warning ("%s", error->message);
-- g_error_free (error);
--
-- selector_async_data_free (data);
--
-- return;
-- }
--
-- proxy = dbus_g_proxy_new_for_name (data->selector->session_bus,
-- "org.gnome.PolicyKit",
-- "/org/gnome/PolicyKit/Manager",
-- "org.gnome.PolicyKit.Manager");
--
-- dbus_g_proxy_begin_call_with_timeout (proxy,
-- "ShowDialog",
-- dbus_auth_call_notify_cb,
-- data, NULL,
-- INT_MAX,
-- G_TYPE_STRING, "org.gnome.cpufreqselector",
-- G_TYPE_UINT, data->parent_xid,
-- G_TYPE_INVALID);
--}
--
- static void
- dbus_set_call_notify_cb (DBusGProxy *proxy,
- DBusGProxyCall *call,
-@@ -213,12 +133,6 @@ dbus_set_call_notify_cb (DBusGProxy
- return;
- }
-
-- if (error->domain == DBUS_GERROR && DBUS_GERROR_REMOTE_EXCEPTION &&
-- dbus_g_error_has_name (error, "org.gnome.CPUFreqSelector.NotAuthorized")) {
-- do_auth_async (data);
-- return;
-- }
--
- selector_async_data_free (data);
- g_warning ("%s", error->message);
- g_error_free (error);
-@@ -229,13 +143,13 @@ selector_set_frequency_async (SelectorAs
- {
- DBusGProxy *proxy;
- GError *error = NULL;
--
-+
- if (!cpufreq_selector_connect_to_system_bus (data->selector, &error)) {
- g_warning ("%s", error->message);
- g_error_free (error);
-
- selector_async_data_free (data);
--
-+
- return;
- }
-
-@@ -243,7 +157,7 @@ selector_set_frequency_async (SelectorAs
- "org.gnome.CPUFreqSelector",
- "/org/gnome/cpufreq_selector/selector",
- "org.gnome.CPUFreqSelector");
--
-+
- dbus_g_proxy_begin_call_with_timeout (proxy, "SetFrequency",
- dbus_set_call_notify_cb,
- data, NULL,
-@@ -321,7 +235,7 @@ cpufreq_selector_set_governor_async (CPU
-
- selector_set_governor_async (data);
- }
--#else /* !HAVE_POLKIT_GNOME */
-+#else /* !HAVE_POLKIT */
- static void
- cpufreq_selector_run_command (CPUFreqSelector *selector,
- const gchar *args)
-@@ -372,4 +286,4 @@ cpufreq_selector_set_governor_async (CPU
- cpufreq_selector_run_command (selector, args);
- g_free (args);
- }
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-07-13 01:24:29.712443397 -0400
-@@ -17,7 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
--#include <polkit-dbus/polkit-dbus.h>
-+#include <polkit/polkit.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
- #include "cpufreq-selector.h"
-@@ -37,7 +37,7 @@ struct _CPUFreqSelectorService {
- DBusGConnection *system_bus;
-
- /* PolicyKit */
-- PolKitContext *pk_context;
-+ PolkitAuthority *authority;
- };
-
- struct _CPUFreqSelectorServiceClass {
-@@ -99,9 +99,9 @@ cpufreq_selector_service_finalize (GObje
- service->selectors_max = -1;
- }
-
-- if (service->pk_context) {
-- polkit_context_unref (service->pk_context);
-- service->pk_context = NULL;
-+ if (service->authority) {
-+ g_object_unref (service->authority);
-+ service->authority = NULL;
- }
-
- G_OBJECT_CLASS (cpufreq_selector_service_parent_class)->finalize (object);
-@@ -153,42 +153,6 @@ reset_killtimer (void)
- NULL);
- }
-
--static gboolean
--pk_io_watch_have_data (GIOChannel *channel,
-- GIOCondition condition,
-- PolKitContext *pk_context)
--{
-- polkit_context_io_func (pk_context,
-- g_io_channel_unix_get_fd (channel));
-- return TRUE;
--}
--
--static int
--pk_add_io_watch (PolKitContext *pk_context,
-- int watch_id)
--{
-- GIOChannel *channel;
-- guint id = 0;
--
-- channel = g_io_channel_unix_new (watch_id);
-- if (!channel)
-- return 0;
--
-- id = g_io_add_watch (channel, G_IO_IN,
-- (GIOFunc)pk_io_watch_have_data,
-- pk_context);
-- g_io_channel_unref (channel);
--
-- return id;
--}
--
--static void
--pk_remove_io_watch (PolKitContext *pk_context,
-- int watch_id)
--{
-- g_source_remove (watch_id);
--}
--
- gboolean
- cpufreq_selector_service_register (CPUFreqSelectorService *service,
- GError **error)
-@@ -198,7 +162,6 @@ cpufreq_selector_service_register (CPUFr
- gboolean res;
- guint result;
- GError *err = NULL;
-- PolKitError *pk_err = NULL;
-
- if (service->system_bus) {
- g_set_error (error,
-@@ -268,30 +231,7 @@ cpufreq_selector_service_register (CPUFr
- return FALSE;
- }
-
-- service->pk_context = polkit_context_new ();
-- polkit_context_set_io_watch_functions (service->pk_context,
-- pk_add_io_watch,
-- pk_remove_io_watch);
-- if (!polkit_context_init (service->pk_context, &pk_err)) {
-- polkit_context_unref (service->pk_context);
-- service->pk_context = NULL;
--
-- if (polkit_error_is_set (pk_err)) {
-- g_set_error (error,
-- CPUFREQ_SELECTOR_SERVICE_ERROR,
-- SERVICE_ERROR_GENERAL,
-- "Cannot initialize libpolkit: %s",
-- polkit_error_get_error_message (pk_err));
-- polkit_error_free (pk_err);
-- } else {
-- g_set_error (error,
-- CPUFREQ_SELECTOR_SERVICE_ERROR,
-- SERVICE_ERROR_GENERAL,
-- "Cannot initialize libpolkit");
-- }
--
-- return FALSE;
-- }
-+ service->authority = polkit_authority_get ();
-
- service->system_bus = connection;
-
-@@ -330,62 +270,42 @@ cpufreq_selector_service_check_policy (C
- DBusGMethodInvocation *context,
- GError **error)
- {
-- PolKitAction *pk_action;
-- PolKitCaller *pk_caller;
-- PolKitResult pk_result;
-+ PolkitSubject *subject;
-+ PolkitAuthorizationResult *result;
- gchar *sender;
-- DBusConnection *connection;
-- DBusError dbus_error;
-- PolKitError *pk_error = NULL;
-+ gboolean ret;
-
- sender = dbus_g_method_get_sender (context);
-- connection = dbus_g_connection_get_connection (service->system_bus);
-
-- dbus_error_init (&dbus_error);
-- pk_caller = polkit_caller_new_from_dbus_name (connection, sender, &dbus_error);
-- if (!pk_caller) {
-- g_set_error (error,
-- CPUFREQ_SELECTOR_SERVICE_ERROR,
-- SERVICE_ERROR_DBUS,
-- "Error getting information about caller: %s: %s",
-- dbus_error.name, dbus_error.message);
-- dbus_error_free (&dbus_error);
-- g_free (sender);
--
-- return FALSE;
-- }
-- g_free (sender);
--
-- pk_action = polkit_action_new ();
-- polkit_action_set_action_id (pk_action, "org.gnome.cpufreqselector");
-- pk_result = polkit_context_is_caller_authorized (service->pk_context,
-- pk_action, pk_caller,
-- TRUE, &pk_error);
-- polkit_caller_unref (pk_caller);
-- polkit_action_unref (pk_action);
--
-- if (polkit_error_is_set (pk_error)) {
-- g_set_error (error,
-- CPUFREQ_SELECTOR_SERVICE_ERROR,
-- SERVICE_ERROR_GENERAL,
-- "Could not determine if caller is authorized: %s",
-- polkit_error_get_error_message (pk_error));
-- polkit_error_free (pk_error);
-+ subject = polkit_system_bus_name_new (sender);
-+ result = polkit_authority_check_authorization_sync (service->authority,
-+ subject,
-+ "org.gnome.cpufreqselector",
-+ NULL,
-+ POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-+ NULL, error);
-+ g_object_unref (subject);
-
-+ if (*error) {
-+ g_warning ("check policy: %s", (*error)->message);
- return FALSE;
- }
-
-- if (pk_result != POLKIT_RESULT_YES) {
-+ if (!polkit_authorization_result_get_is_authorized (result)) {
- g_set_error (error,
- CPUFREQ_SELECTOR_SERVICE_ERROR,
- SERVICE_ERROR_NOT_AUTHORIZED,
-- "Caller is not authorized: %s",
-- polkit_result_to_string_representation (pk_result));
-+ "Caller is not authorized");
-
-- return FALSE;
-+ ret = FALSE;
- }
--
-- return TRUE;
-+ else {
-+ ret = TRUE;
-+ }
-+
-+ g_object_unref (result);
-+
-+ return ret;
- }
-
- /* D-BUS interface */
-@@ -518,3 +438,47 @@ cpufreq_selector_service_set_governor (C
-
- return TRUE;
- }
-+
-+
-+gboolean
-+cpufreq_selector_service_can_set (CPUFreqSelectorService *service,
-+ DBusGMethodInvocation *context)
-+{
-+ PolkitSubject *subject;
-+ PolkitAuthorizationResult *result;
-+ gchar *sender;
-+ gboolean ret;
-+ GError *error = NULL;
-+
-+ reset_killtimer ();
-+
-+ sender = dbus_g_method_get_sender (context);
-+ subject = polkit_system_bus_name_new (sender);
-+ result = polkit_authority_check_authorization_sync (service->authority,
-+ subject,
-+ "org.gnome.cpufreqselector",
-+ NULL,
-+ 0,
-+ NULL, &error);
-+ g_object_unref (subject);
-+ if (error) {
-+ dbus_g_method_return_error (context, error);
-+ return FALSE;
-+ }
-+
-+ if (polkit_authorization_result_get_is_authorized (result)) {
-+ ret = TRUE;
-+ }
-+ else if (polkit_authorization_result_get_is_challenge (result)) {
-+ ret = TRUE;
-+ }
-+ else {
-+ ret = FALSE;
-+ }
-+
-+ g_object_unref (result);
-+
-+ dbus_g_method_return (context, ret);
-+
-+ return TRUE;
-+}
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-07-13 01:24:29.713443245 -0400
-@@ -62,6 +62,8 @@ gboolean cpufreq_selector
- guint cpu,
- const gchar *governor,
- DBusGMethodInvocation *context);
-+gboolean cpufreq_selector_service_can_set (CPUFreqSelectorService *service,
-+ DBusGMethodInvocation *context);
-
- G_END_DECLS
-
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-07-13 01:24:29.714443163 -0400
-@@ -13,6 +13,11 @@
- <arg name="cpu" direction="in" type="u"/>
- <arg name="governor" direction="in" type="s"/>
- </method>
--
-+
-+ <method name="CanSet">
-+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-+ <arg name="result" direction="out" type="b"/>
-+ </method>
-+
- </interface>
- </node>
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am.polkit1 2009-07-13 01:30:32.497197598 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am 2009-07-13 01:30:42.876197568 -0400
-@@ -51,7 +51,7 @@ polkit_in_files = org.gnome.cpufreqselec
-
- dbus_servicesdir = $(datadir)/dbus-1/system-services
- dbus_confdir = $(sysconfdir)/dbus-1/system.d
--polkitdir = $(datadir)/PolicyKit/policy
-+polkitdir = $(datadir)/polkit-1/actions
-
- if HAVE_POLKIT
- BUILT_SOURCES = cpufreq-selector-service-glue.h
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.polkit1 2009-04-18 22:12:10.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in 2009-07-13 01:24:29.715443081 -0400
-@@ -15,7 +15,7 @@
- <_message>Privileges are required to change the CPU Frequency scaling.</_message>
- <defaults>
- <allow_inactive>no</allow_inactive>
-- <allow_active>auth_admin_keep_always</allow_active>
-+ <allow_active>auth_admin_keep</allow_active>
- </defaults>
- </action>
-
-diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c
---- gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c 2009-07-13 01:24:29.716443139 -0400
-@@ -21,13 +21,6 @@
-
- #include <config.h>
-
--#ifdef HAVE_POLKIT_GNOME
--#include <dbus/dbus-glib.h>
--#include <dbus/dbus-glib-lowlevel.h>
--#include <polkit/polkit.h>
--#include <polkit-dbus/polkit-dbus.h>
--#endif
--
- #include <glib.h>
- #include <gtk/gtk.h>
- #include <sys/types.h>
-@@ -39,6 +32,10 @@
-
- #include "cpufreq-utils.h"
-
-+#ifdef HAVE_POLKIT
-+#include <dbus/dbus-glib.h>
-+#endif /* HAVE_POLKIT */
-+
- guint
- cpufreq_utils_get_n_cpus (void)
- {
-@@ -108,56 +105,16 @@ cpufreq_utils_display_error (const gchar
- gtk_widget_show (dialog);
- }
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- #define CACHE_VALIDITY_SEC 2
-
- static gboolean
--pk_io_watch_have_data (GIOChannel *channel,
-- GIOCondition condition,
-- PolKitContext *pk_context)
--{
-- polkit_context_io_func (pk_context,
-- g_io_channel_unix_get_fd (channel));
-- return TRUE;
--}
--
--static int
--pk_add_io_watch (PolKitContext *pk_context,
-- int watch_id)
--{
-- GIOChannel *channel;
-- guint id = 0;
--
-- channel = g_io_channel_unix_new (watch_id);
-- if (!channel)
-- return 0;
--
-- id = g_io_add_watch (channel, G_IO_IN,
-- (GIOFunc)pk_io_watch_have_data,
-- pk_context);
-- g_io_channel_unref (channel);
--
-- return id;
--}
--
--static void
--pk_remove_io_watch (PolKitContext *pk_context,
-- int watch_id)
--{
-- g_source_remove (watch_id);
--}
--
--static gboolean
--selector_is_available (const gchar *action)
-+selector_is_available (void)
- {
-+ DBusGProxy *proxy;
- static DBusGConnection *system_bus = NULL;
-- static PolKitContext *pk_context = NULL;
-- PolKitCaller *pk_caller;
-- PolKitAction *pk_action;
-- PolKitResult pk_result;
-- PolKitError *pk_error = NULL;
- GError *error = NULL;
-- DBusError dbus_error;
-+ gboolean result;
-
- if (!system_bus) {
- system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-@@ -169,54 +126,22 @@ selector_is_available (const gchar *acti
- }
- }
-
-- if (!pk_context) {
-- PolKitError *pk_error = NULL;
--
-- pk_context = polkit_context_new ();
-- polkit_context_set_io_watch_functions (pk_context,
-- pk_add_io_watch,
-- pk_remove_io_watch);
-- if (!polkit_context_init (pk_context, &pk_error)) {
-- polkit_context_unref (pk_context);
-- pk_context = NULL;
--
-- if (polkit_error_is_set (pk_error)) {
-- g_warning ("%s", polkit_error_get_error_message (pk_error));
-- polkit_error_free (pk_error);
-- } else {
-- g_warning ("Cannot initialize libpolkit");
-- }
--
-- return FALSE;
-- }
-+ proxy = dbus_g_proxy_new_for_name (system_bus,
-+ "org.gnome.CPUFreqSelector",
-+ "/org/gnome/cpufreq_selector/selector",
-+ "org.gnome.CPUFreqSelector");
-+
-+ if (!dbus_g_proxy_call (proxy, "CanSet", &error,
-+ G_TYPE_INVALID,
-+ G_TYPE_BOOLEAN, &result,
-+ G_TYPE_INVALID)) {
-+ g_warning ("error calling org.gnome.CPUFreqSelector.CanSet: %s", error->message);
-+ g_error_free (error);
- }
-
-- dbus_error_init (&dbus_error);
-- pk_caller = polkit_caller_new_from_pid (dbus_g_connection_get_connection (system_bus),
-- getpid (), &dbus_error);
-- if (!pk_caller) {
-- g_warning ("Cannot get caller from dbus name");
--
-- return FALSE;
-- }
--
-- pk_action = polkit_action_new ();
-- polkit_action_set_action_id (pk_action, action);
-- pk_result = polkit_context_is_caller_authorized (pk_context,
-- pk_action, pk_caller,
-- FALSE, &pk_error);
--
-- polkit_caller_unref (pk_caller);
-- polkit_action_unref (pk_action);
--
-- if (polkit_error_is_set (pk_error)) {
-- g_warning ("%s", polkit_error_get_error_message (pk_error));
-- polkit_error_free (pk_error);
--
-- return FALSE;
-- }
-+ g_object_unref (proxy);
-
-- return !(pk_result == POLKIT_RESULT_UNKNOWN || pk_result == POLKIT_RESULT_NO);
-+ return result;
- }
-
- gboolean
-@@ -228,13 +153,13 @@ cpufreq_utils_selector_is_available (voi
-
- time (&now);
- if (ABS (now - last_refreshed) > CACHE_VALIDITY_SEC) {
-- cache = selector_is_available ("org.gnome.cpufreqselector");
-+ cache = selector_is_available ();
- last_refreshed = now;
- }
-
- return cache;
- }
--#else /* !HAVE_POLKIT_GNOME */
-+#else /* !HAVE_POLKIT */
- gboolean
- cpufreq_utils_selector_is_available (void)
- {
-diff -up gnome-applets-2.27.3/cpufreq/src/Makefile.am.polkit1 gnome-applets-2.27.3/cpufreq/src/Makefile.am
---- gnome-applets-2.27.3/cpufreq/src/Makefile.am.polkit1 2009-06-16 21:43:08.000000000 -0400
-+++ gnome-applets-2.27.3/cpufreq/src/Makefile.am 2009-07-13 01:24:29.717442917 -0400
-@@ -9,10 +9,6 @@ INCLUDES = \
- $(GNOME_LIBS2_CFLAGS) \
- $(LIBGLADE_CFLAGS)
-
--if HAVE_POLKIT_GNOME
--INCLUDES += $(POLKIT_GNOME_CFLAGS)
--endif
--
- libexec_PROGRAMS = cpufreq-applet
-
- if HAVE_LIBCPUFREQ
-@@ -38,8 +34,4 @@ cpufreq_applet_LDADD = \
- $(LIBGLADE_LIBS) \
- $(LIBCPUFREQ_LIBS)
-
--if HAVE_POLKIT_GNOME
--cpufreq_applet_LDADD += $(POLKIT_GNOME_LIBS)
--endif
--
-
diff --git a/seriesid-clash.patch b/seriesid-clash.patch
new file mode 100644
index 0000000..0dd346d
--- /dev/null
+++ b/seriesid-clash.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in
+--- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid 2009-10-27 00:25:35.351806142 -0400
++++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in 2009-10-27 00:29:15.578549690 -0400
+@@ -3,7 +3,7 @@
+ <resource>
+ <subject category="GNOME|Applets|Utility"/>
+ <type>user's guide</type>
+- <relation seriesid="df109296-40e7-11d6-935f-beaae1cfe4f9"/>
++ <relation seriesid="04cc2ede-586b-2643-7e6f-37a004e0fbd470"/>
+ <rights type="GNU FDL" license.version="1.1" holder="Terence Hall"/>
+ </resource>
+ </omf>
commit 16d5e3f318659feda4fa720e0b08db5398691cf1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 22 03:28:49 2009 +0000
2.28.0
diff --git a/.cvsignore b/.cvsignore
index aff7740..9670514 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.92.tar.bz2
+gnome-applets-2.28.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 60b12af..1159b96 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,6 @@
%define gnome_utils_version 2.8.1
%define dbus_version 0.90
%define dbus_glib_version 0.70
-%define hal_version 0.5.3
%define libnotify_version 0.3.2
%define pygobject_version 2.6
%define pygtk_version 2.6
@@ -33,13 +32,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.92
+Version: 2.28.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,7 +79,6 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
-BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtk2-devel >= %{pygtk_version}
@@ -344,6 +342,9 @@ fi
%changelog
+* Mon Sep 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.28.0-1
+- Update to 2.28.0
+
* Tue Sep 8 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.92-1
- Update to 2.27.92
diff --git a/sources b/sources
index a6416fc..25f6211 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5b1c417ace3bc0083f0b8839709f40e4 gnome-applets-2.27.92.tar.bz2
+9eb00e9dc468d2c5c71b70c9fb2b751c gnome-applets-2.28.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 002e697140943109278d1f3408907b57f8a95d02
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 8 22:09:06 2009 +0000
2.27.92
diff --git a/.cvsignore b/.cvsignore
index 34142a2..aff7740 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.91.tar.bz2
+gnome-applets-2.27.92.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1b85559..60b12af 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.91
+Version: 2.27.92
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -344,6 +344,9 @@ fi
%changelog
+* Tue Sep 8 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.92-1
+- Update to 2.27.92
+
* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.91-1
- 2.27.91
diff --git a/sources b/sources
index 8052fea..a6416fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-458f2fefc70b5ab740816d0695d0abcf gnome-applets-2.27.91.tar.bz2
+5b1c417ace3bc0083f0b8839709f40e4 gnome-applets-2.27.92.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 23070e78364f34d29c57a09243f25e6301e36796
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 25 21:06:03 2009 +0000
fix sources
diff --git a/sources b/sources
index dbb1e9f..8052fea 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
458f2fefc70b5ab740816d0695d0abcf gnome-applets-2.27.91.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 3c11b2538fec37fa4aa93ae44338a0cf827ad050
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 25 19:24:16 2009 +0000
2.27.91
diff --git a/.cvsignore b/.cvsignore
index ea4b797..34142a2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.4.tar.bz2
+gnome-applets-2.27.91.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9afe284..1b85559 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.4
+Version: 2.27.91
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -62,9 +62,6 @@ Patch41: gnome-applets-no-mixer-icon.patch
# do the nullapplet dance for stickynotes
Patch42: stickynotes-null.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=499972
-Patch43: polkit1.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -147,7 +144,6 @@ and more.
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
%patch42 -p1 -b .stickynotes-null
-%patch43 -p1 -b .polkit1
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -348,6 +344,9 @@ fi
%changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.91-1
+- 2.27.91
+
* Wed Jul 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.4-1
- Update to 2.27.4
diff --git a/sources b/sources
index 857c599..dbb1e9f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ee2f2c158eda2605ba12ab0283060eb1 gnome-applets-2.27.4.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+458f2fefc70b5ab740816d0695d0abcf gnome-applets-2.27.91.tar.bz2
commit 87888bd6f6079cfc17de302535d6a865b40c563c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 29 18:51:07 2009 +0000
fix sources
diff --git a/sources b/sources
index b212ab4..857c599 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ee2f2c158eda2605ba12ab0283060eb1 gnome-applets-2.27.4.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 6765fc4f344cb84667b7301620264754a19eaa07
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 29 18:45:21 2009 +0000
2.27.4
diff --git a/.cvsignore b/.cvsignore
index c246b14..ea4b797 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.3.tar.bz2
+gnome-applets-2.27.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8c64308..9afe284 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.3
-Release: 6%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -348,6 +348,9 @@ fi
%changelog
+* Wed Jul 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.4-1
+- Update to 2.27.4
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.27.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index ca7210f..b212ab4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-04ce905d42f1e1d3c472b28463443dda gnome-applets-2.27.3.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+ee2f2c158eda2605ba12ab0283060eb1 gnome-applets-2.27.4.tar.bz2
commit 469fbfb3a1106c0392e7ccce44642bdf4510086b
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Jul 25 00:34:41 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 42d5763..8c64308 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -348,6 +348,9 @@ fi
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.27.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-5
- Rebuild against new libgnomekbd
commit ef02d04aa7af895feb68d17e47bc0335a777a075
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 15 21:20:38 2009 +0000
Rebuild against new libgnomekbd
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c96eceb..42d5763 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -23,7 +23,7 @@
%define pygtk_version 2.6
%define gnome_python_version 2.10
%define gconf_version 2.14.0
-%define libgnomekbd_version 2.21
+%define libgnomekbd_version 2.27.4
%define po_package gnome-applets-2.0
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -348,6 +348,9 @@ fi
%changelog
+* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-5
+- Rebuild against new libgnomekbd
+
* Mon Jul 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-4
- Fix PolicyKit 1 patch
commit db8baaa2911545f2576d5fb747fdaa659f66cd77
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jul 13 06:00:01 2009 +0000
fix polkit1 port
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d9c5dbb..c96eceb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -157,8 +157,7 @@ tar xjf %{SOURCE2}
%patch34 -p1 -b .ppp-includes
%patch35 -p1 -b .modemlights-libgnome
-intltoolize --force
-autoreconf
+autoreconf -i -f
%build
@@ -344,11 +343,14 @@ fi
%{_libexecdir}/invest-applet
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
-%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
+%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
%changelog
+* Mon Jul 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-4
+- Fix PolicyKit 1 patch
+
* Tue Jun 30 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-3
- Rebuild against new libxklavier
diff --git a/polkit1.patch b/polkit1.patch
index 2b6ac8e..801e1f5 100644
--- a/polkit1.patch
+++ b/polkit1.patch
@@ -1,6 +1,252 @@
-diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
---- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-05-14 23:45:38.384939252 -0400
+diff -up gnome-applets-2.27.3/configure.in.polkit1 gnome-applets-2.27.3/configure.in
+--- gnome-applets-2.27.3/configure.in.polkit1 2009-07-13 01:24:29.668203682 -0400
++++ gnome-applets-2.27.3/configure.in 2009-07-13 01:24:29.812193607 -0400
+@@ -33,7 +35,7 @@ LIBXML_REQUIRED=2.5.0
+ GWEATHER_REQUIRED=2.22.1
+ GUCHARMAP2_REQUIRED=2.23.0
+ GUCHARMAP_REQUIRED=1.4.0
+-POLKIT_REQUIRED=0.7
++POLKIT_REQUIRED=0.92
+ NETWORKMANAGER_REQUIRED=0.7
+ GST10_REQUIRED=0.10.2
+ dnl ***************************************************************************
+@@ -210,7 +217,7 @@ AC_ARG_ENABLE([polkit],
+ enable_polkit=$enableval,
+ enable_polkit=auto)
+ if test "x$enable_polkit" != "xno"; then
+- PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
++ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
+ if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno"; then
+ AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
+ fi
+@@ -226,22 +233,6 @@ AM_CONDITIONAL(HAVE_POLKIT, test "x$HAVE
+ AC_SUBST(POLKIT_CFLAGS)
+ AC_SUBST(POLKIT_LIBS)
+
+-POLKIT_GNOME_CFLAGS=
+-POLKIT_GNOME_LIBS=
+-polkit_gnome=no
+-if test "x$enable_polkit" != "xno"; then
+- PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
+- if test "x$enable_polkit" = "xyes" -a "x$polkit_gnome" = "xno"; then
+- AC_MSG_ERROR([PolicyKit-gnome support explicitly requested but dependencies not found])
+- fi
+-fi
+-if test "x$polkit_gnome" = "xyes"; then
+- AC_DEFINE(HAVE_POLKIT_GNOME, [1], [PolicyKit-gnome available])
+-fi
+-AM_CONDITIONAL(HAVE_POLKIT_GNOME, test "x$polkit_gnome" = "xyes")
+-AC_SUBST(POLKIT_GNOME_CFLAGS)
+-AC_SUBST(POLKIT_GNOME_LIBS)
+-
+
+ dnl -- check for libhal (optional) --------------------------------------------
+ HAL_CFLAGS=
+@@ -797,7 +788,6 @@ gnome-applets-$VERSION configure summary
+ - cpufreq $build_cpufreq_applet
+ - building selector $enable_selector
+ - using PolicyKit $HAVE_POLKIT
+- - using PolicyKit-gnome $polkit_gnome
+ - enabling suid bit $suid
+ - drivemount always
+ - geyes always
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector.c 2009-07-13 01:24:29.710444190 -0400
+@@ -19,19 +19,18 @@
+
+ #include <config.h>
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ #include <dbus/dbus-glib.h>
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+
+ #include "cpufreq-selector.h"
+
+ struct _CPUFreqSelector {
+ GObject parent;
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ DBusGConnection *system_bus;
+- DBusGConnection *session_bus;
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+ };
+
+ struct _CPUFreqSelectorClass {
+@@ -45,10 +44,9 @@ cpufreq_selector_finalize (GObject *obje
+ {
+ CPUFreqSelector *selector = CPUFREQ_SELECTOR (object);
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ selector->system_bus = NULL;
+- selector->session_bus = NULL;
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+
+ G_OBJECT_CLASS (cpufreq_selector_parent_class)->finalize (object);
+ }
+@@ -77,7 +75,7 @@ cpufreq_selector_get_default (void)
+ return selector;
+ }
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ typedef enum {
+ FREQUENCY,
+ GOVERNOR
+@@ -114,90 +112,12 @@ cpufreq_selector_connect_to_system_bus (
+ {
+ if (selector->system_bus)
+ return TRUE;
+-
++
+ selector->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, error);
+
+ return (selector->system_bus != NULL);
+ }
+
+-static gboolean
+-cpufreq_selector_connect_to_session_bus (CPUFreqSelector *selector,
+- GError **error)
+-{
+- if (selector->session_bus)
+- return TRUE;
+-
+- selector->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, error);
+-
+- return (selector->session_bus != NULL);
+-}
+-
+-static void
+-dbus_auth_call_notify_cb (DBusGProxy *proxy,
+- DBusGProxyCall *call,
+- gpointer user_data)
+-{
+- SelectorAsyncData *data;
+- gboolean gained_privilege;
+- GError *error = NULL;
+-
+- data = (SelectorAsyncData *)user_data;
+-
+- if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
+- g_warning ("%s", error->message);
+- g_error_free (error);
+-
+- selector_async_data_free (data);
+-
+- return;
+- }
+-
+- if (gained_privilege) {
+- switch (data->call) {
+- case FREQUENCY:
+- selector_set_frequency_async (data);
+- break;
+- case GOVERNOR:
+- selector_set_governor_async (data);
+- break;
+- default:
+- g_assert_not_reached ();
+- }
+- } else {
+- selector_async_data_free (data);
+- }
+-}
+-
+-static void
+-do_auth_async (SelectorAsyncData *data)
+-{
+- DBusGProxy *proxy;
+- GError *error = NULL;
+-
+- if (!cpufreq_selector_connect_to_session_bus (data->selector, &error)) {
+- g_warning ("%s", error->message);
+- g_error_free (error);
+-
+- selector_async_data_free (data);
+-
+- return;
+- }
+-
+- proxy = dbus_g_proxy_new_for_name (data->selector->session_bus,
+- "org.gnome.PolicyKit",
+- "/org/gnome/PolicyKit/Manager",
+- "org.gnome.PolicyKit.Manager");
+-
+- dbus_g_proxy_begin_call_with_timeout (proxy,
+- "ShowDialog",
+- dbus_auth_call_notify_cb,
+- data, NULL,
+- INT_MAX,
+- G_TYPE_STRING, "org.gnome.cpufreqselector",
+- G_TYPE_UINT, data->parent_xid,
+- G_TYPE_INVALID);
+-}
+-
+ static void
+ dbus_set_call_notify_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call,
+@@ -213,12 +133,6 @@ dbus_set_call_notify_cb (DBusGProxy
+ return;
+ }
+
+- if (error->domain == DBUS_GERROR && DBUS_GERROR_REMOTE_EXCEPTION &&
+- dbus_g_error_has_name (error, "org.gnome.CPUFreqSelector.NotAuthorized")) {
+- do_auth_async (data);
+- return;
+- }
+-
+ selector_async_data_free (data);
+ g_warning ("%s", error->message);
+ g_error_free (error);
+@@ -229,13 +143,13 @@ selector_set_frequency_async (SelectorAs
+ {
+ DBusGProxy *proxy;
+ GError *error = NULL;
+-
++
+ if (!cpufreq_selector_connect_to_system_bus (data->selector, &error)) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+
+ selector_async_data_free (data);
+-
++
+ return;
+ }
+
+@@ -243,7 +157,7 @@ selector_set_frequency_async (SelectorAs
+ "org.gnome.CPUFreqSelector",
+ "/org/gnome/cpufreq_selector/selector",
+ "org.gnome.CPUFreqSelector");
+-
++
+ dbus_g_proxy_begin_call_with_timeout (proxy, "SetFrequency",
+ dbus_set_call_notify_cb,
+ data, NULL,
+@@ -321,7 +235,7 @@ cpufreq_selector_set_governor_async (CPU
+
+ selector_set_governor_async (data);
+ }
+-#else /* !HAVE_POLKIT_GNOME */
++#else /* !HAVE_POLKIT */
+ static void
+ cpufreq_selector_run_command (CPUFreqSelector *selector,
+ const gchar *args)
+@@ -372,4 +286,4 @@ cpufreq_selector_set_governor_async (CPU
+ cpufreq_selector_run_command (selector, args);
+ g_free (args);
+ }
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-07-13 01:24:29.712443397 -0400
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -10,7 +256,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
#include <dbus/dbus-glib-lowlevel.h>
#include "cpufreq-selector.h"
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ struct _CPUFreqSelectorService {
DBusGConnection *system_bus;
/* PolicyKit */
@@ -19,7 +265,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
};
struct _CPUFreqSelectorServiceClass {
-@@ -99,9 +99,9 @@
+@@ -99,9 +99,9 @@ cpufreq_selector_service_finalize (GObje
service->selectors_max = -1;
}
@@ -32,7 +278,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
}
G_OBJECT_CLASS (cpufreq_selector_service_parent_class)->finalize (object);
-@@ -153,42 +153,6 @@
+@@ -153,42 +153,6 @@ reset_killtimer (void)
NULL);
}
@@ -75,7 +321,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
gboolean
cpufreq_selector_service_register (CPUFreqSelectorService *service,
GError **error)
-@@ -198,7 +162,6 @@
+@@ -198,7 +162,6 @@ cpufreq_selector_service_register (CPUFr
gboolean res;
guint result;
GError *err = NULL;
@@ -83,7 +329,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
if (service->system_bus) {
g_set_error (error,
-@@ -268,30 +231,7 @@
+@@ -268,30 +231,7 @@ cpufreq_selector_service_register (CPUFr
return FALSE;
}
@@ -115,7 +361,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
service->system_bus = connection;
-@@ -330,62 +270,39 @@
+@@ -330,62 +270,42 @@ cpufreq_selector_service_check_policy (C
DBusGMethodInvocation *context,
GError **error)
{
@@ -125,13 +371,13 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
+ PolkitSubject *subject;
+ PolkitAuthorizationResult *result;
gchar *sender;
- DBusConnection *connection;
+- DBusConnection *connection;
- DBusError dbus_error;
- PolKitError *pk_error = NULL;
+ gboolean ret;
sender = dbus_g_method_get_sender (context);
- connection = dbus_g_connection_get_connection (service->system_bus);
+- connection = dbus_g_connection_get_connection (service->system_bus);
- dbus_error_init (&dbus_error);
- pk_caller = polkit_caller_new_from_dbus_name (connection, sender, &dbus_error);
@@ -143,15 +389,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
- dbus_error.name, dbus_error.message);
- dbus_error_free (&dbus_error);
- g_free (sender);
-+ subject = polkit_system_bus_name_new (sender);
-+ result = polkit_authority_check_authorization_sync (service->authority,
-+ service,
-+ "org.gnome.cpufreqselector",
-+ NULL,
-+ POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-+ NULL, NULL);
-+ g_object_unref (subject);
-
+-
- return FALSE;
- }
- g_free (sender);
@@ -165,40 +403,51 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
- polkit_action_unref (pk_action);
-
- if (polkit_error_is_set (pk_error)) {
-+ if (!polkit_authorization_result_get_is_authorized (result)) {
- g_set_error (error,
- CPUFREQ_SELECTOR_SERVICE_ERROR,
+- g_set_error (error,
+- CPUFREQ_SELECTOR_SERVICE_ERROR,
- SERVICE_ERROR_GENERAL,
- "Could not determine if caller is authorized: %s",
- polkit_error_get_error_message (pk_error));
- polkit_error_free (pk_error);
-+ SERVICE_ERROR_NOT_AUTHORIZED,
-+ "Caller is not authorized");
++ subject = polkit_system_bus_name_new (sender);
++ result = polkit_authority_check_authorization_sync (service->authority,
++ subject,
++ "org.gnome.cpufreqselector",
++ NULL,
++ POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++ NULL, error);
++ g_object_unref (subject);
-- return FALSE;
-+ ret = FALSE;
-+ }
-+ else {
-+ ret = TRUE;
++ if (*error) {
++ g_warning ("check policy: %s", (*error)->message);
+ return FALSE;
}
- if (pk_result != POLKIT_RESULT_YES) {
-- g_set_error (error,
-- CPUFREQ_SELECTOR_SERVICE_ERROR,
-- SERVICE_ERROR_NOT_AUTHORIZED,
++ if (!polkit_authorization_result_get_is_authorized (result)) {
+ g_set_error (error,
+ CPUFREQ_SELECTOR_SERVICE_ERROR,
+ SERVICE_ERROR_NOT_AUTHORIZED,
- "Caller is not authorized: %s",
- polkit_result_to_string_representation (pk_result));
-+ g_object_unref (result);
++ "Caller is not authorized");
- return FALSE;
-- }
++ ret = FALSE;
+ }
-
- return TRUE;
++ else {
++ ret = TRUE;
++ }
++
++ g_object_unref (result);
++
+ return ret;
}
/* D-BUS interface */
-@@ -518,3 +435,43 @@
+@@ -518,3 +438,47 @@ cpufreq_selector_service_set_governor (C
return TRUE;
}
@@ -211,24 +460,26 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
+ PolkitSubject *subject;
+ PolkitAuthorizationResult *result;
+ gchar *sender;
-+ DBusConnection *connection;
+ gboolean ret;
++ GError *error = NULL;
+
+ reset_killtimer ();
+
+ sender = dbus_g_method_get_sender (context);
-+ connection = dbus_g_connection_get_connection (service->system_bus);
-+
+ subject = polkit_system_bus_name_new (sender);
+ result = polkit_authority_check_authorization_sync (service->authority,
-+ service,
++ subject,
+ "org.gnome.cpufreqselector",
+ NULL,
+ 0,
-+ NULL, NULL);
-+ g_object_unref (subject);
++ NULL, &error);
++ g_object_unref (subject);
++ if (error) {
++ dbus_g_method_return_error (context, error);
++ return FALSE;
++ }
+
-+ if (polkit_authorization_result_get_is_authorized (result)) {
++ if (polkit_authorization_result_get_is_authorized (result)) {
+ ret = TRUE;
+ }
+ else if (polkit_authorization_result_get_is_challenge (result)) {
@@ -240,12 +491,14 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
+
+ g_object_unref (result);
+
-+ return ret;
++ dbus_g_method_return (context, ret);
++
++ return TRUE;
+}
-diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
---- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-05-14 23:39:52.716688684 -0400
-@@ -62,6 +62,8 @@
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-07-13 01:24:29.713443245 -0400
+@@ -62,6 +62,8 @@ gboolean cpufreq_selector
guint cpu,
const gchar *governor,
DBusGMethodInvocation *context);
@@ -254,10 +507,10 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
G_END_DECLS
-diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml
---- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-05-14 23:38:41.683938881 -0400
-@@ -13,6 +13,10 @@
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-07-13 01:24:29.714443163 -0400
+@@ -13,6 +13,11 @@
<arg name="cpu" direction="in" type="u"/>
<arg name="governor" direction="in" type="s"/>
</method>
@@ -265,207 +518,38 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-se
+
+ <method name="CanSet">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++ <arg name="result" direction="out" type="b"/>
+ </method>
+
</interface>
</node>
-diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector.c hacked/cpufreq/src/cpufreq-selector.c
---- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector.c 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/cpufreq-selector.c 2009-05-14 23:58:36.989938814 -0400
-@@ -19,19 +19,18 @@
-
- #include <config.h>
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- #include <dbus/dbus-glib.h>
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-
- #include "cpufreq-selector.h"
-
- struct _CPUFreqSelector {
- GObject parent;
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- DBusGConnection *system_bus;
-- DBusGConnection *session_bus;
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
- };
-
- struct _CPUFreqSelectorClass {
-@@ -45,10 +44,9 @@
- {
- CPUFreqSelector *selector = CPUFREQ_SELECTOR (object);
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- selector->system_bus = NULL;
-- selector->session_bus = NULL;
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-
- G_OBJECT_CLASS (cpufreq_selector_parent_class)->finalize (object);
- }
-@@ -77,7 +75,7 @@
- return selector;
- }
-
--#ifdef HAVE_POLKIT_GNOME
-+#ifdef HAVE_POLKIT
- typedef enum {
- FREQUENCY,
- GOVERNOR
-@@ -114,90 +112,12 @@
- {
- if (selector->system_bus)
- return TRUE;
--
-+
- selector->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, error);
-
- return (selector->system_bus != NULL);
- }
-
--static gboolean
--cpufreq_selector_connect_to_session_bus (CPUFreqSelector *selector,
-- GError **error)
--{
-- if (selector->session_bus)
-- return TRUE;
--
-- selector->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, error);
--
-- return (selector->session_bus != NULL);
--}
--
--static void
--dbus_auth_call_notify_cb (DBusGProxy *proxy,
-- DBusGProxyCall *call,
-- gpointer user_data)
--{
-- SelectorAsyncData *data;
-- gboolean gained_privilege;
-- GError *error = NULL;
--
-- data = (SelectorAsyncData *)user_data;
--
-- if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
-- g_warning ("%s", error->message);
-- g_error_free (error);
--
-- selector_async_data_free (data);
--
-- return;
-- }
--
-- if (gained_privilege) {
-- switch (data->call) {
-- case FREQUENCY:
-- selector_set_frequency_async (data);
-- break;
-- case GOVERNOR:
-- selector_set_governor_async (data);
-- break;
-- default:
-- g_assert_not_reached ();
-- }
-- } else {
-- selector_async_data_free (data);
-- }
--}
--
--static void
--do_auth_async (SelectorAsyncData *data)
--{
-- DBusGProxy *proxy;
-- GError *error = NULL;
--
-- if (!cpufreq_selector_connect_to_session_bus (data->selector, &error)) {
-- g_warning ("%s", error->message);
-- g_error_free (error);
--
-- selector_async_data_free (data);
--
-- return;
-- }
--
-- proxy = dbus_g_proxy_new_for_name (data->selector->session_bus,
-- "org.gnome.PolicyKit",
-- "/org/gnome/PolicyKit/Manager",
-- "org.gnome.PolicyKit.Manager");
--
-- dbus_g_proxy_begin_call_with_timeout (proxy,
-- "ShowDialog",
-- dbus_auth_call_notify_cb,
-- data, NULL,
-- INT_MAX,
-- G_TYPE_STRING, "org.gnome.cpufreqselector",
-- G_TYPE_UINT, data->parent_xid,
-- G_TYPE_INVALID);
--}
--
- static void
- dbus_set_call_notify_cb (DBusGProxy *proxy,
- DBusGProxyCall *call,
-@@ -213,12 +133,6 @@
- return;
- }
-
-- if (error->domain == DBUS_GERROR && DBUS_GERROR_REMOTE_EXCEPTION &&
-- dbus_g_error_has_name (error, "org.gnome.CPUFreqSelector.NotAuthorized")) {
-- do_auth_async (data);
-- return;
-- }
--
- selector_async_data_free (data);
- g_warning ("%s", error->message);
- g_error_free (error);
-@@ -229,13 +143,13 @@
- {
- DBusGProxy *proxy;
- GError *error = NULL;
--
-+
- if (!cpufreq_selector_connect_to_system_bus (data->selector, &error)) {
- g_warning ("%s", error->message);
- g_error_free (error);
-
- selector_async_data_free (data);
--
-+
- return;
- }
-
-@@ -243,7 +157,7 @@
- "org.gnome.CPUFreqSelector",
- "/org/gnome/cpufreq_selector/selector",
- "org.gnome.CPUFreqSelector");
--
-+
- dbus_g_proxy_begin_call_with_timeout (proxy, "SetFrequency",
- dbus_set_call_notify_cb,
- data, NULL,
-@@ -321,7 +235,7 @@
-
- selector_set_governor_async (data);
- }
--#else /* !HAVE_POLKIT_GNOME */
-+#else /* !HAVE_POLKIT */
- static void
- cpufreq_selector_run_command (CPUFreqSelector *selector,
- const gchar *args)
-@@ -372,4 +286,4 @@
- cpufreq_selector_run_command (selector, args);
- g_free (args);
- }
--#endif /* HAVE_POLKIT_GNOME */
-+#endif /* HAVE_POLKIT */
-diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/cpufreq-utils.c
---- gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/cpufreq-utils.c 2009-05-15 00:00:16.374688984 -0400
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am.polkit1 2009-07-13 01:30:32.497197598 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/Makefile.am 2009-07-13 01:30:42.876197568 -0400
+@@ -51,7 +51,7 @@ polkit_in_files = org.gnome.cpufreqselec
+
+ dbus_servicesdir = $(datadir)/dbus-1/system-services
+ dbus_confdir = $(sysconfdir)/dbus-1/system.d
+-polkitdir = $(datadir)/PolicyKit/policy
++polkitdir = $(datadir)/polkit-1/actions
+
+ if HAVE_POLKIT
+ BUILT_SOURCES = cpufreq-selector-service-glue.h
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.polkit1 2009-04-18 22:12:10.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in 2009-07-13 01:24:29.715443081 -0400
+@@ -15,7 +15,7 @@
+ <_message>Privileges are required to change the CPU Frequency scaling.</_message>
+ <defaults>
+ <allow_inactive>no</allow_inactive>
+- <allow_active>auth_admin_keep_always</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+
+diff -up gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c.polkit1 gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c
+--- gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/cpufreq-utils.c 2009-07-13 01:24:29.716443139 -0400
@@ -21,13 +21,6 @@
#include <config.h>
@@ -491,7 +575,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/c
guint
cpufreq_utils_get_n_cpus (void)
{
-@@ -108,56 +105,16 @@
+@@ -108,56 +105,16 @@ cpufreq_utils_display_error (const gchar
gtk_widget_show (dialog);
}
@@ -552,7 +636,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/c
if (!system_bus) {
system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-@@ -169,54 +126,19 @@
+@@ -169,54 +126,22 @@ selector_is_available (const gchar *acti
}
}
@@ -576,23 +660,25 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/c
-
- return FALSE;
- }
-- }
--
-- dbus_error_init (&dbus_error);
-- pk_caller = polkit_caller_new_from_pid (dbus_g_connection_get_connection (system_bus),
-- getpid (), &dbus_error);
-- if (!pk_caller) {
-- g_warning ("Cannot get caller from dbus name");
+ proxy = dbus_g_proxy_new_for_name (system_bus,
+ "org.gnome.CPUFreqSelector",
+ "/org/gnome/cpufreq_selector/selector",
+ "org.gnome.CPUFreqSelector");
+
-+ dbus_g_proxy_call (proxy, "CanSet", NULL,
-+ G_TYPE_INVALID,
-+ &result,
-+ G_TYPE_INVALID);
++ if (!dbus_g_proxy_call (proxy, "CanSet", &error,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &result,
++ G_TYPE_INVALID)) {
++ g_warning ("error calling org.gnome.CPUFreqSelector.CanSet: %s", error->message);
++ g_error_free (error);
+ }
+- dbus_error_init (&dbus_error);
+- pk_caller = polkit_caller_new_from_pid (dbus_g_connection_get_connection (system_bus),
+- getpid (), &dbus_error);
+- if (!pk_caller) {
+- g_warning ("Cannot get caller from dbus name");
+-
- return FALSE;
- }
-
@@ -618,7 +704,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/c
}
gboolean
-@@ -228,13 +150,13 @@
+@@ -228,13 +153,13 @@ cpufreq_utils_selector_is_available (voi
time (&now);
if (ABS (now - last_refreshed) > CACHE_VALIDITY_SEC) {
@@ -634,10 +720,10 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/c
gboolean
cpufreq_utils_selector_is_available (void)
{
-diff -u -r gnome-applets-2.26.1/cpufreq/src/Makefile.am hacked/cpufreq/src/Makefile.am
---- gnome-applets-2.26.1/cpufreq/src/Makefile.am 2009-03-16 19:39:11.000000000 -0400
-+++ hacked/cpufreq/src/Makefile.am 2009-05-14 23:14:18.926939010 -0400
-@@ -9,10 +9,6 @@
+diff -up gnome-applets-2.27.3/cpufreq/src/Makefile.am.polkit1 gnome-applets-2.27.3/cpufreq/src/Makefile.am
+--- gnome-applets-2.27.3/cpufreq/src/Makefile.am.polkit1 2009-06-16 21:43:08.000000000 -0400
++++ gnome-applets-2.27.3/cpufreq/src/Makefile.am 2009-07-13 01:24:29.717442917 -0400
+@@ -9,10 +9,6 @@ INCLUDES = \
$(GNOME_LIBS2_CFLAGS) \
$(LIBGLADE_CFLAGS)
@@ -648,7 +734,7 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/Makefile.am hacked/cpufreq/src/Makef
libexec_PROGRAMS = cpufreq-applet
if HAVE_LIBCPUFREQ
-@@ -38,8 +34,4 @@
+@@ -38,8 +34,4 @@ cpufreq_applet_LDADD = \
$(LIBGLADE_LIBS) \
$(LIBCPUFREQ_LIBS)
@@ -657,54 +743,3 @@ diff -u -r gnome-applets-2.26.1/cpufreq/src/Makefile.am hacked/cpufreq/src/Makef
-endif
-
---- gnome-applets-2.26.1/configure.in 2009-05-15 00:01:14.206719170 -0400
-+++ hacked/configure.in 2009-05-14 23:13:29.129939391 -0400
-@@ -35,7 +35,7 @@
- GWEATHER_REQUIRED=2.22.1
- GUCHARMAP2_REQUIRED=2.23.0
- GUCHARMAP_REQUIRED=1.4.0
--POLKIT_REQUIRED=0.7
-+POLKIT_REQUIRED=0.92
- NETWORKMANAGER_REQUIRED=0.7
- GST10_REQUIRED=0.10.2
- dnl ***************************************************************************
-@@ -217,7 +217,7 @@
- enable_polkit=$enableval,
- enable_polkit=auto)
- if test "x$enable_polkit" != "xno"; then
-- PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
-+ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
- if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno"; then
- AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
- fi
-@@ -233,22 +233,6 @@
- AC_SUBST(POLKIT_CFLAGS)
- AC_SUBST(POLKIT_LIBS)
-
--POLKIT_GNOME_CFLAGS=
--POLKIT_GNOME_LIBS=
--polkit_gnome=no
--if test "x$enable_polkit" != "xno"; then
-- PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
-- if test "x$enable_polkit" = "xyes" -a "x$polkit_gnome" = "xno"; then
-- AC_MSG_ERROR([PolicyKit-gnome support explicitly requested but dependencies not found])
-- fi
--fi
--if test "x$polkit_gnome" = "xyes"; then
-- AC_DEFINE(HAVE_POLKIT_GNOME, [1], [PolicyKit-gnome available])
--fi
--AM_CONDITIONAL(HAVE_POLKIT_GNOME, test "x$polkit_gnome" = "xyes")
--AC_SUBST(POLKIT_GNOME_CFLAGS)
--AC_SUBST(POLKIT_GNOME_LIBS)
--
-
- dnl -- check for libhal (optional) --------------------------------------------
- HAL_CFLAGS=
-@@ -797,7 +781,6 @@
- - cpufreq $build_cpufreq_applet
- - building selector $enable_selector
- - using PolicyKit $HAVE_POLKIT
-- - using PolicyKit-gnome $polkit_gnome
- - enabling suid bit $suid
- - drivemount always
- - geyes always
commit 8da13d97b3b866d1d56868e47ddf5c87e0ce591b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 1 12:39:54 2009 +0000
2.27.3
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aa176b7..d9c5dbb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -11,7 +11,7 @@
%define gstreamer_version 0.10.14
%define gstreamer_plugins_version 0.10.14
%define gstreamer_plugins_good_version 0.10.6
-%define libxklavier_version 3.4
+%define libxklavier_version 4.0
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.11.1
%define gnome_utils_version 2.8.1
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -349,6 +349,9 @@ fi
%changelog
+* Tue Jun 30 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-3
+- Rebuild against new libxklavier
+
* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-2
- Drop sticky notes, now that we have gnotes
commit 744f63e19dc9b9ef56d0705111441f5c898524e8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 18 00:25:20 2009 +0000
forgotten patch
diff --git a/stickynotes-null.patch b/stickynotes-null.patch
new file mode 100644
index 0000000..3be27f9
--- /dev/null
+++ b/stickynotes-null.patch
@@ -0,0 +1,57 @@
+diff -up gnome-applets-2.27.3/Makefile.am.stickynotes-null gnome-applets-2.27.3/Makefile.am
+--- gnome-applets-2.27.3/Makefile.am.stickynotes-null 2009-06-03 21:38:36.000000000 -0400
++++ gnome-applets-2.27.3/Makefile.am 2009-06-17 14:53:55.169810518 -0400
+@@ -46,7 +46,6 @@ always_built_SUBDIRS = \
+ geyes \
+ mini-commander \
+ gkb-new \
+- stickynotes \
+ trashapplet \
+ null_applet
+
+diff -up /dev/null gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in
+--- /dev/null 2009-06-17 09:23:25.885275610 -0400
++++ gnome-applets-2.27.3/null_applet/GNOME_StickyNotesApplet.server.in 2009-06-17 15:04:20.931811206 -0400
+@@ -0,0 +1,17 @@
++<?xml version="1.0"?>
++<oaf_info>
++ <oaf_server iid="OAFIID:GNOME_StickyNotesApplet" type="factory" location="OAFIID:GNOME_NullApplet_Factory">
++ <oaf_attribute name="repo_ids" type="stringv">
++ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++ <item value="IDL:Bonobo/Control:1.0"/>
++ <item value="IDL:Bonobo/Unknown:1.0"/>
++ </oaf_attribute>
++ <oaf_attribute name="name" type="string" _value="Sticky Notes (Deprecated)"/>
++ <oaf_attribute name="description" type="string" _value="Create, view, and manage sticky notes on the desktop"/>
++ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="stickynotes"/>
++ <oaf_attribute name="bugzilla:other_binaries" type="string" value="stickynotes_applet"/>
++ </oaf_server>
++</oaf_info>
++
+diff -up gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null gnome-applets-2.27.3/null_applet/Makefile.am
+--- gnome-applets-2.27.3/null_applet/Makefile.am.stickynotes-null 2009-06-17 14:53:55.151807673 -0400
++++ gnome-applets-2.27.3/null_applet/Makefile.am 2009-06-17 14:53:55.171812401 -0400
+@@ -23,6 +23,7 @@ server_in_files = \
+ GNOME_NullApplet_Factory.server.in \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
++ GNOME_StickyNotesApplet.server.in \
+ $(battstat_applet) \
+ $(mixer_server_in)
+ server_DATA = $(server_in_files:.server.in=.server)
+diff -up gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null gnome-applets-2.27.3/null_applet/null_applet.c
+--- gnome-applets-2.27.3/null_applet/null_applet.c.stickynotes-null 2009-06-17 14:53:55.152817798 -0400
++++ gnome-applets-2.27.3/null_applet/null_applet.c 2009-06-17 14:53:55.173825460 -0400
+@@ -45,7 +45,9 @@ insert_oafiids (GHashTable *hash_table)
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_MixerApplet", _("Volume Control"));
+ g_hash_table_insert (hash_table,
+- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
++ "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor"));
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_StickyNotesApplet", _("Sticky Notes"));
+ }
+
+ static gboolean already_running;
commit a0cf39fec6e8d2ec9a3df7fe3b4c0ede51009213
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 18 00:19:17 2009 +0000
drop sticky notes
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 081f9a3..aa176b7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,12 +29,12 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define build_stickynotes 1
+%define build_stickynotes 0
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -59,6 +59,8 @@ Patch35: modemlights-libgnome.patch
Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
+# do the nullapplet dance for stickynotes
+Patch42: stickynotes-null.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=499972
Patch43: polkit1.patch
@@ -144,6 +146,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .stickynotes-null
%patch43 -p1 -b .polkit1
# We don't ship gnome-system-tools
@@ -346,6 +349,9 @@ fi
%changelog
+* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-2
+- Drop sticky notes, now that we have gnotes
+
* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-1
- Update to 2.27.3
commit 8f5fbd5b26c6c32fbbbee76a47a356cd1a5137f9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 17 17:56:33 2009 +0000
2.27.3
diff --git a/.cvsignore b/.cvsignore
index a33ff22..c246b14 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.2.tar.bz2
+gnome-applets-2.27.3.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a38ae69..081f9a3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.2
-Release: 3%{?dist}
+Version: 2.27.3
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -60,9 +60,6 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=579098
-Patch42: gweather-network.patch
-
# https://bugzilla.redhat.com/show_bug.cgi?id=499972
Patch43: polkit1.patch
@@ -147,7 +144,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .network
%patch43 -p1 -b .polkit1
# We don't ship gnome-system-tools
@@ -350,6 +346,9 @@ fi
%changelog
+* Wed Jun 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.3-1
+- Update to 2.27.3
+
* Sat Jun 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-3
- Drop unneeded direct dependencies
diff --git a/sources b/sources
index 1953895..ca7210f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-cd5a40a854002de62018cc1b86b9071c gnome-applets-2.27.2.tar.bz2
+04ce905d42f1e1d3c472b28463443dda gnome-applets-2.27.3.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-
commit 51f22fb5afdd59e1602e5100dcd787c21683ad22
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jun 13 04:12:26 2009 +0000
drop unneeded direct deps
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 14c3a7e..a38ae69 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,7 +3,6 @@
%define gtk2_version 2.6.0
%define libgnome_version 2.8.0
%define libgnomeui_version 2.8.0
-%define gnome_vfs_version 2.15.4
%define libglade_version 2.4.0
%define gnome_panel_version 2.20.1-5
%define libgtop2_version 2.12.0
@@ -35,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -71,7 +70,6 @@ BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: libgnome-devel >= %{libgnome_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version}
BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
BuildRequires: libglade2-devel >= %{libglade_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
@@ -174,6 +172,11 @@ autoreconf
--disable-scrollkeeper \
--enable-mini-commander \
--enable-gtk-doc
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
make
# strip unneeded translations from .mo files
@@ -347,6 +350,9 @@ fi
%changelog
+* Sat Jun 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-3
+- Drop unneeded direct dependencies
+
* Wed Jun 10 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-2
- Port to PolicyKit 1
commit 24df035335633957c64fcf198ea7b733e61de61a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 10 04:51:27 2009 +0000
Port to PolicyKit 1
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9a9047b..14c3a7e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -150,6 +150,7 @@ and more.
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
%patch42 -p1 -b .network
+%patch43 -p1 -b .polkit1
# We don't ship gnome-system-tools
rm -rf modemlights
diff --git a/polkit1.patch b/polkit1.patch
new file mode 100644
index 0000000..2b6ac8e
--- /dev/null
+++ b/polkit1.patch
@@ -0,0 +1,710 @@
+diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
+--- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-05-14 23:45:38.384939252 -0400
+@@ -17,7 +17,7 @@
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#include <polkit-dbus/polkit-dbus.h>
++#include <polkit/polkit.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+ #include "cpufreq-selector.h"
+@@ -37,7 +37,7 @@
+ DBusGConnection *system_bus;
+
+ /* PolicyKit */
+- PolKitContext *pk_context;
++ PolkitAuthority *authority;
+ };
+
+ struct _CPUFreqSelectorServiceClass {
+@@ -99,9 +99,9 @@
+ service->selectors_max = -1;
+ }
+
+- if (service->pk_context) {
+- polkit_context_unref (service->pk_context);
+- service->pk_context = NULL;
++ if (service->authority) {
++ g_object_unref (service->authority);
++ service->authority = NULL;
+ }
+
+ G_OBJECT_CLASS (cpufreq_selector_service_parent_class)->finalize (object);
+@@ -153,42 +153,6 @@
+ NULL);
+ }
+
+-static gboolean
+-pk_io_watch_have_data (GIOChannel *channel,
+- GIOCondition condition,
+- PolKitContext *pk_context)
+-{
+- polkit_context_io_func (pk_context,
+- g_io_channel_unix_get_fd (channel));
+- return TRUE;
+-}
+-
+-static int
+-pk_add_io_watch (PolKitContext *pk_context,
+- int watch_id)
+-{
+- GIOChannel *channel;
+- guint id = 0;
+-
+- channel = g_io_channel_unix_new (watch_id);
+- if (!channel)
+- return 0;
+-
+- id = g_io_add_watch (channel, G_IO_IN,
+- (GIOFunc)pk_io_watch_have_data,
+- pk_context);
+- g_io_channel_unref (channel);
+-
+- return id;
+-}
+-
+-static void
+-pk_remove_io_watch (PolKitContext *pk_context,
+- int watch_id)
+-{
+- g_source_remove (watch_id);
+-}
+-
+ gboolean
+ cpufreq_selector_service_register (CPUFreqSelectorService *service,
+ GError **error)
+@@ -198,7 +162,6 @@
+ gboolean res;
+ guint result;
+ GError *err = NULL;
+- PolKitError *pk_err = NULL;
+
+ if (service->system_bus) {
+ g_set_error (error,
+@@ -268,30 +231,7 @@
+ return FALSE;
+ }
+
+- service->pk_context = polkit_context_new ();
+- polkit_context_set_io_watch_functions (service->pk_context,
+- pk_add_io_watch,
+- pk_remove_io_watch);
+- if (!polkit_context_init (service->pk_context, &pk_err)) {
+- polkit_context_unref (service->pk_context);
+- service->pk_context = NULL;
+-
+- if (polkit_error_is_set (pk_err)) {
+- g_set_error (error,
+- CPUFREQ_SELECTOR_SERVICE_ERROR,
+- SERVICE_ERROR_GENERAL,
+- "Cannot initialize libpolkit: %s",
+- polkit_error_get_error_message (pk_err));
+- polkit_error_free (pk_err);
+- } else {
+- g_set_error (error,
+- CPUFREQ_SELECTOR_SERVICE_ERROR,
+- SERVICE_ERROR_GENERAL,
+- "Cannot initialize libpolkit");
+- }
+-
+- return FALSE;
+- }
++ service->authority = polkit_authority_get ();
+
+ service->system_bus = connection;
+
+@@ -330,62 +270,39 @@
+ DBusGMethodInvocation *context,
+ GError **error)
+ {
+- PolKitAction *pk_action;
+- PolKitCaller *pk_caller;
+- PolKitResult pk_result;
++ PolkitSubject *subject;
++ PolkitAuthorizationResult *result;
+ gchar *sender;
+ DBusConnection *connection;
+- DBusError dbus_error;
+- PolKitError *pk_error = NULL;
++ gboolean ret;
+
+ sender = dbus_g_method_get_sender (context);
+ connection = dbus_g_connection_get_connection (service->system_bus);
+
+- dbus_error_init (&dbus_error);
+- pk_caller = polkit_caller_new_from_dbus_name (connection, sender, &dbus_error);
+- if (!pk_caller) {
+- g_set_error (error,
+- CPUFREQ_SELECTOR_SERVICE_ERROR,
+- SERVICE_ERROR_DBUS,
+- "Error getting information about caller: %s: %s",
+- dbus_error.name, dbus_error.message);
+- dbus_error_free (&dbus_error);
+- g_free (sender);
++ subject = polkit_system_bus_name_new (sender);
++ result = polkit_authority_check_authorization_sync (service->authority,
++ service,
++ "org.gnome.cpufreqselector",
++ NULL,
++ POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++ NULL, NULL);
++ g_object_unref (subject);
+
+- return FALSE;
+- }
+- g_free (sender);
+-
+- pk_action = polkit_action_new ();
+- polkit_action_set_action_id (pk_action, "org.gnome.cpufreqselector");
+- pk_result = polkit_context_is_caller_authorized (service->pk_context,
+- pk_action, pk_caller,
+- TRUE, &pk_error);
+- polkit_caller_unref (pk_caller);
+- polkit_action_unref (pk_action);
+-
+- if (polkit_error_is_set (pk_error)) {
++ if (!polkit_authorization_result_get_is_authorized (result)) {
+ g_set_error (error,
+ CPUFREQ_SELECTOR_SERVICE_ERROR,
+- SERVICE_ERROR_GENERAL,
+- "Could not determine if caller is authorized: %s",
+- polkit_error_get_error_message (pk_error));
+- polkit_error_free (pk_error);
++ SERVICE_ERROR_NOT_AUTHORIZED,
++ "Caller is not authorized");
+
+- return FALSE;
++ ret = FALSE;
++ }
++ else {
++ ret = TRUE;
+ }
+
+- if (pk_result != POLKIT_RESULT_YES) {
+- g_set_error (error,
+- CPUFREQ_SELECTOR_SERVICE_ERROR,
+- SERVICE_ERROR_NOT_AUTHORIZED,
+- "Caller is not authorized: %s",
+- polkit_result_to_string_representation (pk_result));
++ g_object_unref (result);
+
+- return FALSE;
+- }
+-
+- return TRUE;
++ return ret;
+ }
+
+ /* D-BUS interface */
+@@ -518,3 +435,43 @@
+
+ return TRUE;
+ }
++
++
++gboolean
++cpufreq_selector_service_can_set (CPUFreqSelectorService *service,
++ DBusGMethodInvocation *context)
++{
++ PolkitSubject *subject;
++ PolkitAuthorizationResult *result;
++ gchar *sender;
++ DBusConnection *connection;
++ gboolean ret;
++
++ reset_killtimer ();
++
++ sender = dbus_g_method_get_sender (context);
++ connection = dbus_g_connection_get_connection (service->system_bus);
++
++ subject = polkit_system_bus_name_new (sender);
++ result = polkit_authority_check_authorization_sync (service->authority,
++ service,
++ "org.gnome.cpufreqselector",
++ NULL,
++ 0,
++ NULL, NULL);
++ g_object_unref (subject);
++
++ if (polkit_authorization_result_get_is_authorized (result)) {
++ ret = TRUE;
++ }
++ else if (polkit_authorization_result_get_is_challenge (result)) {
++ ret = TRUE;
++ }
++ else {
++ ret = FALSE;
++ }
++
++ g_object_unref (result);
++
++ return ret;
++}
+diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h
+--- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.h 2009-05-14 23:39:52.716688684 -0400
+@@ -62,6 +62,8 @@
+ guint cpu,
+ const gchar *governor,
+ DBusGMethodInvocation *context);
++gboolean cpufreq_selector_service_can_set (CPUFreqSelectorService *service,
++ DBusGMethodInvocation *context);
+
+ G_END_DECLS
+
+diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml
+--- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/cpufreq-selector/cpufreq-selector-service.xml 2009-05-14 23:38:41.683938881 -0400
+@@ -13,6 +13,10 @@
+ <arg name="cpu" direction="in" type="u"/>
+ <arg name="governor" direction="in" type="s"/>
+ </method>
+-
++
++ <method name="CanSet">
++ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++ </method>
++
+ </interface>
+ </node>
+diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-selector.c hacked/cpufreq/src/cpufreq-selector.c
+--- gnome-applets-2.26.1/cpufreq/src/cpufreq-selector.c 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/cpufreq-selector.c 2009-05-14 23:58:36.989938814 -0400
+@@ -19,19 +19,18 @@
+
+ #include <config.h>
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ #include <dbus/dbus-glib.h>
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+
+ #include "cpufreq-selector.h"
+
+ struct _CPUFreqSelector {
+ GObject parent;
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ DBusGConnection *system_bus;
+- DBusGConnection *session_bus;
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+ };
+
+ struct _CPUFreqSelectorClass {
+@@ -45,10 +44,9 @@
+ {
+ CPUFreqSelector *selector = CPUFREQ_SELECTOR (object);
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ selector->system_bus = NULL;
+- selector->session_bus = NULL;
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+
+ G_OBJECT_CLASS (cpufreq_selector_parent_class)->finalize (object);
+ }
+@@ -77,7 +75,7 @@
+ return selector;
+ }
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ typedef enum {
+ FREQUENCY,
+ GOVERNOR
+@@ -114,90 +112,12 @@
+ {
+ if (selector->system_bus)
+ return TRUE;
+-
++
+ selector->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, error);
+
+ return (selector->system_bus != NULL);
+ }
+
+-static gboolean
+-cpufreq_selector_connect_to_session_bus (CPUFreqSelector *selector,
+- GError **error)
+-{
+- if (selector->session_bus)
+- return TRUE;
+-
+- selector->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, error);
+-
+- return (selector->session_bus != NULL);
+-}
+-
+-static void
+-dbus_auth_call_notify_cb (DBusGProxy *proxy,
+- DBusGProxyCall *call,
+- gpointer user_data)
+-{
+- SelectorAsyncData *data;
+- gboolean gained_privilege;
+- GError *error = NULL;
+-
+- data = (SelectorAsyncData *)user_data;
+-
+- if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
+- g_warning ("%s", error->message);
+- g_error_free (error);
+-
+- selector_async_data_free (data);
+-
+- return;
+- }
+-
+- if (gained_privilege) {
+- switch (data->call) {
+- case FREQUENCY:
+- selector_set_frequency_async (data);
+- break;
+- case GOVERNOR:
+- selector_set_governor_async (data);
+- break;
+- default:
+- g_assert_not_reached ();
+- }
+- } else {
+- selector_async_data_free (data);
+- }
+-}
+-
+-static void
+-do_auth_async (SelectorAsyncData *data)
+-{
+- DBusGProxy *proxy;
+- GError *error = NULL;
+-
+- if (!cpufreq_selector_connect_to_session_bus (data->selector, &error)) {
+- g_warning ("%s", error->message);
+- g_error_free (error);
+-
+- selector_async_data_free (data);
+-
+- return;
+- }
+-
+- proxy = dbus_g_proxy_new_for_name (data->selector->session_bus,
+- "org.gnome.PolicyKit",
+- "/org/gnome/PolicyKit/Manager",
+- "org.gnome.PolicyKit.Manager");
+-
+- dbus_g_proxy_begin_call_with_timeout (proxy,
+- "ShowDialog",
+- dbus_auth_call_notify_cb,
+- data, NULL,
+- INT_MAX,
+- G_TYPE_STRING, "org.gnome.cpufreqselector",
+- G_TYPE_UINT, data->parent_xid,
+- G_TYPE_INVALID);
+-}
+-
+ static void
+ dbus_set_call_notify_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call,
+@@ -213,12 +133,6 @@
+ return;
+ }
+
+- if (error->domain == DBUS_GERROR && DBUS_GERROR_REMOTE_EXCEPTION &&
+- dbus_g_error_has_name (error, "org.gnome.CPUFreqSelector.NotAuthorized")) {
+- do_auth_async (data);
+- return;
+- }
+-
+ selector_async_data_free (data);
+ g_warning ("%s", error->message);
+ g_error_free (error);
+@@ -229,13 +143,13 @@
+ {
+ DBusGProxy *proxy;
+ GError *error = NULL;
+-
++
+ if (!cpufreq_selector_connect_to_system_bus (data->selector, &error)) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+
+ selector_async_data_free (data);
+-
++
+ return;
+ }
+
+@@ -243,7 +157,7 @@
+ "org.gnome.CPUFreqSelector",
+ "/org/gnome/cpufreq_selector/selector",
+ "org.gnome.CPUFreqSelector");
+-
++
+ dbus_g_proxy_begin_call_with_timeout (proxy, "SetFrequency",
+ dbus_set_call_notify_cb,
+ data, NULL,
+@@ -321,7 +235,7 @@
+
+ selector_set_governor_async (data);
+ }
+-#else /* !HAVE_POLKIT_GNOME */
++#else /* !HAVE_POLKIT */
+ static void
+ cpufreq_selector_run_command (CPUFreqSelector *selector,
+ const gchar *args)
+@@ -372,4 +286,4 @@
+ cpufreq_selector_run_command (selector, args);
+ g_free (args);
+ }
+-#endif /* HAVE_POLKIT_GNOME */
++#endif /* HAVE_POLKIT */
+diff -u -r gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c hacked/cpufreq/src/cpufreq-utils.c
+--- gnome-applets-2.26.1/cpufreq/src/cpufreq-utils.c 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/cpufreq-utils.c 2009-05-15 00:00:16.374688984 -0400
+@@ -21,13 +21,6 @@
+
+ #include <config.h>
+
+-#ifdef HAVE_POLKIT_GNOME
+-#include <dbus/dbus-glib.h>
+-#include <dbus/dbus-glib-lowlevel.h>
+-#include <polkit/polkit.h>
+-#include <polkit-dbus/polkit-dbus.h>
+-#endif
+-
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ #include <sys/types.h>
+@@ -39,6 +32,10 @@
+
+ #include "cpufreq-utils.h"
+
++#ifdef HAVE_POLKIT
++#include <dbus/dbus-glib.h>
++#endif /* HAVE_POLKIT */
++
+ guint
+ cpufreq_utils_get_n_cpus (void)
+ {
+@@ -108,56 +105,16 @@
+ gtk_widget_show (dialog);
+ }
+
+-#ifdef HAVE_POLKIT_GNOME
++#ifdef HAVE_POLKIT
+ #define CACHE_VALIDITY_SEC 2
+
+ static gboolean
+-pk_io_watch_have_data (GIOChannel *channel,
+- GIOCondition condition,
+- PolKitContext *pk_context)
+-{
+- polkit_context_io_func (pk_context,
+- g_io_channel_unix_get_fd (channel));
+- return TRUE;
+-}
+-
+-static int
+-pk_add_io_watch (PolKitContext *pk_context,
+- int watch_id)
+-{
+- GIOChannel *channel;
+- guint id = 0;
+-
+- channel = g_io_channel_unix_new (watch_id);
+- if (!channel)
+- return 0;
+-
+- id = g_io_add_watch (channel, G_IO_IN,
+- (GIOFunc)pk_io_watch_have_data,
+- pk_context);
+- g_io_channel_unref (channel);
+-
+- return id;
+-}
+-
+-static void
+-pk_remove_io_watch (PolKitContext *pk_context,
+- int watch_id)
+-{
+- g_source_remove (watch_id);
+-}
+-
+-static gboolean
+-selector_is_available (const gchar *action)
++selector_is_available (void)
+ {
++ DBusGProxy *proxy;
+ static DBusGConnection *system_bus = NULL;
+- static PolKitContext *pk_context = NULL;
+- PolKitCaller *pk_caller;
+- PolKitAction *pk_action;
+- PolKitResult pk_result;
+- PolKitError *pk_error = NULL;
+ GError *error = NULL;
+- DBusError dbus_error;
++ gboolean result;
+
+ if (!system_bus) {
+ system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+@@ -169,54 +126,19 @@
+ }
+ }
+
+- if (!pk_context) {
+- PolKitError *pk_error = NULL;
+-
+- pk_context = polkit_context_new ();
+- polkit_context_set_io_watch_functions (pk_context,
+- pk_add_io_watch,
+- pk_remove_io_watch);
+- if (!polkit_context_init (pk_context, &pk_error)) {
+- polkit_context_unref (pk_context);
+- pk_context = NULL;
+-
+- if (polkit_error_is_set (pk_error)) {
+- g_warning ("%s", polkit_error_get_error_message (pk_error));
+- polkit_error_free (pk_error);
+- } else {
+- g_warning ("Cannot initialize libpolkit");
+- }
+-
+- return FALSE;
+- }
+- }
+-
+- dbus_error_init (&dbus_error);
+- pk_caller = polkit_caller_new_from_pid (dbus_g_connection_get_connection (system_bus),
+- getpid (), &dbus_error);
+- if (!pk_caller) {
+- g_warning ("Cannot get caller from dbus name");
++ proxy = dbus_g_proxy_new_for_name (system_bus,
++ "org.gnome.CPUFreqSelector",
++ "/org/gnome/cpufreq_selector/selector",
++ "org.gnome.CPUFreqSelector");
++
++ dbus_g_proxy_call (proxy, "CanSet", NULL,
++ G_TYPE_INVALID,
++ &result,
++ G_TYPE_INVALID);
+
+- return FALSE;
+- }
+-
+- pk_action = polkit_action_new ();
+- polkit_action_set_action_id (pk_action, action);
+- pk_result = polkit_context_is_caller_authorized (pk_context,
+- pk_action, pk_caller,
+- FALSE, &pk_error);
+-
+- polkit_caller_unref (pk_caller);
+- polkit_action_unref (pk_action);
+-
+- if (polkit_error_is_set (pk_error)) {
+- g_warning ("%s", polkit_error_get_error_message (pk_error));
+- polkit_error_free (pk_error);
+-
+- return FALSE;
+- }
++ g_object_unref (proxy);
+
+- return !(pk_result == POLKIT_RESULT_UNKNOWN || pk_result == POLKIT_RESULT_NO);
++ return result;
+ }
+
+ gboolean
+@@ -228,13 +150,13 @@
+
+ time (&now);
+ if (ABS (now - last_refreshed) > CACHE_VALIDITY_SEC) {
+- cache = selector_is_available ("org.gnome.cpufreqselector");
++ cache = selector_is_available ();
+ last_refreshed = now;
+ }
+
+ return cache;
+ }
+-#else /* !HAVE_POLKIT_GNOME */
++#else /* !HAVE_POLKIT */
+ gboolean
+ cpufreq_utils_selector_is_available (void)
+ {
+diff -u -r gnome-applets-2.26.1/cpufreq/src/Makefile.am hacked/cpufreq/src/Makefile.am
+--- gnome-applets-2.26.1/cpufreq/src/Makefile.am 2009-03-16 19:39:11.000000000 -0400
++++ hacked/cpufreq/src/Makefile.am 2009-05-14 23:14:18.926939010 -0400
+@@ -9,10 +9,6 @@
+ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBGLADE_CFLAGS)
+
+-if HAVE_POLKIT_GNOME
+-INCLUDES += $(POLKIT_GNOME_CFLAGS)
+-endif
+-
+ libexec_PROGRAMS = cpufreq-applet
+
+ if HAVE_LIBCPUFREQ
+@@ -38,8 +34,4 @@
+ $(LIBGLADE_LIBS) \
+ $(LIBCPUFREQ_LIBS)
+
+-if HAVE_POLKIT_GNOME
+-cpufreq_applet_LDADD += $(POLKIT_GNOME_LIBS)
+-endif
+-
+
+--- gnome-applets-2.26.1/configure.in 2009-05-15 00:01:14.206719170 -0400
++++ hacked/configure.in 2009-05-14 23:13:29.129939391 -0400
+@@ -35,7 +35,7 @@
+ GWEATHER_REQUIRED=2.22.1
+ GUCHARMAP2_REQUIRED=2.23.0
+ GUCHARMAP_REQUIRED=1.4.0
+-POLKIT_REQUIRED=0.7
++POLKIT_REQUIRED=0.92
+ NETWORKMANAGER_REQUIRED=0.7
+ GST10_REQUIRED=0.10.2
+ dnl ***************************************************************************
+@@ -217,7 +217,7 @@
+ enable_polkit=$enableval,
+ enable_polkit=auto)
+ if test "x$enable_polkit" != "xno"; then
+- PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
++ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
+ if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno"; then
+ AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
+ fi
+@@ -233,22 +233,6 @@
+ AC_SUBST(POLKIT_CFLAGS)
+ AC_SUBST(POLKIT_LIBS)
+
+-POLKIT_GNOME_CFLAGS=
+-POLKIT_GNOME_LIBS=
+-polkit_gnome=no
+-if test "x$enable_polkit" != "xno"; then
+- PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
+- if test "x$enable_polkit" = "xyes" -a "x$polkit_gnome" = "xno"; then
+- AC_MSG_ERROR([PolicyKit-gnome support explicitly requested but dependencies not found])
+- fi
+-fi
+-if test "x$polkit_gnome" = "xyes"; then
+- AC_DEFINE(HAVE_POLKIT_GNOME, [1], [PolicyKit-gnome available])
+-fi
+-AM_CONDITIONAL(HAVE_POLKIT_GNOME, test "x$polkit_gnome" = "xyes")
+-AC_SUBST(POLKIT_GNOME_CFLAGS)
+-AC_SUBST(POLKIT_GNOME_LIBS)
+-
+
+ dnl -- check for libhal (optional) --------------------------------------------
+ HAL_CFLAGS=
+@@ -797,7 +781,6 @@
+ - cpufreq $build_cpufreq_applet
+ - building selector $enable_selector
+ - using PolicyKit $HAVE_POLKIT
+- - using PolicyKit-gnome $polkit_gnome
+ - enabling suid bit $suid
+ - drivemount always
+ - geyes always
commit ffabef5b958d22cc7acd5b15b7163810e240e3e3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 10 04:30:35 2009 +0000
Port to PolicyKit 1
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3b158c3..9a9047b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.27.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch41: gnome-applets-no-mixer-icon.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=579098
Patch42: gweather-network.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=499972
+Patch43: polkit1.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -105,7 +108,7 @@ BuildRequires: NetworkManager-devel
BuildRequires: libgweather-devel >= 2.22.1
# For cpufreq
BuildRequires: dbus-devel
-BuildRequires: PolicyKit-devel
+BuildRequires: polkit-devel >= 0.92
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -343,6 +346,9 @@ fi
%changelog
+* Wed Jun 10 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-2
+- Port to PolicyKit 1
+
* Sun May 31 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-1
- Update to 2.27.2
- http://download.gnome.org/sources/gnome-applets/2.27/gnome-applets-2.27.2.n…
commit 4adafd32f479497485d7cde44fa22b13c039a217
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun May 31 21:52:42 2009 +0000
2.27.2
diff --git a/.cvsignore b/.cvsignore
index a7d5536..a33ff22 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.27.1.tar.bz2
+gnome-applets-2.27.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b6aa3b3..3b158c3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.27.1
+Version: 2.27.2
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -343,6 +343,10 @@ fi
%changelog
+* Sun May 31 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.27.2-1
+- Update to 2.27.2
+- http://download.gnome.org/sources/gnome-applets/2.27/gnome-applets-2.27.2.n…
+
* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
- Don't drop schemas translations from po files
diff --git a/sources b/sources
index f1be7a9..1953895 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-8291b10c1fee953dbb2085168145675d gnome-applets-2.27.1.tar.bz2
+cd5a40a854002de62018cc1b86b9071c gnome-applets-2.27.2.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+
commit c4a52893d3c89544f00e966715cb42b14b8a6fae
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat May 16 03:33:08 2009 +0000
fix file list
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d1321e1..b6aa3b3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -169,6 +169,7 @@ autoreconf
--disable-battstat \
--disable-scrollkeeper \
--enable-mini-commander \
+ --enable-gtk-doc
make
# strip unneeded translations from .mo files
@@ -336,6 +337,10 @@ fi
%{_libexecdir}/trashapplet
%{_libexecdir}/invest-applet
%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
+%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
+%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+
%changelog
* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
commit a0b0acc45aeec05104a2f5d0bebda33d390abcfd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat May 16 02:23:41 2009 +0000
2.27.1
diff --git a/.cvsignore b/.cvsignore
index 7be9bc8..a7d5536 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.26.1.tar.bz2
+gnome-applets-2.27.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c91abcd..d1321e1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.26.1
-Release: 3%{?dist}
+Version: 2.27.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,7 +105,7 @@ BuildRequires: NetworkManager-devel
BuildRequires: libgweather-devel >= 2.22.1
# For cpufreq
BuildRequires: dbus-devel
-BuildRequires: PolicyKit-gnome-devel
+BuildRequires: PolicyKit-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -113,7 +113,6 @@ Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
Requires: dbus >= %{dbus_version}
-Requires: PolicyKit
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
@@ -169,7 +168,7 @@ autoreconf
%endif
--disable-battstat \
--disable-scrollkeeper \
- --enable-mini-commander
+ --enable-mini-commander \
make
# strip unneeded translations from .mo files
@@ -337,9 +336,6 @@ fi
%{_libexecdir}/trashapplet
%{_libexecdir}/invest-applet
%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
-%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
-%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
diff --git a/sources b/sources
index ea4dc2a..f1be7a9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ef6c44bba892d28b46cf19fcb2e71d61 gnome-applets-2.26.1.tar.bz2
+8291b10c1fee953dbb2085168145675d gnome-applets-2.27.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 549a011ca19dafa11378dec418098479878eda59
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 27 06:21:54 2009 +0000
don;t drop schemas translations
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 27fe0c0..c91abcd 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -176,7 +176,7 @@ make
# ideally intltool (ha!) would do that for us
# http://bugzilla.gnome.org/show_bug.cgi?id=474987
cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
# some files go missing due to our modemlights surgery
grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
mv POTFILES.keep2 POTFILES.in
@@ -342,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-3
+- Don't drop schemas translations from po files
+
* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-2
- Make gweather network status tracking work
commit 3c5a51fc3a4d2576f0decead9811c8a61dbc6c8d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 15 23:14:43 2009 +0000
bump rev
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c8b4fde..27fe0c0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
commit 14707350a7b988b2c08459c0411e17e9cdbf83b6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 15 23:04:54 2009 +0000
fix network status tracking
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0f1a8a5..c8b4fde 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -61,6 +61,9 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=579098
+Patch42: gweather-network.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -144,6 +147,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .network
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -338,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-2
+- Make gweather network status tracking work
+
* Mon Apr 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-1
- Update to 2.26.1
diff --git a/gweather-network.patch b/gweather-network.patch
new file mode 100644
index 0000000..95bc83e
--- /dev/null
+++ b/gweather-network.patch
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.26.1/gweather/gweather-applet.c.network gnome-applets-2.26.1/gweather/gweather-applet.c
+--- gnome-applets-2.26.1/gweather/gweather-applet.c.network 2009-04-15 18:53:13.123633124 -0400
++++ gnome-applets-2.26.1/gweather/gweather-applet.c 2009-04-15 18:54:17.438384718 -0400
+@@ -17,6 +17,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+
+ #include <gconf/gconf-client.h>
+ #include <panel-applet.h>
+@@ -552,6 +555,8 @@ state_notify (DBusPendingCall *pending,
+ DBUS_TYPE_UINT32, &result,
+ DBUS_TYPE_INVALID)) {
+ if (result == NM_STATE_CONNECTED) {
++ /* thank you, glibc */
++ res_init ();
+ gweather_update (gw_applet);
+ }
+ }
commit b05590f7c15d9f2fd10fa2daefc072c7af35879d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 13 04:35:05 2009 +0000
fix patch
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 34cd923..7fbfaca 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null 2009-02-03 19:10:33.912072100 -0500
-+++ gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in 2009-02-03 20:59:23.000000000 -0500
+diff -up /dev/null gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null 2009-04-12 17:29:07.367057280 -0400
++++ gnome-applets-2.26.1/null_applet/GNOME_BattstatApplet.server.in 2009-04-13 00:29:58.095336633 -0400
@@ -0,0 +1,22 @@
+<oaf_info>
+
@@ -24,9 +24,9 @@ diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server
+</oaf_server>
+
+</oaf_info>
-diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-applets-2.25.90/null_applet/Makefile.am
---- gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null 2009-01-26 19:05:02.000000000 -0500
-+++ gnome-applets-2.25.90/null_applet/Makefile.am 2009-02-03 21:04:50.000000000 -0500
+diff -up gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null gnome-applets-2.26.1/null_applet/Makefile.am
+--- gnome-applets-2.26.1/null_applet/Makefile.am.battstat-null 2009-03-16 19:38:50.000000000 -0400
++++ gnome-applets-2.26.1/null_applet/Makefile.am 2009-04-13 00:29:58.096337117 -0400
@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
mixer_server_in = GNOME_MixerApplet.server.in
endif
@@ -47,17 +47,15 @@ diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-apple
$(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
-diff -up gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null gnome-applets-2.25.90/null_applet/null_applet.c
---- gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null 2009-01-07 00:22:38.000000000 -0500
-+++ gnome-applets-2.25.90/null_applet/null_applet.c 2009-02-03 20:59:23.000000000 -0500
-@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
+diff -up gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null gnome-applets-2.26.1/null_applet/null_applet.c
+--- gnome-applets-2.26.1/null_applet/null_applet.c.battstat-null 2009-04-12 21:09:18.000000000 -0400
++++ gnome-applets-2.26.1/null_applet/null_applet.c 2009-04-13 00:31:10.112337087 -0400
+@@ -44,6 +44,8 @@ insert_oafiids (GHashTable *hash_table)
+ "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control"));
g_hash_table_insert (hash_table,
- "OAFIID:GNOME_CDPlayerApplet", "CD Player");
- g_hash_table_insert (hash_table,
-- "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
-+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_MixerApplet", "Volume Control");
+ "OAFIID:GNOME_MixerApplet", _("Volume Control"));
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
}
static gboolean already_running;
commit 58840e6621e52d8008dd2d5f923acf0913e7748f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 13 04:17:00 2009 +0000
2.26.1
diff --git a/.cvsignore b/.cvsignore
index fe50772..7be9bc8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.92.tar.bz2
+gnome-applets-2.26.1.tar.bz2
diff --git a/cpufreq-error-registration-error.patch b/cpufreq-error-registration-error.patch
deleted file mode 100644
index df3a1f1..0000000
--- a/cpufreq-error-registration-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
---- gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error 2009-03-29 13:47:24.766889841 -0400
-+++ gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-03-29 13:46:19.376910898 -0400
-@@ -54,7 +54,7 @@ cpufreq_selector_service_error_get_type
- static GType etype = 0;
-
- if (G_UNLIKELY (etype == 0)) {
-- const GEnumValue values[] = {
-+ static const GEnumValue values[] = {
- { SERVICE_ERROR_GENERAL, "SERVICE_ERROR_GENERAL", "GeneralError" },
- { SERVICE_ERROR_DBUS, "SERVICE_ERROR_DBUS", "DBUSError" },
- { SERVICE_ERROR_ALREADY_REGISTERED, "SERVICE_ERROR_ALREADY_REGISTERED", "AlreadyRegistered" },
diff --git a/gnome-applets-invest-defs.patch b/gnome-applets-invest-defs.patch
deleted file mode 100644
index e1ab143..0000000
--- a/gnome-applets-invest-defs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest gnome-applets-2.25.92/invest-applet/invest/Makefile.am
---- gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest 2009-03-21 23:03:10.442647987 -0400
-+++ gnome-applets-2.25.92/invest-applet/invest/Makefile.am 2009-03-21 23:03:33.497690275 -0400
-@@ -14,6 +14,9 @@ invest_PYTHON = \
- widgets.py \
- quotes.py \
- preferences.py
-+
-+nodist_invest_PYTHON = \
-+ defs.py
-
- BUILT_SOURCES = \
- invest-applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index afa921b..0f1a8a5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.92
-Release: 4%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,15 +61,6 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=575782
-Patch42: mini-commander-https.patch
-
-# fixed upstream
-Patch43: gnome-applets-invest-defs.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=577212
-Patch44: cpufreq-error-registration-error.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -153,9 +144,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .minicommander-https
-%patch43 -p1 -b .invest-defs
-%patch44 -p1 -b .error-registration-error
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -350,6 +338,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Mon Apr 13 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.26.1-1
+- Update to 2.26.1
+
* Sun Mar 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-4
- Make cpufreq applet work (#492741)
diff --git a/mini-commander-https.patch b/mini-commander-https.patch
deleted file mode 100644
index 117a9aa..0000000
--- a/mini-commander-https.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h
---- gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https 2009-03-17 21:53:14.032776258 -0400
-+++ gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h 2009-03-17 21:54:05.907524832 -0400
-@@ -39,7 +39,7 @@ typedef struct {
- * installed into the schemas.
- */
- static const MCDefaultMacro mc_default_macros [] = {
-- { "^(http://.*)$", "gnome-open \\1" },
-+ { "^(https?://.*)$", "gnome-open \\1" },
- { "^(ftp://.*)", "gnome-open \\1" },
- { "^(www\\..*)$", "gnome-open http://\\1" },
- { "^(ftp\\..*)$", "gnome-open ftp://\\1" },
-diff -up gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c.https gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c
diff --git a/sources b/sources
index f6f01f0..ea4dc2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6c19de60f92fa619892f16dae8ebf238 gnome-applets-2.25.92.tar.bz2
+ef6c44bba892d28b46cf19fcb2e71d61 gnome-applets-2.26.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 1d6799af3cacb7572350c0f189fa805f98252fcc
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Mar 29 17:56:01 2009 +0000
Fix cpufreq applet
diff --git a/cpufreq-error-registration-error.patch b/cpufreq-error-registration-error.patch
new file mode 100644
index 0000000..df3a1f1
--- /dev/null
+++ b/cpufreq-error-registration-error.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
+--- gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c.error-registration-error 2009-03-29 13:47:24.766889841 -0400
++++ gnome-applets-2.25.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c 2009-03-29 13:46:19.376910898 -0400
+@@ -54,7 +54,7 @@ cpufreq_selector_service_error_get_type
+ static GType etype = 0;
+
+ if (G_UNLIKELY (etype == 0)) {
+- const GEnumValue values[] = {
++ static const GEnumValue values[] = {
+ { SERVICE_ERROR_GENERAL, "SERVICE_ERROR_GENERAL", "GeneralError" },
+ { SERVICE_ERROR_DBUS, "SERVICE_ERROR_DBUS", "DBUSError" },
+ { SERVICE_ERROR_ALREADY_REGISTERED, "SERVICE_ERROR_ALREADY_REGISTERED", "AlreadyRegistered" },
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bec2641..afa921b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.92
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -67,6 +67,9 @@ Patch42: mini-commander-https.patch
# fixed upstream
Patch43: gnome-applets-invest-defs.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=577212
+Patch44: cpufreq-error-registration-error.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,6 +155,7 @@ and more.
%patch41 -p1 -b .no-mixer-icon
%patch42 -p1 -b .minicommander-https
%patch43 -p1 -b .invest-defs
+%patch44 -p1 -b .error-registration-error
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -346,6 +350,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sun Mar 29 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-4
+- Make cpufreq applet work (#492741)
+
* Sat Mar 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-3
- Make the invest applet work
commit ab8c326cb093446611dcc1068f33d8235fc98f6d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Mar 22 03:34:17 2009 +0000
fix invest applet
diff --git a/gnome-applets-invest-defs.patch b/gnome-applets-invest-defs.patch
new file mode 100644
index 0000000..e1ab143
--- /dev/null
+++ b/gnome-applets-invest-defs.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest gnome-applets-2.25.92/invest-applet/invest/Makefile.am
+--- gnome-applets-2.25.92/invest-applet/invest/Makefile.am.invest 2009-03-21 23:03:10.442647987 -0400
++++ gnome-applets-2.25.92/invest-applet/invest/Makefile.am 2009-03-21 23:03:33.497690275 -0400
+@@ -14,6 +14,9 @@ invest_PYTHON = \
+ widgets.py \
+ quotes.py \
+ preferences.py
++
++nodist_invest_PYTHON = \
++ defs.py
+
+ BUILT_SOURCES = \
+ invest-applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8a8887c..bec2641 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.92
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch41: gnome-applets-no-mixer-icon.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=575782
Patch42: mini-commander-https.patch
+# fixed upstream
+Patch43: gnome-applets-invest-defs.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -148,6 +151,7 @@ and more.
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
%patch42 -p1 -b .minicommander-https
+%patch43 -p1 -b .invest-defs
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -294,7 +298,7 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
fi
-%postun
+%postun
/sbin/ldconfig
scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor
@@ -342,6 +346,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sat Mar 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-3
+- Make the invest applet work
+
* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-2
- Support https in minicommander (#490387)
commit 74b52c227a027ced974f680d4dfabfdd4eb80c91
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 18 02:03:34 2009 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b0ead8d..8a8887c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -62,7 +62,7 @@ Patch40: gnome-applets-null-battstat.patch
Patch41: gnome-applets-no-mixer-icon.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=575782
-Patch42: minicommander-https.patch
+Patch42: mini-commander-https.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
commit e61f0af71d088431277a5c1f6c2e2ea67c0119ba
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 18 02:00:05 2009 +0000
support https in minicommander
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 970db5e..b0ead8d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.92
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=575782
+Patch42: minicommander-https.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -144,6 +147,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .minicommander-https
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -338,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-2
+- Support https in minicommander (#490387)
+
* Mon Mar 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-1
- Update to 2.25.92
diff --git a/mini-commander-https.patch b/mini-commander-https.patch
new file mode 100644
index 0000000..117a9aa
--- /dev/null
+++ b/mini-commander-https.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h
+--- gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h.https 2009-03-17 21:53:14.032776258 -0400
++++ gnome-applets-2.25.92/mini-commander/src/mc-default-macros.h 2009-03-17 21:54:05.907524832 -0400
+@@ -39,7 +39,7 @@ typedef struct {
+ * installed into the schemas.
+ */
+ static const MCDefaultMacro mc_default_macros [] = {
+- { "^(http://.*)$", "gnome-open \\1" },
++ { "^(https?://.*)$", "gnome-open \\1" },
+ { "^(ftp://.*)", "gnome-open \\1" },
+ { "^(www\\..*)$", "gnome-open http://\\1" },
+ { "^(ftp\\..*)$", "gnome-open ftp://\\1" },
+diff -up gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c.https gnome-applets-2.25.92/mini-commander/src/mc-install-default-macros.c
commit a38b2ee79492649766a0ceb6ebf0a2cbc4c457e0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 2 21:51:24 2009 +0000
2.15.92
diff --git a/.cvsignore b/.cvsignore
index 03333ec..fe50772 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.91.tar.bz2
+gnome-applets-2.25.92.tar.bz2
diff --git a/gnome-applets-resizeable.patch b/gnome-applets-resizeable.patch
deleted file mode 100644
index 4a2643b..0000000
--- a/gnome-applets-resizeable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable gnome-applets-2.25.91/mini-commander/src/command_line.c
---- gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable 2009-02-16 19:16:51.000000000 -0500
-+++ gnome-applets-2.25.91/mini-commander/src/command_line.c 2009-02-19 01:54:35.056741392 -0500
-@@ -312,7 +312,7 @@ mc_show_history (GtkWidget *widget,
- window = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_window_set_screen (GTK_WINDOW (window),
- gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
-- gtk_window_set_resizeable(GTK_WINDOW(window), FALSE);
-+ gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_COMBO);
- /* cb */
- g_signal_connect_after(GTK_OBJECT(window),
-@@ -507,7 +507,7 @@ mc_show_file_browser (GtkWidget *widget,
- void
- mc_create_command_entry (MCData *mc)
- {
-- mc->entry = gtk_entry_new_with_max ();
-+ mc->entry = gtk_entry_new ();
- gtk_entry_set_max_length (GTK_ENTRY (mc->entry), MC_MAX_COMMAND_LENGTH);
-
- g_signal_connect (mc->entry, "key_press_event",
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 82a0492..970db5e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.91
-Release: 3%{?dist}
+Version: 2.25.92
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -61,9 +61,6 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=572372
-Patch42: gnome-applets-resizeable.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -97,7 +94,7 @@ BuildRequires: gnome-doc-utils
BuildRequires: which
BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
-BuildRequires: gnome-icon-theme
+BuildRequires: gnome-icon-theme
BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
@@ -133,10 +130,10 @@ Obsoletes: gnome-cpufreq-applet
Requires: pkgconfig
%description
-The gnome-applets package contains small applications which generally
-run in the background and display their output to the GNOME panel.
-It includes a clock, a character palette, load monitors, little toys,
-and more.
+The gnome-applets package contains small applications which generally
+run in the background and display their output to the GNOME panel.
+It includes a clock, a character palette, load monitors, little toys,
+and more.
%prep
%setup -q
@@ -147,7 +144,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .resizeable
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -178,7 +174,7 @@ make
cd po
grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
# some files go missing due to our modemlights surgery
-grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
+grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
mv POTFILES.keep2 POTFILES.in
intltool-update --pot
for p in *.po; do
@@ -342,6 +338,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Mon Mar 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.92-1
+- Update to 2.25.92
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.25.91-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index 75db518..f6f01f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fe766bc1e01934024140d11870c1766e gnome-applets-2.25.91.tar.bz2
+6c19de60f92fa619892f16dae8ebf238 gnome-applets-2.25.92.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 9499ad88792428fafc0d2f976b4cf4145ccadd5d
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 24 22:42:02 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d60a927..82a0492 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.91
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -342,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.25.91-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-2
- Update to 2.25.91
commit e8635cb7691de097ae7b2d556f4fb0af04d57244
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 06:58:56 2009 +0000
more build fixes1
diff --git a/gnome-applets-resizeable.patch b/gnome-applets-resizeable.patch
index b991070..4a2643b 100644
--- a/gnome-applets-resizeable.patch
+++ b/gnome-applets-resizeable.patch
@@ -1,6 +1,6 @@
diff -up gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable gnome-applets-2.25.91/mini-commander/src/command_line.c
---- gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable 2009-02-19 00:56:37.413737002 -0500
-+++ gnome-applets-2.25.91/mini-commander/src/command_line.c 2009-02-19 00:56:46.276738256 -0500
+--- gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable 2009-02-16 19:16:51.000000000 -0500
++++ gnome-applets-2.25.91/mini-commander/src/command_line.c 2009-02-19 01:54:35.056741392 -0500
@@ -312,7 +312,7 @@ mc_show_history (GtkWidget *widget,
window = gtk_window_new(GTK_WINDOW_POPUP);
gtk_window_set_screen (GTK_WINDOW (window),
@@ -10,3 +10,12 @@ diff -up gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable gnom
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_COMBO);
/* cb */
g_signal_connect_after(GTK_OBJECT(window),
+@@ -507,7 +507,7 @@ mc_show_file_browser (GtkWidget *widget,
+ void
+ mc_create_command_entry (MCData *mc)
+ {
+- mc->entry = gtk_entry_new_with_max ();
++ mc->entry = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (mc->entry), MC_MAX_COMMAND_LENGTH);
+
+ g_signal_connect (mc->entry, "key_press_event",
commit b37c33798a38d433de5d8d769d252dad7d6a7e29
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 06:01:18 2009 +0000
make it build
diff --git a/gnome-applets-resizeable.patch b/gnome-applets-resizeable.patch
new file mode 100644
index 0000000..b991070
--- /dev/null
+++ b/gnome-applets-resizeable.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable gnome-applets-2.25.91/mini-commander/src/command_line.c
+--- gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable 2009-02-19 00:56:37.413737002 -0500
++++ gnome-applets-2.25.91/mini-commander/src/command_line.c 2009-02-19 00:56:46.276738256 -0500
+@@ -312,7 +312,7 @@ mc_show_history (GtkWidget *widget,
+ window = gtk_window_new(GTK_WINDOW_POPUP);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
+- gtk_window_set_resizeable(GTK_WINDOW(window), FALSE);
++ gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_COMBO);
+ /* cb */
+ g_signal_connect_after(GTK_OBJECT(window),
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 18ef601..d60a927 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.91
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch40: gnome-applets-null-battstat.patch
# and keep the mixer hidden away from the add to panel dialog
Patch41: gnome-applets-no-mixer-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=572372
+Patch42: gnome-applets-resizeable.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -144,6 +147,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .no-mixer-icon
+%patch42 -p1 -b .resizeable
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -338,7 +342,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-1
+* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-2
- Update to 2.25.91
* Fri Feb 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-3
commit 3176d3f333cb1b220ad936d83de52b784676fbf1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 05:34:45 2009 +0000
fix sources
diff --git a/sources b/sources
index a68ddd0..75db518 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
fe766bc1e01934024140d11870c1766e gnome-applets-2.25.91.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 56e64bffa55876d5afb5a084872d1963e63aa592
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 05:10:29 2009 +0000
2.25.91
diff --git a/.cvsignore b/.cvsignore
index 1a617b2..03333ec 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.90.tar.bz2
+gnome-applets-2.25.91.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 83e5167..18ef601 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.90
-Release: 3%{?dist}
+Version: 2.25.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -95,7 +95,6 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
-BuildRequires: perl(XML::Parser)
BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
@@ -339,6 +338,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.91-1
+- Update to 2.25.91
+
* Fri Feb 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-3
- Keep the dead mixer applet from haunting the add to panel dialog
diff --git a/sources b/sources
index a0e3a14..a68ddd0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6669b857554fc7c1216ad29b828a1a01 gnome-applets-2.25.90.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+fe766bc1e01934024140d11870c1766e gnome-applets-2.25.91.tar.bz2
commit 85d866825bde0b1925c9ad8a4ce253f963917895
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 6 19:36:36 2009 +0000
no mixer applet ghosts, please
diff --git a/gnome-applets-no-mixer-icon.patch b/gnome-applets-no-mixer-icon.patch
new file mode 100644
index 0000000..79b57cf
--- /dev/null
+++ b/gnome-applets-no-mixer-icon.patch
@@ -0,0 +1,11 @@
+diff -up gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in
+--- gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon 2009-02-06 14:31:43.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in 2009-02-06 14:32:54.000000000 -0500
+@@ -11,7 +11,6 @@
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+ <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+- <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+ <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b8366cb..83e5167 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -58,6 +58,8 @@ Patch35: modemlights-libgnome.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# and keep the mixer hidden away from the add to panel dialog
+Patch41: gnome-applets-no-mixer-icon.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -142,6 +144,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .no-mixer-icon
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -336,6 +339,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Feb 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-3
+- Keep the dead mixer applet from haunting the add to panel dialog
+
* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-1
- Update to 2.25.90
commit 5a03c7b9496e1336f15b26baff8cfce0f20f1202
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 4 03:00:32 2009 +0000
add missing configure bits for old modemlights
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 6612a4d..7c69fd0 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,6 +1,30 @@
-diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
---- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
-+++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
+diff -up gnome-applets-2.25.90/configure.in.modemlights-libgnome gnome-applets-2.25.90/configure.in
+--- gnome-applets-2.25.90/configure.in.modemlights-libgnome 2009-02-03 21:58:39.000000000 -0500
++++ gnome-applets-2.25.90/configure.in 2009-02-03 21:59:31.000000000 -0500
+@@ -14,6 +14,8 @@ dnl ************************************
+ GTK_REQUIRED=2.13.0
+ GLIB_REQUIRED=2.18.0
+ GIO_REQUIRED=2.15.3
++LIBGNOME_REQUIRED=2.8.0
++LIBGNOMEUI_REQUIRED=2.8.0
+ GCONF_REQUIRED=2.8.0
+ SCROLLKEEPER_REQUIRED=0.1.4
+ LIBPANEL_REQUIRED=2.13.4
+@@ -120,6 +122,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
+ AC_SUBST(GNOME_APPLETS_CFLAGS)
+ AC_SUBST(GNOME_APPLETS_LIBS)
+
++dnl -- check for libgnome (required) ------------------------------------------
++PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
++AC_SUBST(GNOME_LIBS2_CFLAGS)
++AC_SUBST(GNOME_LIBS2_LIBS)
++
+ dnl -- check for gnome-desktop (required) -------------------------------------
+ PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+ AC_SUBST(GNOMEDESKTOP_CFLAGS)
+diff -up gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.25.90/modemlights/Makefile.am
+--- gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.25.90/modemlights/Makefile.am 2009-02-03 21:57:24.000000000 -0500
@@ -2,6 +2,7 @@ SUBDIRS = docs
INCLUDES = -I. -I$(srcdir) \
commit 2d0d559699df042a0204d8fd9a7233abab1e1b89
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 4 02:07:48 2009 +0000
2.25.90
diff --git a/.cvsignore b/.cvsignore
index a045ad9..1a617b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.4.tar.bz2
+gnome-applets-2.25.90.tar.bz2
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index a266f52..34cd923 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null 2009-01-11 11:32:02.651110416 -0500
-+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in 2009-01-11 11:47:13.000000000 -0500
+diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null 2009-02-03 19:10:33.912072100 -0500
++++ gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in 2009-02-03 20:59:23.000000000 -0500
@@ -0,0 +1,22 @@
+<oaf_info>
+
@@ -24,29 +24,32 @@ diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.
+</oaf_server>
+
+</oaf_info>
-diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
---- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null 2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/Makefile.am 2009-01-11 11:47:13.000000000 -0500
-@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
-
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-applets-2.25.90/null_applet/Makefile.am
+--- gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null 2009-01-26 19:05:02.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/Makefile.am 2009-02-03 21:04:50.000000000 -0500
+@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
+ mixer_server_in = GNOME_MixerApplet.server.in
+ endif
+if !BUILD_BATTSTAT_APPLET
+battstat_applet=GNOME_BattstatApplet.server.in
+endif
+
- serverdir = $(libdir)/bonobo/servers
- server_in_files = \
+ libexec_PROGRAMS = null_applet
+
+ null_applet_SOURCES = null_applet.c
+@@ -19,7 +23,7 @@ server_in_files = \
GNOME_NullApplet_Factory.server.in \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_MixerApplet.server.in
++ $(battstat_applet) \
+ $(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
-diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
---- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null 2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/null_applet.c 2009-01-11 11:57:57.000000000 -0500
+diff -up gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null gnome-applets-2.25.90/null_applet/null_applet.c
+--- gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null 2009-01-07 00:22:38.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/null_applet.c 2009-02-03 20:59:23.000000000 -0500
@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
g_hash_table_insert (hash_table,
"OAFIID:GNOME_CDPlayerApplet", "CD Player");
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c5e9ac5..b8366cb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.4
+Version: 2.25.90
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -59,9 +59,6 @@ Patch35: modemlights-libgnome.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# upstream fix
-Patch41: trash-init.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -145,7 +142,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .trash-init
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -340,6 +336,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.90-1
+- Update to 2.25.90
+
* Wed Jan 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-2
- Fix trash applet not starting up
diff --git a/sources b/sources
index d69c94e..a0e3a14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a9e69b2625137950a175d1e1d134f81e gnome-applets-2.25.4.tar.bz2
+6669b857554fc7c1216ad29b828a1a01 gnome-applets-2.25.90.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/trash-init.patch b/trash-init.patch
deleted file mode 100644
index 5aecce0..0000000
--- a/trash-init.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init gnome-applets-2.25.4/trashapplet/src/trashapplet.c
---- gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init 2009-01-21 10:39:43.000000000 -0500
-+++ gnome-applets-2.25.4/trashapplet/src/trashapplet.c 2009-01-21 10:41:09.000000000 -0500
-@@ -611,6 +611,10 @@ trash_applet_factory (PanelApplet *apple
-
- if (!strcmp (iid, "OAFIID:GNOME_Panel_TrashApplet"))
- {
-+ g_set_application_name (_("Trash Applet"));
-+
-+ gtk_window_set_default_icon_name ("user-trash");
-+
- /* Set up the menu */
- panel_applet_setup_menu_from_file (applet,
- DATADIR,
-@@ -627,13 +631,8 @@ trash_applet_factory (PanelApplet *apple
- return retval;
- }
-
--int
--main (int argc, char *argv [])
--{
-- gtk_window_set_default_icon_name ("user-trash");
-- g_set_application_name (_("Trash Applet"));
--
-- return panel_applet_factory_main
-- ("OAFIID:GNOME_Panel_TrashApplet_Factory", TRASH_TYPE_APPLET,
-- trash_applet_factory, NULL);
--}
-+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_TrashApplet_Factory",
-+ TRASH_TYPE_APPLET,
-+ "TrashApplet", "0",
-+ trash_applet_factory,
-+ NULL)
commit 7f9d5e7b60856417a9d8c8f1853e64799eeb3a71
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 21 15:43:14 2009 +0000
fix trash applet startup
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3f1e6ee..c5e9ac5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -59,6 +59,9 @@ Patch35: modemlights-libgnome.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# upstream fix
+Patch41: trash-init.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -142,6 +145,7 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .trash-init
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -336,6 +340,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Wed Jan 21 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-2
+- Fix trash applet not starting up
+
* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-1
- Update to 2.25.4
diff --git a/trash-init.patch b/trash-init.patch
new file mode 100644
index 0000000..5aecce0
--- /dev/null
+++ b/trash-init.patch
@@ -0,0 +1,33 @@
+diff -up gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init gnome-applets-2.25.4/trashapplet/src/trashapplet.c
+--- gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init 2009-01-21 10:39:43.000000000 -0500
++++ gnome-applets-2.25.4/trashapplet/src/trashapplet.c 2009-01-21 10:41:09.000000000 -0500
+@@ -611,6 +611,10 @@ trash_applet_factory (PanelApplet *apple
+
+ if (!strcmp (iid, "OAFIID:GNOME_Panel_TrashApplet"))
+ {
++ g_set_application_name (_("Trash Applet"));
++
++ gtk_window_set_default_icon_name ("user-trash");
++
+ /* Set up the menu */
+ panel_applet_setup_menu_from_file (applet,
+ DATADIR,
+@@ -627,13 +631,8 @@ trash_applet_factory (PanelApplet *apple
+ return retval;
+ }
+
+-int
+-main (int argc, char *argv [])
+-{
+- gtk_window_set_default_icon_name ("user-trash");
+- g_set_application_name (_("Trash Applet"));
+-
+- return panel_applet_factory_main
+- ("OAFIID:GNOME_Panel_TrashApplet_Factory", TRASH_TYPE_APPLET,
+- trash_applet_factory, NULL);
+-}
++PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_TrashApplet_Factory",
++ TRASH_TYPE_APPLET,
++ "TrashApplet", "0",
++ trash_applet_factory,
++ NULL)
commit 10b3bf6ae75f02f8eb88f0eec376c51f82801898
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 20 19:49:41 2009 +0000
fix modemlights build
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8ee75d0..3f1e6ee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -54,6 +54,7 @@ Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
Patch31: gnome-applets-2.18.0-fix-find.patch
Patch34: ppp-includes.patch
+Patch35: modemlights-libgnome.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
@@ -148,6 +149,7 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
+%patch35 -p1 -b .modemlights-libgnome
intltoolize --force
autoreconf
diff --git a/mini-commander.patch b/mini-commander.patch
deleted file mode 100644
index b8cf16f..0000000
--- a/mini-commander.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnome-applets-2.25.3/mini-commander/src/Makefile.am
---- gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander 2009-01-06 21:39:16.000000000 -0500
-+++ gnome-applets-2.25.3/mini-commander/src/Makefile.am 2009-01-06 21:42:34.000000000 -0500
-@@ -35,6 +35,7 @@ mini_commander_applet_SOURCES = \
- mc-default-macros.h
-
- mini_commander_applet_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- mc_install_default_macros_SOURCES = \
-diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
---- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
-+++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DVERSION=\""$(VERSION)"\"
-
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- properties.c
-
- modemlights_applet2_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
new file mode 100644
index 0000000..6612a4d
--- /dev/null
+++ b/modemlights-libgnome.patch
@@ -0,0 +1,19 @@
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DVERSION=\""$(VERSION)"\"
+
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ properties.c
+
+ modemlights_applet2_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
commit 2dd3027e02f50900c62fe37929390ffbf9e266b8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 20 19:18:10 2009 +0000
2.25.4
diff --git a/.cvsignore b/.cvsignore
index 0c8a5b5..a045ad9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.3.tar.bz2
+gnome-applets-2.25.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c71ce61..8ee75d0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.3
-Release: 3%{?dist}
+Version: 2.25.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -58,9 +58,6 @@ Patch34: ppp-includes.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# still doesn't build !@#$!%#
-Patch41: mini-commander.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,8 +149,6 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
-%patch41 -p1 -b .mini-commander
-
intltoolize --force
autoreconf
@@ -339,6 +334,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.4-1
+- Update to 2.25.4
+
* Sun Jan 11 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-3
- Fix the nullappletification of the mixer applet
diff --git a/sources b/sources
index c28a2fc..d69c94e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ddd99d0281df4fa4458408e6cdd19cd1 gnome-applets-2.25.3.tar.bz2
+a9e69b2625137950a175d1e1d134f81e gnome-applets-2.25.4.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit f9632eeadef61d6e0b22b064513328c010390093
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 11 19:24:13 2009 +0000
fix mixer applet nullification
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index c018921..a266f52 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,6 +1,6 @@
diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null 2009-01-06 09:07:59.720027856 -0500
-+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in 2009-01-06 13:06:52.000000000 -0500
+--- /dev/null 2009-01-11 11:32:02.651110416 -0500
++++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in 2009-01-11 11:47:13.000000000 -0500
@@ -0,0 +1,22 @@
+<oaf_info>
+
@@ -26,7 +26,7 @@ diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.
+</oaf_info>
diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
--- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null 2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/Makefile.am 2009-01-06 13:08:41.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/Makefile.am 2009-01-11 11:47:13.000000000 -0500
@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
null_applet_LDADD = $(GNOME_APPLETS_LIBS)
@@ -46,13 +46,15 @@ diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applet
diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
--- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null 2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/null_applet.c 2009-01-06 13:09:42.000000000 -0500
-@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
++++ gnome-applets-2.25.3/null_applet/null_applet.c 2009-01-11 11:57:57.000000000 -0500
+@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
g_hash_table_insert (hash_table,
"OAFIID:GNOME_CDPlayerApplet", "CD Player");
g_hash_table_insert (hash_table,
+- "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ g_hash_table_insert (hash_table,
- "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
++ "OAFIID:GNOME_MixerApplet", "Volume Control");
}
+ static gboolean already_running;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 39c947b..c71ce61 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -339,6 +339,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-3
+- Fix the nullappletification of the mixer applet
+
* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-2
- Update to 2.25.3
commit 2ee0461f1661b6309c935f66933431e51f0dbecb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 11 16:55:31 2009 +0000
working patch
diff --git a/mini-commander.patch b/mini-commander.patch
index f961c76..b8cf16f 100644
--- a/mini-commander.patch
+++ b/mini-commander.patch
@@ -9,3 +9,22 @@ diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnom
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DVERSION=\""$(VERSION)"\"
+
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ properties.c
+
+ modemlights_applet2_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
commit 87ec265e7fea0da7b732420ce2bc4caad07abc1e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 11 16:42:13 2009 +0000
forgotten patch
diff --git a/mini-commander.patch b/mini-commander.patch
index b8cf16f..f961c76 100644
--- a/mini-commander.patch
+++ b/mini-commander.patch
@@ -9,22 +9,3 @@ diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnom
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
-diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
---- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
-+++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DVERSION=\""$(VERSION)"\"
-
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- properties.c
-
- modemlights_applet2_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
commit 6b4c969c15d5f6059453f822a59f530f8fbeb706
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 7 03:27:39 2009 +0000
fix build
diff --git a/mini-commander.patch b/mini-commander.patch
index f961c76..b8cf16f 100644
--- a/mini-commander.patch
+++ b/mini-commander.patch
@@ -9,3 +9,22 @@ diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnom
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander 2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am 2009-01-06 21:59:20.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DVERSION=\""$(VERSION)"\"
+
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ properties.c
+
+ modemlights_applet2_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
commit 7b7c6309226a9c98ca0eac6ae5e3850eff0c09cb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 7 02:46:43 2009 +0000
fix the mini-commander build _again_
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e7b575b..39c947b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch34: ppp-includes.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# still doesn't build !@#$!%#
+Patch41: mini-commander.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
+%patch41 -p1 -b .mini-commander
intltoolize --force
autoreconf
@@ -335,7 +339,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-1
+* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-2
- Update to 2.25.3
* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-4
diff --git a/mini-commander.patch b/mini-commander.patch
new file mode 100644
index 0000000..f961c76
--- /dev/null
+++ b/mini-commander.patch
@@ -0,0 +1,11 @@
+diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnome-applets-2.25.3/mini-commander/src/Makefile.am
+--- gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander 2009-01-06 21:39:16.000000000 -0500
++++ gnome-applets-2.25.3/mini-commander/src/Makefile.am 2009-01-06 21:42:34.000000000 -0500
+@@ -35,6 +35,7 @@ mini_commander_applet_SOURCES = \
+ mc-default-macros.h
+
+ mini_commander_applet_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ mc_install_default_macros_SOURCES = \
commit 8ef599e215205b2b7be67dbf1a4b3c422ca69b7e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 6 20:02:32 2009 +0000
fix sources
diff --git a/sources b/sources
index 31433c3..c28a2fc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ddd99d0281df4fa4458408e6cdd19cd1 gnome-applets-2.25.3.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 51dd797adabb0eda3331defe58f2c8983ff6bd29
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 6 18:22:32 2009 +0000
drop old patches
diff --git a/.cvsignore b/.cvsignore
index 4d52a77..0c8a5b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.2.tar.bz2
+gnome-applets-2.25.3.tar.bz2
diff --git a/gnome-applets-2.18.0-node-leak.patch b/gnome-applets-2.18.0-node-leak.patch
deleted file mode 100644
index b13fd70..0000000
--- a/gnome-applets-2.18.0-node-leak.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-applets-2.18.0/gswitchit/gswitchit-applet.c.node-leak 2007-04-10 01:40:23.000000000 +0200
-+++ gnome-applets-2.18.0/gswitchit/gswitchit-applet.c 2007-04-10 01:41:27.000000000 +0200
-@@ -502,6 +502,7 @@
- bonobo_ui_component_add_verb (popup, verb, (BonoboUIVerbFn)
- GSwitchItAppletCmdSetGroup,
- sia);
-+ bonobo_ui_node_unref (node);
- xkl_debug (160,
- "Registered group menu item \'%s\' as \'%s\'\n",
- verb, *currentName);
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
deleted file mode 100644
index e3f48fb..0000000
--- a/gnome-applets-libgnomeui.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.2/mini-commander/src/Makefile.am
---- gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui 2008-12-22 23:13:10.000000000 -0500
-+++ gnome-applets-2.25.2/mini-commander/src/Makefile.am 2008-12-22 23:13:43.000000000 -0500
-@@ -3,6 +3,7 @@
- INCLUDES = \
- -I. \
- -I$(srcdir) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(GNOME_APPLETS_CFLAGS) \
- $(WARN_CFLAGS) \
- $(GNOME_INCLUDEDIR)
-@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES = \
- mc-default-macros.h
-
- mini_commander_applet_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- mc_install_default_macros_SOURCES = \
-diff -up gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.2/modemlights/Makefile.am
---- gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui 2008-12-22 23:40:19.000000000 -0500
-+++ gnome-applets-2.25.2/modemlights/Makefile.am 2008-12-22 23:40:49.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DVERSION=\""$(VERSION)"\"
-
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- properties.c
-
- modemlights_applet2_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 09653a8..c018921 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,35 +1,6 @@
-diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
---- gnome-applets-2.21.2/null_applet/Makefile.am.battstat 2007-12-06 22:43:35.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/Makefile.am 2007-12-06 22:43:43.000000000 -0500
-@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
-
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
-
-+if !BUILD_BATTSTAT_APPLET
-+battstat_applet=GNOME_BattstatApplet.server.in
-+endif
-+
- serverdir = $(libdir)/bonobo/servers
- server_in_files = \
- GNOME_NullApplet_Factory.server.in \
- GNOME_CDPlayerApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
-- GNOME_Panel_WirelessApplet.server.in
-+ GNOME_Panel_WirelessApplet.server.in \
-+ $(battstat_applet)
- server_DATA = $(server_in_files:.server.in=.server)
-
- @INTLTOOL_SERVER_RULE@
-@@ -28,4 +33,5 @@ EXTRA_DIST = \
- GNOME_NullApplet_Factory.server.in.in \
- GNOME_CDPlayerApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
-- GNOME_Panel_WirelessApplet.server.in
-+ GNOME_Panel_WirelessApplet.server.in \
-+ GNOME_BattstatApplet.server.in
-diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
---- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat 2007-12-06 22:44:07.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in 2007-12-06 22:43:54.000000000 -0500
+diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null 2009-01-06 09:07:59.720027856 -0500
++++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in 2009-01-06 13:06:52.000000000 -0500
@@ -0,0 +1,22 @@
+<oaf_info>
+
@@ -53,14 +24,35 @@ diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battsta
+</oaf_server>
+
+</oaf_info>
---- gnome-applets-2.25.1/null_applet/null_applet.c.old 2008-12-19 16:57:54.000000000 +0000
-+++ gnome-applets-2.25.1/null_applet/null_applet.c 2008-12-19 16:58:49.000000000 +0000
-@@ -40,6 +40,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
+--- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null 2009-01-06 00:30:23.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/Makefile.am 2009-01-06 13:08:41.000000000 -0500
+@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
+
+ null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+
++if !BUILD_BATTSTAT_APPLET
++battstat_applet=GNOME_BattstatApplet.server.in
++endif
++
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = \
+ GNOME_NullApplet_Factory.server.in \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+- GNOME_Panel_WirelessApplet.server.in \
+ GNOME_MixerApplet.server.in
+ server_DATA = $(server_in_files:.server.in=.server)
+
+diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
+--- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null 2009-01-06 00:30:23.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/null_applet.c 2009-01-06 13:09:42.000000000 -0500
+@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
g_hash_table_insert (hash_table,
"OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
}
- static gboolean already_running;
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
deleted file mode 100644
index 2a621ae..0000000
--- a/gnome-applets-remove-mixer.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -up gnome-applets-2.25.2/configure.in.mixer-null gnome-applets-2.25.2/configure.in
---- gnome-applets-2.25.2/configure.in.mixer-null 2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/configure.in 2008-12-20 16:31:52.000000000 -0500
-@@ -483,69 +483,6 @@ enable_stickynotes="yes"
- AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
-
- dnl ***************************************************************************
--dnl *** mixer applet specific checks ***
--dnl ***************************************************************************
--
--GST_MAJORMINOR=auto
--AC_ARG_WITH(gstreamer,
-- AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
-- [case "${withval}" in
-- 0.8) GST_MAJORMINOR=0.8 ;;
-- 0.10) GST_MAJORMINOR=0.10 ;;
-- *) AC_MSG_ERROR([
-- *** Bad value ${withval} for --with-gstreamer
-- *** Please use one of the following:
-- *** --with-gstreamer=0.8
-- *** --with-gstreamer=0.10
-- ]);;
-- esac])
--
--GST10_REQS=0.10.2
--GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
--GST8_REQS=0.8.0
--GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
--
--if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
-- # try for GStreamer 0.10
-- MIXER_CFLAGS=
-- MIXER_LIBS=
-- PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
--fi
--
--if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
-- # try for GStreamer 0.8
-- MIXER_CFLAGS=
-- MIXER_LIBS=
-- PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
--fi
--
--case $HAVE_GST_VER in
-- 0.8|0.10)
-- HAVE_GST="yes"
-- AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend])
-- ;;
-- none)
-- HAVE_GST="no"
-- AC_MSG_RESULT([GStreamer not found])
-- AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
-- ;;
-- *)
-- AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
-- ;;
--esac
--
--AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
--AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
--if test "x$HAVE_GST_VER" = "x0.10" ; then
-- AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
-- # these don't seem to come from any pkg-config file
-- MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
--fi
--
--AC_SUBST(MIXER_CFLAGS)
--AC_SUBST(MIXER_LIBS)
--
--dnl ***************************************************************************
- dnl *** keyboard accessibility status applet check ***
- dnl ***************************************************************************
-
-@@ -770,8 +707,6 @@ accessx-status/pixmaps/Makefile
- mini-commander/Makefile
- mini-commander/src/Makefile
- mini-commander/help/Makefile
--mixer/Makefile
--mixer/docs/Makefile
- drivemount/Makefile
- drivemount/help/Makefile
- modemlights/Makefile
-@@ -845,7 +780,6 @@ gnome-applets-$VERSION configure summary
- - gweather $build_libgweather_applets
- - invest-applet $BUILD_INVEST_APPLET
- - mini-commander $enable_mini_commander
-- - mixer $HAVE_GST
- - modemlights $BUILD_MODEM_LIGHTS
- - multiload $build_gtop_applets
- - stickynotes $enable_stickynotes
-@@ -854,6 +788,5 @@ gnome-applets-$VERSION configure summary
- Using DBUS: $HAVE_DBUS
- Using NetworkManager: $HAVE_NETWORKMANAGER
- Using HAL: $HAVE_HAL
-- Using GStreamer version: $HAVE_GST_VER
- Enabling IPv6: $have_ipv6
- " >&2
-diff -up gnome-applets-2.25.2/Makefile.am.mixer-null gnome-applets-2.25.2/Makefile.am
---- gnome-applets-2.25.2/Makefile.am.mixer-null 2008-12-20 00:35:19.000000000 -0500
-+++ gnome-applets-2.25.2/Makefile.am 2008-12-20 16:30:09.000000000 -0500
-@@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS
- libgweather_SUBDIRS = $(libgweather_applets)
- endif
-
--mixer_applets = \
-- mixer
--if APPLET_MIXER
--mixer_SUBDIRS = $(mixer_applets)
--endif
--
- modemlights_applets = \
- modemlights
- if APPLET_MODEMLIGHTS
-@@ -56,7 +50,6 @@ always_built_SUBDIRS = \
- SUBDIRS = \
- po \
- $(always_built_SUBDIRS) \
-- $(mixer_SUBDIRS) \
- $(modemlights_SUBDIRS) \
- $(gtop_SUBDIRS) \
- $(libgweather_SUBDIRS) \
-@@ -69,7 +62,6 @@ SUBDIRS = \
-
- DIST_SUBDIRS = \
- po \
-- mixer \
- modemlights \
- drivemount \
- charpick \
-diff -up gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in
---- gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null 2008-12-20 00:34:05.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in 2008-12-20 16:30:09.000000000 -0500
-@@ -1,28 +1,15 @@
- <oaf_info>
-
--<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
-- type="exe"
-- location="@LIBEXECDIR@/mixer_applet2">
--
-- <oaf_attribute name="repo_ids" type="stringv">
-- <item value="IDL:Bonobo/GenericFactory:1.0"/>
-- <item value="IDL:Bonobo/Unknown:1.0"/>
-- </oaf_attribute>
-- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
-- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
--
--</oaf_server>
--
- <oaf_server iid="OAFIID:GNOME_MixerApplet"
- type="factory"
-- location="OAFIID:GNOME_MixerApplet_Factory">
-+ location="OAFIID:GNOME_NullApplet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-- <oaf_attribute name="name" type="string" _value="Volume Control"/>
-+ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
- <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
- <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-diff -up gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null gnome-applets-2.25.2/null_applet/Makefile.am
---- gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null 2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/Makefile.am 2008-12-20 16:30:09.000000000 -0500
-@@ -19,6 +19,7 @@ server_in_files = \
- GNOME_CDPlayerApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
-+ GNOME_MixerApplet.server.in \
- $(battstat_applet)
- server_DATA = $(server_in_files:.server.in=.server)
-
-@@ -34,4 +35,6 @@ EXTRA_DIST = \
- GNOME_CDPlayerApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
-- GNOME_BattstatApplet.server.in
-+ GNOME_BattstatApplet.server.in \
-+ GNOME_MixerApplet.server.in
-+
-diff -up gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null gnome-applets-2.25.2/null_applet/null_applet.c
---- gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null 2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/null_applet.c 2008-12-20 16:30:09.000000000 -0500
-@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_CDPlayerApplet", "CD Player");
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
- }
-
- static gboolean already_running;
-diff -up gnome-applets-2.25.2/po/POTFILES.in.mixer-null gnome-applets-2.25.2/po/POTFILES.in
---- gnome-applets-2.25.2/po/POTFILES.in.mixer-null 2008-12-20 03:22:15.000000000 -0500
-+++ gnome-applets-2.25.2/po/POTFILES.in 2008-12-20 16:30:09.000000000 -0500
-@@ -80,13 +80,6 @@ mini-commander/src/mini-commander-global
- mini-commander/src/mini-commander.schemas.in
- mini-commander/src/mini-commander_applet.c
- mini-commander/src/preferences.c
--mixer/GNOME_MixerApplet.server.in.in
--mixer/GNOME_MixerApplet.xml
--mixer/applet.c
--mixer/dock.c
--mixer/load.c
--mixer/mixer.schemas.in
--mixer/preferences.c
- modemlights/GNOME_ModemLights.server.in.in
- modemlights/GNOME_ModemLights.xml
- modemlights/modem-applet.c
-diff -up gnome-applets-2.25.2/po/POTFILES.skip.mixer-null gnome-applets-2.25.2/po/POTFILES.skip
---- gnome-applets-2.25.2/po/POTFILES.skip.mixer-null 2008-12-20 00:33:44.000000000 -0500
-+++ gnome-applets-2.25.2/po/POTFILES.skip 2008-12-20 16:30:09.000000000 -0500
-@@ -23,7 +23,6 @@ invest-applet/data/Invest_Applet.server.
- invest-applet/data/financialchart.glade
- invest-applet/data/prefs-dialog.glade
- mini-commander/src/mini-commander.glade
--mixer/GNOME_MixerApplet.server.in
- modemlights/GNOME_ModemLights.server.in
- modemlights/modemlights.glade
- multiload/GNOME_MultiLoadApplet_Factory.server.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aef639a..e7b575b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.2
-Release: 4%{?dist}
+Version: 2.25.3
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -57,11 +57,6 @@ Patch34: ppp-includes.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# and for the mixer applet
-Patch42: gnome-applets-remove-mixer.patch
-
-# make mini-commander build
-Patch43: gnome-applets-libgnomeui.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -146,9 +141,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
-mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
-rm -rf mixer/
-%patch42 -p1 -b .mixer-null
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -157,7 +149,6 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
-%patch43 -p1 -b .libgnomeui
intltoolize --force
autoreconf
@@ -344,6 +335,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Jan 6 2009 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.3-1
+- Update to 2.25.3
+
* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-4
- Update to 2.25.2
diff --git a/gweather-network.patch b/gweather-network.patch
deleted file mode 100644
index 8e97259..0000000
--- a/gweather-network.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -up gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network gnome-applets-2.23.3/gweather/gweather-applet.c
---- gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network 2008-06-11 02:34:08.000000000 -0400
-+++ gnome-applets-2.23.3/gweather/gweather-applet.c 2008-07-31 21:58:21.000000000 -0400
-@@ -29,6 +29,10 @@
- #include <libnotify/notification.h>
- #endif
-
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <NetworkManager/NetworkManager.h>
-+
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-
- #include "gweather.h"
-@@ -289,6 +293,8 @@ applet_destroy (GtkWidget *widget, GWeat
- weather_info_abort (gw_applet->gweather_info);
- }
-
-+static void setup_network_monitor (GWeatherApplet *gw_applet);
-+
- void gweather_applet_create (GWeatherApplet *gw_applet)
- {
- AtkObject *atk_obj;
-@@ -324,7 +330,7 @@ void gweather_applet_create (GWeatherApp
- g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
- GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
- g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",
-- G_CALLBACK(key_press_cb), gw_applet);
-+ G_CALLBACK(key_press_cb), gw_applet);
-
- gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
-
-@@ -354,9 +360,9 @@ void gweather_applet_create (GWeatherApp
- NULL);
- }
-
-- place_widgets(gw_applet);
--
-- return;
-+ place_widgets(gw_applet);
-+
-+ setup_network_monitor (gw_applet);
- }
-
- gint timeout_cb (gpointer data)
-@@ -521,3 +527,88 @@ void gweather_update (GWeatherApplet *gw
- update_finish, gw_applet);
- }
- }
-+
-+static void
-+state_notify (DBusPendingCall *pending, gpointer data)
-+{
-+ GWeatherApplet *gw_applet = data;
-+
-+ DBusMessage *msg = dbus_pending_call_steal_reply (pending);
-+
-+ if (!msg)
-+ return;
-+
-+ if (dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
-+ dbus_uint32_t result;
-+
-+ if (dbus_message_get_args (msg, NULL,
-+ DBUS_TYPE_UINT32, &result,
-+ DBUS_TYPE_INVALID)) {
-+ if (result == NM_STATE_CONNECTED) {
-+ gweather_update (gw_applet);
-+ }
-+ }
-+ }
-+
-+ dbus_message_unref (msg);
-+}
-+
-+static void
-+check_network (DBusConnection *connection, gpointer user_data)
-+{
-+ DBusMessage *message;
-+ DBusPendingCall *reply;
-+
-+ message = dbus_message_new_method_call (NM_DBUS_SERVICE,
-+ NM_DBUS_PATH,
-+ NM_DBUS_INTERFACE,
-+ "state");
-+ if (dbus_connection_send_with_reply (connection, message, &reply, -1)) {
-+ dbus_pending_call_set_notify (reply, state_notify, user_data, NULL);
-+ dbus_pending_call_unref (reply);
-+ }
-+
-+ dbus_message_unref (message);
-+}
-+
-+static DBusHandlerResult
-+filter_func (DBusConnection *connection, DBusMessage *message, void *user_data)
-+{
-+ if (dbus_message_is_signal (message,
-+ NM_DBUS_INTERFACE,
-+ "StateChanged")) {
-+ check_network (connection, user_data);
-+
-+ return DBUS_HANDLER_RESULT_HANDLED;
-+ }
-+
-+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
-+static void
-+setup_network_monitor (GWeatherApplet *gw_applet)
-+{
-+ GError *error;
-+ static DBusGConnection *bus = NULL;
-+ DBusConnection *dbus;
-+
-+ if (bus == NULL) {
-+ error = NULL;
-+ bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-+ if (bus == NULL) {
-+ g_warning ("Couldn't connect to system bus: %s",
-+ error->message);
-+ g_error_free (error);
-+
-+ return;
-+ }
-+
-+ dbus = dbus_g_connection_get_connection (bus);
-+ dbus_connection_add_filter (dbus, filter_func, gw_applet, NULL);
-+ dbus_bus_add_match (dbus,
-+ "type='signal',"
-+ "interface='" NM_DBUS_INTERFACE_DEVICE "'",
-+ NULL);
-+ }
-+}
-+
diff --git a/sources b/sources
index a2ba7aa..31433c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ee040219c868baca6c75c6525a656a0b gnome-applets-2.25.2.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+ddd99d0281df4fa4458408e6cdd19cd1 gnome-applets-2.25.3.tar.bz2
commit 8bbe295bf95a8465c194a4582ba14720d584655b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 23 04:59:51 2008 +0000
fix the patch
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index 7f6be39..e3f48fb 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -24,7 +24,7 @@ diff -up gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui gnome-applets-2
INCLUDES = -I. -I$(srcdir) \
$(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CLFAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DVERSION=\""$(VERSION)"\"
commit 67ec205178a7bf909825f8709e69fc54ddc21e3d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 23 04:48:50 2008 +0000
fix the build
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index 1bf5a5c..7f6be39 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -17,3 +17,22 @@ diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-ap
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
+diff -up gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.2/modemlights/Makefile.am
+--- gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui 2008-12-22 23:40:19.000000000 -0500
++++ gnome-applets-2.25.2/modemlights/Makefile.am 2008-12-22 23:40:49.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CLFAGS) \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DVERSION=\""$(VERSION)"\"
+
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ properties.c
+
+ modemlights_applet2_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aafc42c..aef639a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -149,7 +149,6 @@ and more.
mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
rm -rf mixer/
%patch42 -p1 -b .mixer-null
-%patch43 -p1 -b .libgnomeui
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -158,6 +157,8 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
+%patch43 -p1 -b .libgnomeui
+
intltoolize --force
autoreconf
@@ -343,7 +344,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-3
+* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-4
- Update to 2.25.2
* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
commit b9928709a0a9dd44e2f606ccc2ef97852a43f7f7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 23 04:28:57 2008 +0000
fix the build
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index 9adedd2..1bf5a5c 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -1,226 +1,19 @@
-diff -up gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui gnome-applets-2.25.1/accessx-status/Makefile.am
---- gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui 2008-06-11 02:34:20.000000000 -0400
-+++ gnome-applets-2.25.1/accessx-status/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -1,6 +1,8 @@
- SUBDIRS = docs pixmaps
-
--INCLUDES = $(GNOME_APPLETS_CFLAGS)
-+INCLUDES = \
-+ $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS)
-
- libexec_PROGRAMS = accessx-status-applet
-
-@@ -10,6 +12,7 @@ accessx_status_applet_SOURCES = \
-
- accessx_status_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(X_LIBS)
-
- serverdir = $(libdir)/bonobo/servers
-diff -up gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui gnome-applets-2.25.1/charpick/Makefile.am
---- gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui 2008-06-11 02:31:27.000000000 -0400
-+++ gnome-applets-2.25.1/charpick/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES = \
- -I. \
- -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(GUCHARMAP_CFLAGS)
-
- libexec_PROGRAMS = charpick_applet2
-@@ -14,6 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
-
- charpick_applet2_LDADD = \
- $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(GUCHARMAP_LIBS)
-
- serverdir = $(libdir)/bonobo/servers
-diff -up gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui gnome-applets-2.25.1/cpufreq/src/Makefile.am
---- gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui 2008-12-19 01:10:06.000000000 -0500
-+++ gnome-applets-2.25.1/cpufreq/src/Makefile.am 2008-12-19 01:10:29.000000000 -0500
-@@ -6,6 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
-
- INCLUDES = \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(LIBGLADE_CFLAGS)
-
- if HAVE_POLKIT_GNOME
-@@ -33,6 +34,7 @@ cpufreq_applet_SOURCES = \
-
- cpufreq_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(LIBGLADE_LIBS) \
- $(LIBCPUFREQ_LIBS)
-
-diff -up gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui gnome-applets-2.25.1/drivemount/Makefile.am
---- gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui 2008-06-11 02:32:46.000000000 -0400
-+++ gnome-applets-2.25.1/drivemount/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -3,7 +3,8 @@ SUBDIRS = help
- INCLUDES = \
- -I. \
- -I$(srcdir) \
-- $(GNOME_APPLETS_CFLAGS)
-+ $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS)
-
- libexec_PROGRAMS = drivemount_applet2
-
-@@ -15,7 +16,8 @@ drivemount_applet2_SOURCES = \
- drive-button.h
-
- drivemount_applet2_LDADD = \
-- $(GNOME_APPLETS_LIBS)
-+ $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS)
-
- serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_DriveMountApplet.server.in
-diff -up gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui gnome-applets-2.25.1/geyes/Makefile.am
---- gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui 2008-09-02 05:56:54.000000000 -0400
-+++ gnome-applets-2.25.1/geyes/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES = \
- -I. \
- -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -I$(includedir) \
- -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
-
-@@ -14,8 +15,9 @@ geyes_applet2_SOURCES = \
- themes.c \
- geyes.h
-
--geyes_applet2_LDADD = \
-- $(GNOME_APPLETS_LIBS)
-+geyes_applet2_LDADD = \
-+ $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS)
-
- serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_GeyesApplet.server.in
-diff -up gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui gnome-applets-2.25.1/gswitchit/Makefile.am
---- gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui 2008-06-11 02:27:32.000000000 -0400
-+++ gnome-applets-2.25.1/gswitchit/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -23,10 +23,12 @@ COMMON_CFLAGS = \
- -DG_LOG_DOMAIN=\"GSwitchIt\" \
- $(LIBGNOMEKBDUI_CFLAGS) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(flags_CFLAGS)
-
- COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
-- $(GNOME_APPLETS_LIBS)
-+ $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS)
-
- libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
-
-diff -up gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui gnome-applets-2.25.1/gweather/Makefile.am
---- gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui 2008-09-04 19:19:02.000000000 -0400
-+++ gnome-applets-2.25.1/gweather/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -7,8 +7,10 @@ INCLUDES = \
- -I$(top_srcdir) \
- -DGTK_ENABLE_BROKEN \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
-- $(LIBGWEATHER_CFLAGS)
-+ $(LIBGWEATHER_CFLAGS) \
-+ $(NETWORKMANAGER_CFLAGS)
-
- libexec_PROGRAMS = gweather-applet-2
-
-@@ -20,10 +22,12 @@ gweather_applet_2_SOURCES = \
- gweather-dialog.c gweather-dialog.h \
- gweather-applet.c gweather-applet.h
-
--gweather_applet_2_LDADD = \
-- $(LIBNOTIFY_LIBS) \
-+gweather_applet_2_LDADD = \
-+ $(LIBNOTIFY_LIBS) \
- $(GNOME_APPLETS_LIBS) \
-- $(LIBGWEATHER_LIBS)
-+ $(GNOME_LIBS2_LIBS) \
-+ $(LIBGWEATHER_LIBS) \
-+ $(NETWORKMANAGER_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_GWeatherApplet.xml
-diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.1/mini-commander/src/Makefile.am
---- gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui 2008-09-02 05:56:55.000000000 -0400
-+++ gnome-applets-2.25.1/mini-commander/src/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -4,6 +4,7 @@ INCLUDES = \
+diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.2/mini-commander/src/Makefile.am
+--- gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui 2008-12-22 23:13:10.000000000 -0500
++++ gnome-applets-2.25.2/mini-commander/src/Makefile.am 2008-12-22 23:13:43.000000000 -0500
+@@ -3,6 +3,7 @@
+ INCLUDES = \
-I. \
-I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
+ $(GNOME_LIBS2_CFLAGS) \
+ $(GNOME_APPLETS_CFLAGS) \
$(WARN_CFLAGS) \
$(GNOME_INCLUDEDIR)
-
@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES = \
mc-default-macros.h
mini_commander_applet_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
-diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
---- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui 2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.25.1/modemlights/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DVERSION=\""$(VERSION)"\"
-
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- properties.c
-
- modemlights_applet2_LDADD = \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOME_APPLETS_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
-diff -up gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui gnome-applets-2.25.1/stickynotes/Makefile.am
---- gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui 2008-09-29 20:27:02.000000000 -0400
-+++ gnome-applets-2.25.1/stickynotes/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -12,6 +12,7 @@ INCLUDES = \
- -I. \
- -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(LIBWNCK_CFLAGS) \
- $(XML2_CFLAGS) \
- -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
-@@ -33,6 +34,7 @@ stickynotes_applet_SOURCES = \
- stickynotes_applet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(LIBWNCK_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(XML2_LIBS)
-
- builder_DATA = $(builder_files)
-diff -up gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui gnome-applets-2.25.1/trashapplet/src/Makefile.am
---- gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui 2008-06-11 02:26:42.000000000 -0400
-+++ gnome-applets-2.25.1/trashapplet/src/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -1,5 +1,6 @@
- INCLUDES = -I$(top_srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(GIO_CFLAGS)
-
- libexec_PROGRAMS = trashapplet
-@@ -13,4 +14,5 @@ trashapplet_SOURCES = \
-
- trashapplet_LDADD = \
- $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(GIO_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0926822..aafc42c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -60,6 +60,9 @@ Patch40: gnome-applets-null-battstat.patch
# and for the mixer applet
Patch42: gnome-applets-remove-mixer.patch
+# make mini-commander build
+Patch43: gnome-applets-libgnomeui.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -146,6 +149,7 @@ and more.
mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
rm -rf mixer/
%patch42 -p1 -b .mixer-null
+%patch43 -p1 -b .libgnomeui
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -339,7 +343,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-2
+* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-3
- Update to 2.25.2
* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
commit 428f0999c016f359882288442461e9a02b0f570d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 23 03:37:58 2008 +0000
fix sources
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7c3ca7c..0926822 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -339,7 +339,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-1
+* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-2
- Update to 2.25.2
* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
diff --git a/sources b/sources
index d5dada5..a2ba7aa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ee040219c868baca6c75c6525a656a0b gnome-applets-2.25.2.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 284843b4aa866c6dec81ceafcbc7fafcbade2788
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 23 03:32:10 2008 +0000
2.25.2
diff --git a/.cvsignore b/.cvsignore
index 585eb0e..4d52a77 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.1.tar.bz2
+gnome-applets-2.25.2.tar.bz2
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
index cfa7b7d..2a621ae 100644
--- a/gnome-applets-remove-mixer.patch
+++ b/gnome-applets-remove-mixer.patch
@@ -1,79 +1,7 @@
-Index: null_applet/GNOME_MixerApplet.server.in
-===================================================================
---- null_applet/GNOME_MixerApplet.server.in (revision 11160)
-+++ null_applet/GNOME_MixerApplet.server.in (working copy)
-@@ -1,28 +1,15 @@
- <oaf_info>
-
--<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
-- type="exe"
-- location="@LIBEXECDIR@/mixer_applet2">
--
-- <oaf_attribute name="repo_ids" type="stringv">
-- <item value="IDL:Bonobo/GenericFactory:1.0"/>
-- <item value="IDL:Bonobo/Unknown:1.0"/>
-- </oaf_attribute>
-- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
-- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
--
--</oaf_server>
--
- <oaf_server iid="OAFIID:GNOME_MixerApplet"
- type="factory"
-- location="OAFIID:GNOME_MixerApplet_Factory">
-+ location="OAFIID:GNOME_NullApplet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-- <oaf_attribute name="name" type="string" _value="Volume Control"/>
-+ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
- <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
- <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-
-Property changes on: null_applet/GNOME_MixerApplet.server.in
-___________________________________________________________________
-Added: svn:mergeinfo
-
-Index: Makefile.am
-===================================================================
---- Makefile.am (revision 11160)
-+++ Makefile.am (working copy)
-@@ -11,12 +11,6 @@
- libgweather_SUBDIRS = $(libgweather_applets)
- endif
-
--mixer_applets = \
-- mixer
--if APPLET_MIXER
--mixer_SUBDIRS = $(mixer_applets)
--endif
--
- modemlights_applets = \
- modemlights
- if APPLET_MODEMLIGHTS
-@@ -56,7 +50,6 @@
- SUBDIRS = \
- po \
- $(always_built_SUBDIRS) \
-- $(mixer_SUBDIRS) \
- $(modemlights_SUBDIRS) \
- $(gtop_SUBDIRS) \
- $(libgweather_SUBDIRS) \
-@@ -69,7 +62,6 @@
-
- DIST_SUBDIRS = \
- po \
-- mixer \
- modemlights \
- drivemount \
- charpick \
---- configure.in.old 2008-12-19 14:49:53.000000000 +0000
-+++ configure.in 2008-12-19 14:50:13.000000000 +0000
-@@ -471,69 +471,6 @@ enable_stickynotes="yes"
+diff -up gnome-applets-2.25.2/configure.in.mixer-null gnome-applets-2.25.2/configure.in
+--- gnome-applets-2.25.2/configure.in.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/configure.in 2008-12-20 16:31:52.000000000 -0500
+@@ -483,69 +483,6 @@ enable_stickynotes="yes"
AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
dnl ***************************************************************************
@@ -143,7 +71,7 @@ Index: Makefile.am
dnl *** keyboard accessibility status applet check ***
dnl ***************************************************************************
-@@ -758,8 +695,6 @@ accessx-status/pixmaps/Makefile
+@@ -770,8 +707,6 @@ accessx-status/pixmaps/Makefile
mini-commander/Makefile
mini-commander/src/Makefile
mini-commander/help/Makefile
@@ -152,7 +80,7 @@ Index: Makefile.am
drivemount/Makefile
drivemount/help/Makefile
modemlights/Makefile
-@@ -833,7 +768,6 @@ gnome-applets-$VERSION configure summary
+@@ -845,7 +780,6 @@ gnome-applets-$VERSION configure summary
- gweather $build_libgweather_applets
- invest-applet $BUILD_INVEST_APPLET
- mini-commander $enable_mini_commander
@@ -160,15 +88,82 @@ Index: Makefile.am
- modemlights $BUILD_MODEM_LIGHTS
- multiload $build_gtop_applets
- stickynotes $enable_stickynotes
-@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
-
+@@ -854,6 +788,5 @@ gnome-applets-$VERSION configure summary
Using DBUS: $HAVE_DBUS
+ Using NetworkManager: $HAVE_NETWORKMANAGER
Using HAL: $HAVE_HAL
- Using GStreamer version: $HAVE_GST_VER
Enabling IPv6: $have_ipv6
" >&2
---- null_applet/Makefile.am.old 2008-12-19 14:49:20.000000000 +0000
-+++ null_applet/Makefile.am 2008-12-19 14:50:13.000000000 +0000
+diff -up gnome-applets-2.25.2/Makefile.am.mixer-null gnome-applets-2.25.2/Makefile.am
+--- gnome-applets-2.25.2/Makefile.am.mixer-null 2008-12-20 00:35:19.000000000 -0500
++++ gnome-applets-2.25.2/Makefile.am 2008-12-20 16:30:09.000000000 -0500
+@@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS
+ libgweather_SUBDIRS = $(libgweather_applets)
+ endif
+
+-mixer_applets = \
+- mixer
+-if APPLET_MIXER
+-mixer_SUBDIRS = $(mixer_applets)
+-endif
+-
+ modemlights_applets = \
+ modemlights
+ if APPLET_MODEMLIGHTS
+@@ -56,7 +50,6 @@ always_built_SUBDIRS = \
+ SUBDIRS = \
+ po \
+ $(always_built_SUBDIRS) \
+- $(mixer_SUBDIRS) \
+ $(modemlights_SUBDIRS) \
+ $(gtop_SUBDIRS) \
+ $(libgweather_SUBDIRS) \
+@@ -69,7 +62,6 @@ SUBDIRS = \
+
+ DIST_SUBDIRS = \
+ po \
+- mixer \
+ modemlights \
+ drivemount \
+ charpick \
+diff -up gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in
+--- gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null 2008-12-20 00:34:05.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in 2008-12-20 16:30:09.000000000 -0500
+@@ -1,28 +1,15 @@
+ <oaf_info>
+
+-<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
+- type="exe"
+- location="@LIBEXECDIR@/mixer_applet2">
+-
+- <oaf_attribute name="repo_ids" type="stringv">
+- <item value="IDL:Bonobo/GenericFactory:1.0"/>
+- <item value="IDL:Bonobo/Unknown:1.0"/>
+- </oaf_attribute>
+- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
+- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
+-
+-</oaf_server>
+-
+ <oaf_server iid="OAFIID:GNOME_MixerApplet"
+ type="factory"
+- location="OAFIID:GNOME_MixerApplet_Factory">
++ location="OAFIID:GNOME_NullApplet_Factory">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ <item value="IDL:Bonobo/Control:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+- <oaf_attribute name="name" type="string" _value="Volume Control"/>
++ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+ <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+ <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+diff -up gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null gnome-applets-2.25.2/null_applet/Makefile.am
+--- gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/Makefile.am 2008-12-20 16:30:09.000000000 -0500
@@ -19,6 +19,7 @@ server_in_files = \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
@@ -185,11 +180,22 @@ Index: Makefile.am
+ GNOME_BattstatApplet.server.in \
+ GNOME_MixerApplet.server.in
+
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in (revision 11161)
-+++ po/POTFILES.in (working copy)
-@@ -80,13 +80,6 @@
+diff -up gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null gnome-applets-2.25.2/null_applet/null_applet.c
+--- gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null 2008-12-20 16:30:09.000000000 -0500
++++ gnome-applets-2.25.2/null_applet/null_applet.c 2008-12-20 16:30:09.000000000 -0500
+@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
+ "OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ }
+
+ static gboolean already_running;
+diff -up gnome-applets-2.25.2/po/POTFILES.in.mixer-null gnome-applets-2.25.2/po/POTFILES.in
+--- gnome-applets-2.25.2/po/POTFILES.in.mixer-null 2008-12-20 03:22:15.000000000 -0500
++++ gnome-applets-2.25.2/po/POTFILES.in 2008-12-20 16:30:09.000000000 -0500
+@@ -80,13 +80,6 @@ mini-commander/src/mini-commander-global
mini-commander/src/mini-commander.schemas.in
mini-commander/src/mini-commander_applet.c
mini-commander/src/preferences.c
@@ -203,11 +209,10 @@ Index: po/POTFILES.in
modemlights/GNOME_ModemLights.server.in.in
modemlights/GNOME_ModemLights.xml
modemlights/modem-applet.c
-Index: po/POTFILES.skip
-===================================================================
---- po/POTFILES.skip (revision 11161)
-+++ po/POTFILES.skip (working copy)
-@@ -23,7 +23,6 @@
+diff -up gnome-applets-2.25.2/po/POTFILES.skip.mixer-null gnome-applets-2.25.2/po/POTFILES.skip
+--- gnome-applets-2.25.2/po/POTFILES.skip.mixer-null 2008-12-20 00:33:44.000000000 -0500
++++ gnome-applets-2.25.2/po/POTFILES.skip 2008-12-20 16:30:09.000000000 -0500
+@@ -23,7 +23,6 @@ invest-applet/data/Invest_Applet.server.
invest-applet/data/financialchart.glade
invest-applet/data/prefs-dialog.glade
mini-commander/src/mini-commander.glade
@@ -215,14 +220,3 @@ Index: po/POTFILES.skip
modemlights/GNOME_ModemLights.server.in
modemlights/modemlights.glade
multiload/GNOME_MultiLoadApplet_Factory.server.in
---- null_applet/null_applet.c.mixer-null 2008-12-19 16:59:48.000000000 +0000
-+++ null_applet/null_applet.c 2008-12-19 17:00:26.000000000 +0000
-@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
- "OAFIID:GNOME_CDPlayerApplet", "CD Player");
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
- }
-
- static gboolean already_running;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 198c25b..7c3ca7c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.1
-Release: 8%{?dist}
+Version: 2.25.2
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -53,22 +53,13 @@ Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
Patch31: gnome-applets-2.18.0-fix-find.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=428072
-Patch33: gnome-applets-2.18.0-node-leak.patch
-
Patch34: ppp-includes.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=488824
-Patch39: gweather-network.patch
-
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
# and for the mixer applet
Patch42: gnome-applets-remove-mixer.patch
-# from upstream
-Patch41: gnome-applets-libgnomeui.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -151,12 +142,10 @@ and more.
%patch11 -p1 -b .dont-require-display
%patch31 -p1 -b .fix-find
-%patch33 -p1 -b .node-leak
-%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
rm -rf mixer/
-%patch42 -p0 -b .mixer-null
+%patch42 -p1 -b .mixer-null
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -164,7 +153,6 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
-%patch41 -p1 -b .libgnomeui
intltoolize --force
autoreconf
@@ -351,6 +339,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sat Dec 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.2-1
+- Update to 2.25.2
+
* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
- Fix battstat nullification
diff --git a/sources b/sources
index c5f2c5e..d5dada5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5224a0813833767600470603d21189e1 gnome-applets-2.25.1.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+ee040219c868baca6c75c6525a656a0b gnome-applets-2.25.2.tar.bz2
commit 54228fd53c0de224e94b5690d8afd39408d64af2
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Fri Dec 19 17:03:01 2008 +0000
- Fix battstat nullification
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 95e4573..09653a8 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -53,3 +53,14 @@ diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battsta
+</oaf_server>
+
+</oaf_info>
+--- gnome-applets-2.25.1/null_applet/null_applet.c.old 2008-12-19 16:57:54.000000000 +0000
++++ gnome-applets-2.25.1/null_applet/null_applet.c 2008-12-19 16:58:49.000000000 +0000
+@@ -40,6 +40,8 @@ insert_oafiids (GHashTable *hash_table)
+ "OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_CDPlayerApplet", "CD Player");
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ }
+
+ static gboolean already_running;
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
index efb19bc..cfa7b7d 100644
--- a/gnome-applets-remove-mixer.patch
+++ b/gnome-applets-remove-mixer.patch
@@ -1,16 +1,3 @@
-Index: null_applet/null_applet.c
-===================================================================
---- null_applet/null_applet.c (revision 11160)
-+++ null_applet/null_applet.c (working copy)
-@@ -40,6 +40,8 @@
- "OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
- g_hash_table_insert (hash_table,
- "OAFIID:GNOME_CDPlayerApplet", "CD Player");
-+ g_hash_table_insert (hash_table,
-+ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
- }
-
- static gboolean already_running;
Index: null_applet/GNOME_MixerApplet.server.in
===================================================================
--- null_applet/GNOME_MixerApplet.server.in (revision 11160)
@@ -228,3 +215,14 @@ Index: po/POTFILES.skip
modemlights/GNOME_ModemLights.server.in
modemlights/modemlights.glade
multiload/GNOME_MultiLoadApplet_Factory.server.in
+--- null_applet/null_applet.c.mixer-null 2008-12-19 16:59:48.000000000 +0000
++++ null_applet/null_applet.c 2008-12-19 17:00:26.000000000 +0000
+@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
+ "OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ }
+
+ static gboolean already_running;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 58c2721..198c25b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -351,6 +351,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-8
+- Fix battstat nullification
+
* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-7
- Remove the mixer applet
commit f34c5ced91b7cf4b1644392969a6ea43a386f010
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Fri Dec 19 15:03:30 2008 +0000
Also remove the mixer from the translations
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
index 33bd0c1..efb19bc 100644
--- a/gnome-applets-remove-mixer.patch
+++ b/gnome-applets-remove-mixer.patch
@@ -198,3 +198,33 @@ Index: Makefile.am
+ GNOME_BattstatApplet.server.in \
+ GNOME_MixerApplet.server.in
+
+Index: po/POTFILES.in
+===================================================================
+--- po/POTFILES.in (revision 11161)
++++ po/POTFILES.in (working copy)
+@@ -80,13 +80,6 @@
+ mini-commander/src/mini-commander.schemas.in
+ mini-commander/src/mini-commander_applet.c
+ mini-commander/src/preferences.c
+-mixer/GNOME_MixerApplet.server.in.in
+-mixer/GNOME_MixerApplet.xml
+-mixer/applet.c
+-mixer/dock.c
+-mixer/load.c
+-mixer/mixer.schemas.in
+-mixer/preferences.c
+ modemlights/GNOME_ModemLights.server.in.in
+ modemlights/GNOME_ModemLights.xml
+ modemlights/modem-applet.c
+Index: po/POTFILES.skip
+===================================================================
+--- po/POTFILES.skip (revision 11161)
++++ po/POTFILES.skip (working copy)
+@@ -23,7 +23,6 @@
+ invest-applet/data/financialchart.glade
+ invest-applet/data/prefs-dialog.glade
+ mini-commander/src/mini-commander.glade
+-mixer/GNOME_MixerApplet.server.in
+ modemlights/GNOME_ModemLights.server.in
+ modemlights/modemlights.glade
+ multiload/GNOME_MultiLoadApplet_Factory.server.in
commit 9284be9e59ce01af3978f381ed0b2a05c753b7ab
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Fri Dec 19 14:53:21 2008 +0000
- Remove the mixer applet
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index ccc0f96..9adedd2 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -170,25 +170,6 @@ diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-ap
$(GNOME_APPLETS_LIBS)
mc_install_default_macros_SOURCES = \
-diff -up gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui gnome-applets-2.25.1/mixer/Makefile.am
---- gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui 2008-06-11 02:30:36.000000000 -0400
-+++ gnome-applets-2.25.1/mixer/Makefile.am 2008-12-19 01:07:09.000000000 -0500
-@@ -3,6 +3,7 @@ SUBDIRS = docs
- INCLUDES = -I. -I$(srcdir) \
- $(MIXER_CFLAGS) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(GNOME_LIBS2_CFLAGS) \
- $(GNOMEDESKTOP_CFLAGS)
-
- libexec_PROGRAMS = mixer_applet2
-@@ -22,6 +23,7 @@ noinst_HEADERS = \
- mixer_applet2_LDADD = \
- $(MIXER_LIBS) \
- $(GNOME_APPLETS_LIBS) \
-+ $(GNOME_LIBS2_LIBS) \
- $(GNOMEDESKTOP_LIBS)
-
- serverdir = $(libdir)/bonobo/servers
diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
--- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui 2004-11-04 06:44:55.000000000 -0500
+++ gnome-applets-2.25.1/modemlights/Makefile.am 2008-12-19 01:07:09.000000000 -0500
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
new file mode 100644
index 0000000..33bd0c1
--- /dev/null
+++ b/gnome-applets-remove-mixer.patch
@@ -0,0 +1,200 @@
+Index: null_applet/null_applet.c
+===================================================================
+--- null_applet/null_applet.c (revision 11160)
++++ null_applet/null_applet.c (working copy)
+@@ -40,6 +40,8 @@
+ "OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+ g_hash_table_insert (hash_table,
+ "OAFIID:GNOME_CDPlayerApplet", "CD Player");
++ g_hash_table_insert (hash_table,
++ "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ }
+
+ static gboolean already_running;
+Index: null_applet/GNOME_MixerApplet.server.in
+===================================================================
+--- null_applet/GNOME_MixerApplet.server.in (revision 11160)
++++ null_applet/GNOME_MixerApplet.server.in (working copy)
+@@ -1,28 +1,15 @@
+ <oaf_info>
+
+-<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
+- type="exe"
+- location="@LIBEXECDIR@/mixer_applet2">
+-
+- <oaf_attribute name="repo_ids" type="stringv">
+- <item value="IDL:Bonobo/GenericFactory:1.0"/>
+- <item value="IDL:Bonobo/Unknown:1.0"/>
+- </oaf_attribute>
+- <oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
+- <oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
+-
+-</oaf_server>
+-
+ <oaf_server iid="OAFIID:GNOME_MixerApplet"
+ type="factory"
+- location="OAFIID:GNOME_MixerApplet_Factory">
++ location="OAFIID:GNOME_NullApplet_Factory">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ <item value="IDL:Bonobo/Control:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+- <oaf_attribute name="name" type="string" _value="Volume Control"/>
++ <oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+ <oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+ <oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+
+Property changes on: null_applet/GNOME_MixerApplet.server.in
+___________________________________________________________________
+Added: svn:mergeinfo
+
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 11160)
++++ Makefile.am (working copy)
+@@ -11,12 +11,6 @@
+ libgweather_SUBDIRS = $(libgweather_applets)
+ endif
+
+-mixer_applets = \
+- mixer
+-if APPLET_MIXER
+-mixer_SUBDIRS = $(mixer_applets)
+-endif
+-
+ modemlights_applets = \
+ modemlights
+ if APPLET_MODEMLIGHTS
+@@ -56,7 +50,6 @@
+ SUBDIRS = \
+ po \
+ $(always_built_SUBDIRS) \
+- $(mixer_SUBDIRS) \
+ $(modemlights_SUBDIRS) \
+ $(gtop_SUBDIRS) \
+ $(libgweather_SUBDIRS) \
+@@ -69,7 +62,6 @@
+
+ DIST_SUBDIRS = \
+ po \
+- mixer \
+ modemlights \
+ drivemount \
+ charpick \
+--- configure.in.old 2008-12-19 14:49:53.000000000 +0000
++++ configure.in 2008-12-19 14:50:13.000000000 +0000
+@@ -471,69 +471,6 @@ enable_stickynotes="yes"
+ AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
+
+ dnl ***************************************************************************
+-dnl *** mixer applet specific checks ***
+-dnl ***************************************************************************
+-
+-GST_MAJORMINOR=auto
+-AC_ARG_WITH(gstreamer,
+- AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
+- [case "${withval}" in
+- 0.8) GST_MAJORMINOR=0.8 ;;
+- 0.10) GST_MAJORMINOR=0.10 ;;
+- *) AC_MSG_ERROR([
+- *** Bad value ${withval} for --with-gstreamer
+- *** Please use one of the following:
+- *** --with-gstreamer=0.8
+- *** --with-gstreamer=0.10
+- ]);;
+- esac])
+-
+-GST10_REQS=0.10.2
+-GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
+-GST8_REQS=0.8.0
+-GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
+-
+-if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
+- # try for GStreamer 0.10
+- MIXER_CFLAGS=
+- MIXER_LIBS=
+- PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
+-fi
+-
+-if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
+- # try for GStreamer 0.8
+- MIXER_CFLAGS=
+- MIXER_LIBS=
+- PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
+-fi
+-
+-case $HAVE_GST_VER in
+- 0.8|0.10)
+- HAVE_GST="yes"
+- AC_MSG_RESULT([ using GStreamer $HAVE_GST_VER backend])
+- ;;
+- none)
+- HAVE_GST="no"
+- AC_MSG_RESULT([GStreamer not found])
+- AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
+- ;;
+- *)
+- AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
+- ;;
+-esac
+-
+-AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
+-AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
+-if test "x$HAVE_GST_VER" = "x0.10" ; then
+- AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
+- # these don't seem to come from any pkg-config file
+- MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
+-fi
+-
+-AC_SUBST(MIXER_CFLAGS)
+-AC_SUBST(MIXER_LIBS)
+-
+-dnl ***************************************************************************
+ dnl *** keyboard accessibility status applet check ***
+ dnl ***************************************************************************
+
+@@ -758,8 +695,6 @@ accessx-status/pixmaps/Makefile
+ mini-commander/Makefile
+ mini-commander/src/Makefile
+ mini-commander/help/Makefile
+-mixer/Makefile
+-mixer/docs/Makefile
+ drivemount/Makefile
+ drivemount/help/Makefile
+ modemlights/Makefile
+@@ -833,7 +768,6 @@ gnome-applets-$VERSION configure summary
+ - gweather $build_libgweather_applets
+ - invest-applet $BUILD_INVEST_APPLET
+ - mini-commander $enable_mini_commander
+- - mixer $HAVE_GST
+ - modemlights $BUILD_MODEM_LIGHTS
+ - multiload $build_gtop_applets
+ - stickynotes $enable_stickynotes
+@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
+
+ Using DBUS: $HAVE_DBUS
+ Using HAL: $HAVE_HAL
+- Using GStreamer version: $HAVE_GST_VER
+ Enabling IPv6: $have_ipv6
+ " >&2
+--- null_applet/Makefile.am.old 2008-12-19 14:49:20.000000000 +0000
++++ null_applet/Makefile.am 2008-12-19 14:50:13.000000000 +0000
+@@ -19,6 +19,7 @@ server_in_files = \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
++ GNOME_MixerApplet.server.in \
+ $(battstat_applet)
+ server_DATA = $(server_in_files:.server.in=.server)
+
+@@ -34,4 +35,6 @@ EXTRA_DIST = \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in \
+- GNOME_BattstatApplet.server.in
++ GNOME_BattstatApplet.server.in \
++ GNOME_MixerApplet.server.in
++
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 17bd72c..58c2721 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -63,6 +63,8 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# and for the mixer applet
+Patch42: gnome-applets-remove-mixer.patch
# from upstream
Patch41: gnome-applets-libgnomeui.patch
@@ -152,6 +154,9 @@ and more.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
+rm -rf mixer/
+%patch42 -p0 -b .mixer-null
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -245,7 +250,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/mixer.schemas \
%{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
@@ -266,7 +270,6 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/mixer.schemas \
%{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
@@ -276,6 +279,10 @@ if [ "$1" -gt 1 ]; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
fi
+ if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
+ fi
fi
%preun
@@ -289,7 +296,6 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/mixer.schemas \
%{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
@@ -329,7 +335,6 @@ fi
%{_libexecdir}/gnome-keyboard-applet
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
-%{_libexecdir}/mixer_applet2
%{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -346,6 +351,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.25.1-7
+- Remove the mixer applet
+
* Fri Dec 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-5
- Fix the build
commit 52fc8a80fe6a38e04f7aa6d344e2cd0e32d0c685
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Dec 19 06:22:55 2008 +0000
fix the build
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
new file mode 100644
index 0000000..ccc0f96
--- /dev/null
+++ b/gnome-applets-libgnomeui.patch
@@ -0,0 +1,245 @@
+diff -up gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui gnome-applets-2.25.1/accessx-status/Makefile.am
+--- gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui 2008-06-11 02:34:20.000000000 -0400
++++ gnome-applets-2.25.1/accessx-status/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -1,6 +1,8 @@
+ SUBDIRS = docs pixmaps
+
+-INCLUDES = $(GNOME_APPLETS_CFLAGS)
++INCLUDES = \
++ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS)
+
+ libexec_PROGRAMS = accessx-status-applet
+
+@@ -10,6 +12,7 @@ accessx_status_applet_SOURCES = \
+
+ accessx_status_applet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(X_LIBS)
+
+ serverdir = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui gnome-applets-2.25.1/charpick/Makefile.am
+--- gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui 2008-06-11 02:31:27.000000000 -0400
++++ gnome-applets-2.25.1/charpick/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(GUCHARMAP_CFLAGS)
+
+ libexec_PROGRAMS = charpick_applet2
+@@ -14,6 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
+
+ charpick_applet2_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(GUCHARMAP_LIBS)
+
+ serverdir = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui gnome-applets-2.25.1/cpufreq/src/Makefile.am
+--- gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui 2008-12-19 01:10:06.000000000 -0500
++++ gnome-applets-2.25.1/cpufreq/src/Makefile.am 2008-12-19 01:10:29.000000000 -0500
+@@ -6,6 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
+
+ INCLUDES = \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBGLADE_CFLAGS)
+
+ if HAVE_POLKIT_GNOME
+@@ -33,6 +34,7 @@ cpufreq_applet_SOURCES = \
+
+ cpufreq_applet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(LIBGLADE_LIBS) \
+ $(LIBCPUFREQ_LIBS)
+
+diff -up gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui gnome-applets-2.25.1/drivemount/Makefile.am
+--- gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui 2008-06-11 02:32:46.000000000 -0400
++++ gnome-applets-2.25.1/drivemount/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -3,7 +3,8 @@ SUBDIRS = help
+ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+- $(GNOME_APPLETS_CFLAGS)
++ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS)
+
+ libexec_PROGRAMS = drivemount_applet2
+
+@@ -15,7 +16,8 @@ drivemount_applet2_SOURCES = \
+ drive-button.h
+
+ drivemount_applet2_LDADD = \
+- $(GNOME_APPLETS_LIBS)
++ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS)
+
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = GNOME_DriveMountApplet.server.in
+diff -up gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui gnome-applets-2.25.1/geyes/Makefile.am
+--- gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui 2008-09-02 05:56:54.000000000 -0400
++++ gnome-applets-2.25.1/geyes/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ -I$(includedir) \
+ -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
+
+@@ -14,8 +15,9 @@ geyes_applet2_SOURCES = \
+ themes.c \
+ geyes.h
+
+-geyes_applet2_LDADD = \
+- $(GNOME_APPLETS_LIBS)
++geyes_applet2_LDADD = \
++ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS)
+
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = GNOME_GeyesApplet.server.in
+diff -up gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui gnome-applets-2.25.1/gswitchit/Makefile.am
+--- gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui 2008-06-11 02:27:32.000000000 -0400
++++ gnome-applets-2.25.1/gswitchit/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -23,10 +23,12 @@ COMMON_CFLAGS = \
+ -DG_LOG_DOMAIN=\"GSwitchIt\" \
+ $(LIBGNOMEKBDUI_CFLAGS) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(flags_CFLAGS)
+
+ COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
+- $(GNOME_APPLETS_LIBS)
++ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS)
+
+ libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
+
+diff -up gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui gnome-applets-2.25.1/gweather/Makefile.am
+--- gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui 2008-09-04 19:19:02.000000000 -0400
++++ gnome-applets-2.25.1/gweather/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -7,8 +7,10 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -DGTK_ENABLE_BROKEN \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+- $(LIBGWEATHER_CFLAGS)
++ $(LIBGWEATHER_CFLAGS) \
++ $(NETWORKMANAGER_CFLAGS)
+
+ libexec_PROGRAMS = gweather-applet-2
+
+@@ -20,10 +22,12 @@ gweather_applet_2_SOURCES = \
+ gweather-dialog.c gweather-dialog.h \
+ gweather-applet.c gweather-applet.h
+
+-gweather_applet_2_LDADD = \
+- $(LIBNOTIFY_LIBS) \
++gweather_applet_2_LDADD = \
++ $(LIBNOTIFY_LIBS) \
+ $(GNOME_APPLETS_LIBS) \
+- $(LIBGWEATHER_LIBS)
++ $(GNOME_LIBS2_LIBS) \
++ $(LIBGWEATHER_LIBS) \
++ $(NETWORKMANAGER_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_GWeatherApplet.xml
+diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.1/mini-commander/src/Makefile.am
+--- gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui 2008-09-02 05:56:55.000000000 -0400
++++ gnome-applets-2.25.1/mini-commander/src/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GNOME_INCLUDEDIR)
+
+@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES = \
+ mc-default-macros.h
+
+ mini_commander_applet_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ mc_install_default_macros_SOURCES = \
+diff -up gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui gnome-applets-2.25.1/mixer/Makefile.am
+--- gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui 2008-06-11 02:30:36.000000000 -0400
++++ gnome-applets-2.25.1/mixer/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -3,6 +3,7 @@ SUBDIRS = docs
+ INCLUDES = -I. -I$(srcdir) \
+ $(MIXER_CFLAGS) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(GNOMEDESKTOP_CFLAGS)
+
+ libexec_PROGRAMS = mixer_applet2
+@@ -22,6 +23,7 @@ noinst_HEADERS = \
+ mixer_applet2_LDADD = \
+ $(MIXER_LIBS) \
+ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOMEDESKTOP_LIBS)
+
+ serverdir = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
+--- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui 2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.25.1/modemlights/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DVERSION=\""$(VERSION)"\"
+
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ properties.c
+
+ modemlights_applet2_LDADD = \
++ $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
+diff -up gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui gnome-applets-2.25.1/stickynotes/Makefile.am
+--- gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui 2008-09-29 20:27:02.000000000 -0400
++++ gnome-applets-2.25.1/stickynotes/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -12,6 +12,7 @@ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBWNCK_CFLAGS) \
+ $(XML2_CFLAGS) \
+ -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
+@@ -33,6 +34,7 @@ stickynotes_applet_SOURCES = \
+ stickynotes_applet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(LIBWNCK_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(XML2_LIBS)
+
+ builder_DATA = $(builder_files)
+diff -up gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui gnome-applets-2.25.1/trashapplet/src/Makefile.am
+--- gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui 2008-06-11 02:26:42.000000000 -0400
++++ gnome-applets-2.25.1/trashapplet/src/Makefile.am 2008-12-19 01:07:09.000000000 -0500
+@@ -1,5 +1,6 @@
+ INCLUDES = -I$(top_srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(GNOME_LIBS2_CFLAGS) \
+ $(GIO_CFLAGS)
+
+ libexec_PROGRAMS = trashapplet
+@@ -13,4 +14,5 @@ trashapplet_SOURCES = \
+
+ trashapplet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(GNOME_LIBS2_LIBS) \
+ $(GIO_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 75b1724..17bd72c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# from upstream
+Patch41: gnome-applets-libgnomeui.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -156,6 +159,7 @@ tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
%patch34 -p1 -b .ppp-includes
+%patch41 -p1 -b .libgnomeui
intltoolize --force
autoreconf
@@ -342,6 +346,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Dec 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-5
+- Fix the build
+
* Thu Dec 18 2008 Jon McCann <jmccann(a)redhat.com> - 1:2.25.1-5
- Rebuild for gnome-desktop
diff --git a/gtkbuilder-translation.patch b/gtkbuilder-translation.patch
deleted file mode 100644
index 4c53409..0000000
--- a/gtkbuilder-translation.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in (revision 11044)
-+++ po/POTFILES.in (working copy)
-@@ -8,7 +8,7 @@
- battstat/GNOME_BattstatApplet.server.in.in
- battstat/GNOME_BattstatApplet.xml
- battstat/battstat_applet.c
--battstat/battstat_applet.ui
-+[type: gettext/glade]battstat/battstat_applet.ui
- battstat/battstat-hal.c
- battstat/battstat.schemas.in
- battstat/properties.c
-@@ -21,7 +21,7 @@
- cpufreq/GNOME_CPUFreqApplet.server.in.in
- cpufreq/GNOME_CPUFreqApplet.xml
- cpufreq/cpufreq-applet.schemas.in
--cpufreq/cpufreq-preferences.ui
-+[type: gettext/glade]cpufreq/cpufreq-preferences.ui
- cpufreq/src/cpufreq-applet.c
- cpufreq/src/cpufreq-prefs.c
- cpufreq/src/cpufreq-monitor-cpuinfo.c
-@@ -44,7 +44,7 @@
- gswitchit/GNOME_GSwitchItApplet.xml
- gswitchit/GNOME_KeyboardApplet.server.in.in
- gswitchit/gswitchit-applet.c
--gswitchit/gswitchit.ui
-+[type: gettext/glade]gswitchit/gswitchit.ui
- gweather/GNOME_GWeatherApplet.xml
- gweather/GNOME_GWeatherApplet_Factory.server.in.in
- gweather/gweather-about.c
-@@ -54,8 +54,8 @@
- gweather/main.c
- invest-applet/data/Invest_Applet.server.in.in
- invest-applet/data/Invest_Applet.xml
--invest-applet/data/financialchart.ui
--invest-applet/data/prefs-dialog.ui
-+[type: gettext/glade]invest-applet/data/financialchart.ui
-+[type: gettext/glade]invest-applet/data/prefs-dialog.ui
- invest-applet/invest/about.py
- invest-applet/invest/applet.py
- invest-applet/invest/chart.py
-@@ -76,7 +76,7 @@
- mini-commander/src/macro.c
- mini-commander/src/mc-install-default-macros.c
- mini-commander/src/mini-commander-global.schemas.in
--mini-commander/src/mini-commander.ui
-+[type: gettext/glade]mini-commander/src/mini-commander.ui
- mini-commander/src/mini-commander.schemas.in
- mini-commander/src/mini-commander_applet.c
- mini-commander/src/preferences.c
-@@ -90,7 +90,7 @@
- modemlights/GNOME_ModemLights.server.in.in
- modemlights/GNOME_ModemLights.xml
- modemlights/modem-applet.c
--modemlights/modemlights.ui
-+[type: gettext/glade]modemlights/modemlights.ui
- multiload/GNOME_MultiLoadApplet_Factory.server.in.in
- multiload/GNOME_MultiloadApplet.xml
- multiload/linux-proc.c
-@@ -108,7 +108,7 @@
- stickynotes/GNOME_StickyNotesApplet.server.in.in
- stickynotes/GNOME_StickyNotesApplet.xml
- stickynotes/stickynotes.c
--stickynotes/stickynotes.ui
-+[type: gettext/glade]stickynotes/stickynotes.ui
- stickynotes/stickynotes.schemas.in
- stickynotes/stickynotes_applet.c
- stickynotes/stickynotes_applet_callbacks.c
diff --git a/info-leak.patch b/info-leak.patch
deleted file mode 100644
index be89737..0000000
--- a/info-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak gnome-applets-2.23.92/trashapplet/src/trashapplet.c
---- gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak 2008-09-16 22:38:24.000000000 -0400
-+++ gnome-applets-2.23.92/trashapplet/src/trashapplet.c 2008-09-16 22:39:29.000000000 -0400
-@@ -148,6 +148,7 @@ trash_applet_monitor_changed (TrashApple
- }
-
- g_object_unref (icon);
-+ g_object_unref (info);
- }
-
- static void
diff --git a/keyboard-applet-leak.patch b/keyboard-applet-leak.patch
deleted file mode 100644
index 804a93f..0000000
--- a/keyboard-applet-leak.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak gnome-applets-2.23.90/gswitchit/gswitchit-applet.c
---- gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak 2008-08-29 21:29:30.000000000 -0400
-+++ gnome-applets-2.23.90/gswitchit/gswitchit-applet.c 2008-08-29 21:29:34.000000000 -0400
-@@ -151,14 +151,17 @@ GSwitchItAppletSetBackground (PanelApple
-
- /* go down */
- if (GTK_IS_CONTAINER (w)) {
-- GList *child =
-+ GList *child;
-+ GList *children =
- gtk_container_get_children (GTK_CONTAINER (w));
-+ child = children;
- while (child != NULL) {
- GSwitchItAppletSetBackground (applet,
- GTK_WIDGET (child->
- data));
- child = child->next;
- }
-+ g_list_free (children);
- }
- }
-
diff --git a/mount-auth.patch b/mount-auth.patch
deleted file mode 100644
index 6fc9ab1..0000000
--- a/mount-auth.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth gnome-applets-2.24.0.1/drivemount/drive-button.c
---- gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth 2008-09-26 15:37:51.000000000 -0400
-+++ gnome-applets-2.24.0.1/drivemount/drive-button.c 2008-09-26 15:39:15.000000000 -0400
-@@ -748,8 +748,10 @@ static void
- mount_drive (DriveButton *self, GtkWidget *item)
- {
- if (self->volume) {
-+ GMountOperation *mount_op = gtk_mount_operation_new (NULL);
- g_volume_mount (self->volume, G_MOUNT_MOUNT_NONE,
-- NULL, NULL, NULL, NULL);
-+ mount_op, NULL, NULL, NULL);
-+ g_object_unref (mount_op);
- } else {
- g_return_if_reached();
- }
diff --git a/undecorate-mixer.patch b/undecorate-mixer.patch
deleted file mode 100644
index d503531..0000000
--- a/undecorate-mixer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer gnome-applets-2.23.4/mixer/dock.c
---- gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer 2008-08-08 13:29:10.000000000 -0400
-+++ gnome-applets-2.23.4/mixer/dock.c 2008-08-08 13:29:19.000000000 -0400
-@@ -68,11 +68,16 @@ gnome_volume_applet_dock_init (GnomeVolu
- dock->timeout = 0;
-
- /* We can't use a simple GDK_WINDOW_TYPE_HINT_DOCK here since
-- * the dock windows don't accept input by default. Instead we use the
-- * popup-menu type as a base. */
-+ * the dock windows don't accept input by default. Instead we use
-+ * the popup menu type. In the end we set everything by hand anyway
-+ * since what happens depends very heavily on the window manager. */
- gtk_window_set_type_hint (GTK_WINDOW (dock),
- GDK_WINDOW_TYPE_HINT_POPUP_MENU);
- gtk_window_set_keep_above (GTK_WINDOW (dock), TRUE);
-+ gtk_window_set_decorated (GTK_WINDOW (dock), FALSE);
-+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dock), TRUE);
-+ gtk_window_set_skip_pager_hint (GTK_WINDOW (dock), TRUE);
-+ gtk_window_set_resizable (GTK_WINDOW (dock), FALSE);
- gtk_window_stick (GTK_WINDOW (dock));
- }
-
commit 89526a5bff73c7749de4b53f261e3b317787840d
Author: William Jon McCann <mccann(a)fedoraproject.org>
Date: Thu Dec 18 22:40:20 2008 +0000
- Rebuild for gnome-desktop
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5842be9..75b1724 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -342,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Thu Dec 18 2008 Jon McCann <jmccann(a)redhat.com> - 1:2.25.1-5
+- Rebuild for gnome-desktop
+
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1:2.25.1-4
- Rebuild for Python 2.6
commit c74c273250cf4beba2b6f0da9c628262b2ee3149
Author: Ignacio Vazquez-Abrams <ivazquez(a)fedoraproject.org>
Date: Sat Nov 29 16:37:04 2008 +0000
Rebuild for Python 2.6
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f6586b0..5842be9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -342,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1:2.25.1-4
+- Rebuild for Python 2.6
+
* Sat Nov 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-4
- Improve description
commit a00eba6806a0aeb99340826773ffbe3d08ea412e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Nov 23 04:35:42 2008 +0000
improve description
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 63b95a5..f6586b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -134,10 +134,10 @@ Obsoletes: gnome-cpufreq-applet
Requires: pkgconfig
%description
-GNOME (GNU Network Object Model Environment) is a user-friendly set of
-applications and desktop tools to be used in conjunction with a window
-manager for the X Window System. The gnome-applets package provides
-small utilities for the GNOME panel.
+The gnome-applets package contains small applications which generally
+run in the background and display their output to the GNOME panel.
+It includes a clock, a character palette, load monitors, little toys,
+and more.
%prep
%setup -q
@@ -342,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sat Nov 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-4
+- Improve description
+
* Fri Nov 21 2008 Ray Strode <rstrode(a)redhat.com> - 1:2.25.1-3
- Install modemlights schema (bug 417031)
commit 3ef359861aa4fece1fcc31c3bde72ef83ba278d8
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri Nov 21 14:12:43 2008 +0000
- Install modemlights schema (bug 417031)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e4acdc9..63b95a5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -242,6 +242,7 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -262,6 +263,7 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -284,6 +286,7 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -339,6 +342,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Nov 21 2008 Ray Strode <rstrode(a)redhat.com> - 1:2.25.1-3
+- Install modemlights schema (bug 417031)
+
* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-2
- Rebuild
commit 17ef7869e6c6bddb1a3706a7bf5a6807975deabf
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Nov 13 17:54:48 2008 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9dba8b0..e4acdc9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.25.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -339,7 +339,10 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Wed Nov 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-1
+* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-2
+- Rebuild
+
+* Wed Nov 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-1
- Update to 2.25.1
* Tue Oct 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.1-1
commit 0676a2bb12c0f1048938e9e2d3e0e87a38d34775
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Nov 13 04:47:18 2008 +0000
2.25.1
diff --git a/.cvsignore b/.cvsignore
index dc07573..585eb0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.24.1.tar.bz2
+gnome-applets-2.25.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 86af3df..9dba8b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.24.1
+Version: 2.25.1
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -339,6 +339,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Wed Nov 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.25.1-1
+- Update to 2.25.1
+
* Tue Oct 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.1-1
- Update to 2.24.1
diff --git a/sources b/sources
index baccc73..c5f2c5e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2a18ecec0da09cc504f8d9b5587ffbb5 gnome-applets-2.24.1.tar.bz2
+5224a0813833767600470603d21189e1 gnome-applets-2.25.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 8ad2809a5aaf153dced1758b8e7e3c553b2fc9c9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Oct 22 01:57:11 2008 +0000
drop obsolete patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 379b7f5..86af3df 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -64,9 +64,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# from upstream
-Patch42: gtkbuilder-translation.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch42 -p0 -b .gtkbuilder-translation
# We don't ship gnome-system-tools
rm -rf modemlights
commit ea541c4917afb9a84e98e8d5774826f9288b00c5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Oct 22 01:55:23 2008 +0000
2.24.1
diff --git a/.cvsignore b/.cvsignore
index c2a71ca..dc07573 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.24.0.1.tar.bz2
+gnome-applets-2.24.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 129dadc..379b7f5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.24.0.1
-Release: 5%{?dist}
+Version: 2.24.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,9 +64,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=553996
-Patch41: mount-auth.patch
-
# from upstream
Patch42: gtkbuilder-translation.patch
@@ -155,7 +152,6 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .mount-auth
%patch42 -p0 -b .gtkbuilder-translation
# We don't ship gnome-system-tools
@@ -347,6 +343,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Oct 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.1-1
+- Update to 2.24.1
+
* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-5
- Fix some missing translations
diff --git a/sources b/sources
index 3079cf1..baccc73 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e6dcab2a0ee9519e8cfb62425d2c1b70 gnome-applets-2.24.0.1.tar.bz2
+2a18ecec0da09cc504f8d9b5587ffbb5 gnome-applets-2.24.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit ea163cd4387eb41643d6d75e972c1a25fea5599b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Oct 10 20:00:52 2008 +0000
add some missing files to potfiles.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0430a59..129dadc 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.24.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -67,6 +67,9 @@ Patch40: gnome-applets-null-battstat.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=553996
Patch41: mount-auth.patch
+# from upstream
+Patch42: gtkbuilder-translation.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -153,6 +156,7 @@ small utilities for the GNOME panel.
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .mount-auth
+%patch42 -p0 -b .gtkbuilder-translation
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -343,6 +347,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-5
+- Fix some missing translations
+
* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-4
- Save space
diff --git a/gtkbuilder-translation.patch b/gtkbuilder-translation.patch
new file mode 100644
index 0000000..4c53409
--- /dev/null
+++ b/gtkbuilder-translation.patch
@@ -0,0 +1,69 @@
+Index: po/POTFILES.in
+===================================================================
+--- po/POTFILES.in (revision 11044)
++++ po/POTFILES.in (working copy)
+@@ -8,7 +8,7 @@
+ battstat/GNOME_BattstatApplet.server.in.in
+ battstat/GNOME_BattstatApplet.xml
+ battstat/battstat_applet.c
+-battstat/battstat_applet.ui
++[type: gettext/glade]battstat/battstat_applet.ui
+ battstat/battstat-hal.c
+ battstat/battstat.schemas.in
+ battstat/properties.c
+@@ -21,7 +21,7 @@
+ cpufreq/GNOME_CPUFreqApplet.server.in.in
+ cpufreq/GNOME_CPUFreqApplet.xml
+ cpufreq/cpufreq-applet.schemas.in
+-cpufreq/cpufreq-preferences.ui
++[type: gettext/glade]cpufreq/cpufreq-preferences.ui
+ cpufreq/src/cpufreq-applet.c
+ cpufreq/src/cpufreq-prefs.c
+ cpufreq/src/cpufreq-monitor-cpuinfo.c
+@@ -44,7 +44,7 @@
+ gswitchit/GNOME_GSwitchItApplet.xml
+ gswitchit/GNOME_KeyboardApplet.server.in.in
+ gswitchit/gswitchit-applet.c
+-gswitchit/gswitchit.ui
++[type: gettext/glade]gswitchit/gswitchit.ui
+ gweather/GNOME_GWeatherApplet.xml
+ gweather/GNOME_GWeatherApplet_Factory.server.in.in
+ gweather/gweather-about.c
+@@ -54,8 +54,8 @@
+ gweather/main.c
+ invest-applet/data/Invest_Applet.server.in.in
+ invest-applet/data/Invest_Applet.xml
+-invest-applet/data/financialchart.ui
+-invest-applet/data/prefs-dialog.ui
++[type: gettext/glade]invest-applet/data/financialchart.ui
++[type: gettext/glade]invest-applet/data/prefs-dialog.ui
+ invest-applet/invest/about.py
+ invest-applet/invest/applet.py
+ invest-applet/invest/chart.py
+@@ -76,7 +76,7 @@
+ mini-commander/src/macro.c
+ mini-commander/src/mc-install-default-macros.c
+ mini-commander/src/mini-commander-global.schemas.in
+-mini-commander/src/mini-commander.ui
++[type: gettext/glade]mini-commander/src/mini-commander.ui
+ mini-commander/src/mini-commander.schemas.in
+ mini-commander/src/mini-commander_applet.c
+ mini-commander/src/preferences.c
+@@ -90,7 +90,7 @@
+ modemlights/GNOME_ModemLights.server.in.in
+ modemlights/GNOME_ModemLights.xml
+ modemlights/modem-applet.c
+-modemlights/modemlights.ui
++[type: gettext/glade]modemlights/modemlights.ui
+ multiload/GNOME_MultiLoadApplet_Factory.server.in.in
+ multiload/GNOME_MultiloadApplet.xml
+ multiload/linux-proc.c
+@@ -108,7 +108,7 @@
+ stickynotes/GNOME_StickyNotesApplet.server.in.in
+ stickynotes/GNOME_StickyNotesApplet.xml
+ stickynotes/stickynotes.c
+-stickynotes/stickynotes.ui
++[type: gettext/glade]stickynotes/stickynotes.ui
+ stickynotes/stickynotes.schemas.in
+ stickynotes/stickynotes_applet.c
+ stickynotes/stickynotes_applet_callbacks.c
commit ade262a13031d4128f26047d5b0c5d65ee46c717
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Oct 10 16:43:20 2008 +0000
save space
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 380d23c..0430a59 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.24.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -176,6 +176,20 @@ autoreconf
--enable-mini-commander
make
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+# some files go missing due to our modemlights surgery
+grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
+mv POTFILES.keep2 POTFILES.in
+intltool-update --pot
+for p in *.po; do
+ msgmerge $p %{po_package}.pot > $p.out
+ msgfmt -o `basename $p .po`.gmo $p.out
+done
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -183,6 +197,23 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+# save space by linking identical images in translated docs
+for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do
+ for f in $helpdir/C/figures/*.png; do
+ b="$(basename $f)"
+ for d in $helpdir/*; do
+ if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+ g="$d/figures/$b"
+ if [ -f "$g" ]; then
+ if cmp -s $f $g; then
+ rm "$g"; ln -s "../../C/figures/$b" "$g"
+ fi
+ fi
+ fi
+ done
+ done
+done
+
%find_lang %{po_package} --all-name --with-gnome
# Clean up unpackaged files
@@ -312,6 +343,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Oct 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-4
+- Save space
+
* Fri Sep 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-3
- Small improvement to the drivemount applet
commit 9d9215a56bab5c66e2aa5a4089da1e5ecad3d8b7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Sep 26 19:52:45 2008 +0000
small improvement to the drive mount applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 685842e..380d23c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.24.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553996
+Patch41: mount-auth.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .mount-auth
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -308,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Sep 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-3
+- Small improvement to the drivemount applet
+
* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-2
- Update to 2.24.0.1
diff --git a/mount-auth.patch b/mount-auth.patch
new file mode 100644
index 0000000..6fc9ab1
--- /dev/null
+++ b/mount-auth.patch
@@ -0,0 +1,15 @@
+diff -up gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth gnome-applets-2.24.0.1/drivemount/drive-button.c
+--- gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth 2008-09-26 15:37:51.000000000 -0400
++++ gnome-applets-2.24.0.1/drivemount/drive-button.c 2008-09-26 15:39:15.000000000 -0400
+@@ -748,8 +748,10 @@ static void
+ mount_drive (DriveButton *self, GtkWidget *item)
+ {
+ if (self->volume) {
++ GMountOperation *mount_op = gtk_mount_operation_new (NULL);
+ g_volume_mount (self->volume, G_MOUNT_MOUNT_NONE,
+- NULL, NULL, NULL, NULL);
++ mount_op, NULL, NULL, NULL);
++ g_object_unref (mount_op);
+ } else {
+ g_return_if_reached();
+ }
commit f6b575cde3b184c1250645078198d352542e2d4c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 24 20:31:07 2008 +0000
fix sources
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a70a08c..685842e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.24.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -308,7 +308,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-1
+* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-2
- Update to 2.24.0.1
* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-2
diff --git a/sources b/sources
index e647466..3079cf1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
e6dcab2a0ee9519e8cfb62425d2c1b70 gnome-applets-2.24.0.1.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 34514bfa57a6c2f953963beaba15ab669d5b34b7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 24 20:24:26 2008 +0000
2.24.0.1
diff --git a/.cvsignore b/.cvsignore
index 1ca05b6..c2a71ca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.24.0.tar.bz2
+gnome-applets-2.24.0.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8304702..a70a08c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.24.0
-Release: 2%{?dist}
+Version: 2.24.0.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -308,6 +308,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Wed Sep 24 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0.1-1
+- Update to 2.24.0.1
+
* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-2
- Update to 2.24.0
diff --git a/sources b/sources
index d326140..e647466 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8918f61153093c8032fd672ed6a0abce gnome-applets-2.24.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+e6dcab2a0ee9519e8cfb62425d2c1b70 gnome-applets-2.24.0.1.tar.bz2
commit 9973dec39be9205695f7083e661e66ff913176cc
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 22 03:06:22 2008 +0000
drop upstreamed patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e99464a..8304702 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,9 +64,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=552577
-Patch42: info-leak.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch42 -p1 -b .info-leak
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -312,7 +308,7 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
-* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-1
+* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-2
- Update to 2.24.0
* Tue Sep 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-2
commit f64f418df9645e352e03a23bcb35c9daab0001ad
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 22 02:56:11 2008 +0000
2.24.0
diff --git a/.cvsignore b/.cvsignore
index 0a26a44..1ca05b6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.92.tar.bz2
+gnome-applets-2.24.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a44bd25..e99464a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.92
-Release: 2%{?dist}
+Version: 2.24.0
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -312,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Sun Sep 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.24.0-1
+- Update to 2.24.0
+
* Tue Sep 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-2
- Plug a leak in the trash applet
diff --git a/sources b/sources
index 0276658..d326140 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b415bc9c44070dfe09ed1d341736d64e gnome-applets-2.23.92.tar.bz2
+8918f61153093c8032fd672ed6a0abce gnome-applets-2.24.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 921f7701e84e09a3320204da8edcda97b81576f6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 17 02:43:11 2008 +0000
plug a leak in the trash applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5e96402..a44bd25 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.92
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552577
+Patch42: info-leak.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch42 -p1 -b .info-leak
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -308,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Sep 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-2
+- Plug a leak in the trash applet
+
* Tue Sep 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-1
- Update to 2.23.92
diff --git a/info-leak.patch b/info-leak.patch
new file mode 100644
index 0000000..be89737
--- /dev/null
+++ b/info-leak.patch
@@ -0,0 +1,11 @@
+diff -up gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak gnome-applets-2.23.92/trashapplet/src/trashapplet.c
+--- gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak 2008-09-16 22:38:24.000000000 -0400
++++ gnome-applets-2.23.92/trashapplet/src/trashapplet.c 2008-09-16 22:39:29.000000000 -0400
+@@ -148,6 +148,7 @@ trash_applet_monitor_changed (TrashApple
+ }
+
+ g_object_unref (icon);
++ g_object_unref (info);
+ }
+
+ static void
commit 654e74eb9949f582c19465c8748f2a579593589d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 10 01:52:31 2008 +0000
fix sources
diff --git a/sources b/sources
index a8b6c30..0276658 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
b415bc9c44070dfe09ed1d341736d64e gnome-applets-2.23.92.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit b0ba2b33cfea1620c3433655987befa23daa1734
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 10 01:16:21 2008 +0000
2.23.92
diff --git a/.cvsignore b/.cvsignore
index c03fb3c..0a26a44 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.91.tar.bz2
+gnome-applets-2.23.92.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 893a222..5e96402 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.91
+Version: 2.23.92
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -308,6 +308,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Sep 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.92-1
+- Update to 2.23.92
+
* Thu Sep 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.91-1
- Update to 2.23.91
diff --git a/sources b/sources
index ae01275..a8b6c30 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5979757b1e790199f6191c390159b597 gnome-applets-2.23.91.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+b415bc9c44070dfe09ed1d341736d64e gnome-applets-2.23.92.tar.bz2
commit 74a2fd492531404e2e699acb51c0a3dbe498a77b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Sep 5 03:07:07 2008 +0000
2.23.91
diff --git a/.cvsignore b/.cvsignore
index 4fec452..c03fb3c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.90.tar.bz2
+gnome-applets-2.23.91.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b2948b0..893a222 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.90
-Release: 2%{?dist}
+Version: 2.23.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,9 +64,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=549890
-Patch41: keyboard-applet-leak.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .keyboard-applet-leak
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -312,6 +308,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Thu Sep 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.91-1
+- Update to 2.23.91
+
* Fri Aug 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-2
- Plug a memory leak in the keyboard applet
diff --git a/sources b/sources
index fef12a7..ae01275 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c82156f5fd740c5d8601e04eca2ec388 gnome-applets-2.23.90.tar.bz2
+5979757b1e790199f6191c390159b597 gnome-applets-2.23.91.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 3e2b0c41bb3346b0c2f503ce48838f1884692473
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Aug 30 01:33:44 2008 +0000
plug a memory leak
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8107b2a..b2948b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=549890
+Patch41: keyboard-applet-leak.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .keyboard-applet-leak
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -308,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Aug 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-2
+- Plug a memory leak in the keyboard applet
+
* Fri Aug 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-1
- Update to 2.23.90
diff --git a/keyboard-applet-leak.patch b/keyboard-applet-leak.patch
new file mode 100644
index 0000000..804a93f
--- /dev/null
+++ b/keyboard-applet-leak.patch
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak gnome-applets-2.23.90/gswitchit/gswitchit-applet.c
+--- gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak 2008-08-29 21:29:30.000000000 -0400
++++ gnome-applets-2.23.90/gswitchit/gswitchit-applet.c 2008-08-29 21:29:34.000000000 -0400
+@@ -151,14 +151,17 @@ GSwitchItAppletSetBackground (PanelApple
+
+ /* go down */
+ if (GTK_IS_CONTAINER (w)) {
+- GList *child =
++ GList *child;
++ GList *children =
+ gtk_container_get_children (GTK_CONTAINER (w));
++ child = children;
+ while (child != NULL) {
+ GSwitchItAppletSetBackground (applet,
+ GTK_WIDGET (child->
+ data));
+ child = child->next;
+ }
++ g_list_free (children);
+ }
+ }
+
commit 1c7d38772855dfb5e5eeab53c131cff22b339ff7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Aug 23 03:09:38 2008 +0000
2.23.90
diff --git a/.cvsignore b/.cvsignore
index 4759f3a..4fec452 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.4.tar.bz2
+gnome-applets-2.23.90.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 712343d..8107b2a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.4
-Release: 2%{?dist}
+Version: 2.23.90
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,9 +64,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# backport from upstream svn
-Patch46: undecorate-mixer.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -152,7 +149,6 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch46 -p1 -b .undecorate-mixer
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -312,6 +308,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Aug 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.90-1
+- Update to 2.23.90
+
* Fri Aug 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-2
- Undecorate the mixer popup
diff --git a/sources b/sources
index 19122dc..fef12a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e1ff4f88761faaa0dd46294c471ec7c0 gnome-applets-2.23.4.tar.bz2
+c82156f5fd740c5d8601e04eca2ec388 gnome-applets-2.23.90.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 26a2bf3d95098c3711d7368c06bb954f2c32ad6d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 8 17:53:54 2008 +0000
fix the mixer popup a bit
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e93860..712343d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# backport from upstream svn
+Patch46: undecorate-mixer.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch46 -p1 -b .undecorate-mixer
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -308,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Aug 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-2
+- Undecorate the mixer popup
+
* Mon Aug 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-1
- Update to 2.23.4
diff --git a/undecorate-mixer.patch b/undecorate-mixer.patch
new file mode 100644
index 0000000..d503531
--- /dev/null
+++ b/undecorate-mixer.patch
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer gnome-applets-2.23.4/mixer/dock.c
+--- gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer 2008-08-08 13:29:10.000000000 -0400
++++ gnome-applets-2.23.4/mixer/dock.c 2008-08-08 13:29:19.000000000 -0400
+@@ -68,11 +68,16 @@ gnome_volume_applet_dock_init (GnomeVolu
+ dock->timeout = 0;
+
+ /* We can't use a simple GDK_WINDOW_TYPE_HINT_DOCK here since
+- * the dock windows don't accept input by default. Instead we use the
+- * popup-menu type as a base. */
++ * the dock windows don't accept input by default. Instead we use
++ * the popup menu type. In the end we set everything by hand anyway
++ * since what happens depends very heavily on the window manager. */
+ gtk_window_set_type_hint (GTK_WINDOW (dock),
+ GDK_WINDOW_TYPE_HINT_POPUP_MENU);
+ gtk_window_set_keep_above (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_decorated (GTK_WINDOW (dock), FALSE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_skip_pager_hint (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_resizable (GTK_WINDOW (dock), FALSE);
+ gtk_window_stick (GTK_WINDOW (dock));
+ }
+
commit c67f1bc70f165286dbe067c5483b393440e5cb7f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 5 03:31:51 2008 +0000
2.23.4
diff --git a/.cvsignore b/.cvsignore
index a0bce07..4759f3a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.3.tar.bz2
+gnome-applets-2.23.4.tar.bz2
diff --git a/gnome-applets-2.10.1-use-builtin-apm.patch b/gnome-applets-2.10.1-use-builtin-apm.patch
deleted file mode 100644
index 66408b4..0000000
--- a/gnome-applets-2.10.1-use-builtin-apm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-applets-2.10.1/configure.in.use-builtin-apm 2005-04-20 09:46:00.000000000 -0400
-+++ gnome-applets-2.10.1/configure.in 2005-04-20 09:46:22.000000000 -0400
-@@ -242,12 +242,10 @@ if test x$disable_battstat = xno; then
- case "${host}" in
- powerpc-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that use libapm
- *-*-linux*)
- NEED_LIBAPM=yes
-- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
- ;;
- # list of supported OS cores that do not use libapm
- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
diff --git a/gnome-applets-2.21.1-mixer-sync.patch b/gnome-applets-2.21.1-mixer-sync.patch
deleted file mode 100644
index 0d64130..0000000
--- a/gnome-applets-2.21.1-mixer-sync.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-diff -up gnome-applets-2.21.1/mixer/applet.h.mixer-sync gnome-applets-2.21.1/mixer/applet.h
---- gnome-applets-2.21.1/mixer/applet.h.mixer-sync 2007-07-27 22:02:35.000000000 -0400
-+++ gnome-applets-2.21.1/mixer/applet.h 2007-11-13 09:39:37.000000000 -0500
-@@ -71,6 +71,7 @@ typedef struct _GnomeVolumeApplet {
-
- /* element */
- GstMixer *mixer;
-+ GstBus *bus;
- gboolean lock;
- gint state;
- GList *tracks;
-diff -up gnome-applets-2.21.1/mixer/applet.c.mixer-sync gnome-applets-2.21.1/mixer/applet.c
---- gnome-applets-2.21.1/mixer/applet.c.mixer-sync 2007-11-03 20:12:18.000000000 -0400
-+++ gnome-applets-2.21.1/mixer/applet.c 2007-11-13 09:47:09.000000000 -0500
-@@ -79,7 +79,12 @@ static void gnome_volume_applet_orientat
- PanelAppletOrient orient);
-
- static gboolean gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-- gboolean force_refresh);
-+ gboolean force_refresh,
-+ gdouble volume,
-+ gint mute);
-+
-+static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
-+
- static gboolean cb_check (gpointer data);
-
- static void cb_volume (GtkAdjustment *adj,
-@@ -218,6 +223,12 @@ gnome_volume_applet_init (GnomeVolumeApp
- /* i18n */
- ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
- atk_object_set_name (ao, _("Volume Control"));
-+
-+ /* Bus for notifications */
-+ applet->bus = gst_bus_new ();
-+ gst_bus_add_signal_watch (applet->bus);
-+ g_signal_connect (G_OBJECT (applet->bus), "message::element",
-+ (GCallback) cb_notify_message, applet);
- }
-
- /* Parse the list of tracks that are stored in GConf */
-@@ -344,12 +355,33 @@ select_element_and_track (GnomeVolumeApp
- return FALSE;
-
- applet->mixer = g_object_ref (active_element);
-+ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
- applet->tracks = active_tracks;
- g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
-
- return TRUE;
- }
-
-+static void
-+gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
-+{
-+ gboolean need_timeout = TRUE;
-+ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
-+ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
-+
-+ if (need_timeout) {
-+ if (applet->timeout == 0) {
-+ applet->timeout = g_timeout_add (100, cb_check, applet);
-+ }
-+ }
-+ else {
-+ if (applet->timeout != 0) {
-+ g_source_remove (applet->timeout);
-+ applet->timeout = 0;
-+ }
-+ }
-+}
-+
- gboolean
- gnome_volume_applet_setup (GnomeVolumeApplet *applet,
- GList *elements)
-@@ -411,10 +443,9 @@ gnome_volume_applet_setup (GnomeVolumeAp
- component = panel_applet_get_popup_component (PANEL_APPLET (applet));
- g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
-
-- gnome_volume_applet_refresh (applet, TRUE);
-- if (res) {
-- applet->timeout = g_timeout_add (100, cb_check, applet);
-- }
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
-+ if (res)
-+ gnome_volume_applet_setup_timeout (applet);
-
- if (res) {
- /* gconf */
-@@ -455,6 +486,11 @@ gnome_volume_applet_dispose (GObject *ob
- g_list_free (applet->elements);
- applet->elements = NULL;
- }
-+ gst_bus_remove_signal_watch (applet->bus);
-+ if (applet->bus) {
-+ gst_object_unref (applet->bus);
-+ applet->bus = NULL;
-+ }
-
- if (applet->tracks) {
- g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
-@@ -649,11 +685,11 @@ gnome_volume_applet_toggle_mute (GnomeVo
- component = panel_applet_get_popup_component (PANEL_APPLET (applet));
- bonobo_ui_component_set_prop (component,
- "/commands/Mute",
-- "state", mute ? "1" : "0", NULL);
-+ "state", !mute ? "1" : "0", NULL);
-
- /* update graphic - this should happen automagically after the next
- * idle call, but apparently doesn't for some people... */
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, !mute);
- }
-
- /*
-@@ -916,7 +952,7 @@ void gnome_volume_applet_size_allocate (
- }
-
- init_pixbufs (applet);
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
- }
-
- static void
-@@ -966,15 +1002,23 @@ gnome_volume_applet_adjust_volume (GstMi
- {
- int range = track->max_volume - track->min_volume;
- gdouble scale = ((gdouble) range) / 100;
-- int *volumes, n;
-+ int *volumes, n, volint;
-
-- volume *= scale;
-- volume += track->min_volume;
-+ if (volume == 1.0) {
-+ volint = track->max_volume;
-+ } else if (volume == 0.0) {
-+ volint = track->min_volume;
-+ } else {
-+ volume *= scale;
-+ volume += track->min_volume;
-+ volint = lrint (volume);
-+ }
-
- volumes = g_new (gint, track->num_channels);
- for (n = 0; n < track->num_channels; n++)
-- volumes[n] = lrint (volume);
-+ volumes[n] = volint;
- gst_mixer_set_volume (mixer, track, volumes);
-+
- g_free (volumes);
- }
-
-@@ -1025,6 +1069,8 @@ cb_volume (GtkAdjustment *adj,
-
- applet->lock = FALSE;
- applet->force_next_update = TRUE;
-+
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
- }
-
- /*
-@@ -1035,31 +1081,39 @@ cb_volume (GtkAdjustment *adj,
-
- static gboolean
- gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-- gboolean force_refresh)
-+ gboolean force_refresh,
-+ gdouble volume,
-+ gint mute)
- {
- BonoboUIComponent *component;
- GdkPixbuf *pixbuf;
- gint n;
-- gdouble volume;
-- gboolean mute, did_change;
-+ gboolean show_mute, did_change;
- gchar *tooltip_str;
- GstMixerTrack *first_track;
- GString *track_names;
- GList *iter;
-
-+ show_mute = 0;
-+
- if (!applet->mixer) {
- n = 0;
-- mute = FALSE;
-+ show_mute = 1;
-+ mute = 0;
- } else if (!applet->tracks) {
- return FALSE;
- } else {
-- /* only first track */
- first_track = g_list_first (applet->tracks)->data;
-- volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-- mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-- GST_MIXER_TRACK_MUTE);
-- if (volume <= 0) {
-- mute = TRUE;
-+ if (volume == -1) {
-+ /* only first track */
-+ volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-+ }
-+ if (mute == -1) {
-+ mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-+ GST_MIXER_TRACK_MUTE) ? 1 : 0;
-+ }
-+ if (volume <= 0 || mute) {
-+ show_mute = 1;
- n = 0;
- }
- else {
-@@ -1077,7 +1131,7 @@ gnome_volume_applet_refresh (GnomeVolume
- applet->force_next_update = FALSE;
-
- if (did_change) {
-- if (mute) {
-+ if (show_mute) {
- pixbuf = applet->pix[0];
- } else {
- pixbuf = applet->pix[n];
-@@ -1101,7 +1155,7 @@ gnome_volume_applet_refresh (GnomeVolume
- track_names = g_string_append (track_names, track->label);
- }
-
-- if (mute) {
-+ if (show_mute) {
- tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
- } else {
- /* Translator comment: I'm not all too sure if this makes sense
-@@ -1129,6 +1183,52 @@ gnome_volume_applet_refresh (GnomeVolume
- return did_change;
- }
-
-+static void
-+cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
-+{
-+ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
-+ GstMixerMessageType type;
-+ GstMixerTrack *first_track;
-+ GstMixerTrack *track = NULL;
-+ gint mute;
-+ gdouble volume;
-+
-+ if (applet->tracks == NULL ||
-+ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
-+ /* No tracks, or not from our mixer - can't update anything anyway */
-+ return;
-+ }
-+
-+ volume = mute = -1;
-+
-+ first_track = g_list_first (applet->tracks)->data;
-+
-+ /* This code only calls refresh if the first_track changes, because the
-+ * refresh code only retrieves the current value from that track anyway */
-+ type = gst_mixer_message_get_type (message);
-+ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
-+ gboolean muted;
-+ gst_mixer_message_parse_mute_toggled (message, &track, &muted);
-+ mute = muted ? 1 : 0;
-+ }
-+ else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
-+ gint n, num_channels, *vols;
-+ volume = 0.0;
-+
-+ gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
-+ for (n = 0; n < num_channels; n++)
-+ volume += vols[n];
-+ volume /= track->num_channels;
-+ volume = 100 * volume / (track->max_volume - track->min_volume);
-+ } else
-+ {
-+ return;
-+ }
-+
-+ if (first_track == track)
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
-+}
-+
- static gboolean
- cb_check (gpointer data)
- {
-@@ -1146,7 +1246,7 @@ cb_check (gpointer data)
- */
- if (time_counter % timeout == 0 || recent_change) {
- did_change = gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data),
-- FALSE);
-+ FALSE, -1, -1);
-
- /*
- * If a change was done, set recent_change so that the update is
-@@ -1227,6 +1327,8 @@ cb_gconf (GConfClient *client,
- /* save */
- gst_object_replace ((GstObject **) &applet->mixer, item->data);
- gst_element_set_state (old_element, GST_STATE_NULL);
-+
-+ gnome_volume_applet_setup_timeout (applet);
- newdevice = TRUE;
- }
- break;
-@@ -1387,7 +1489,7 @@ cb_theme_change (GtkIconTheme *icon_them
- GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
-
- init_pixbufs (applet);
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
- }
-
- /*
diff --git a/gnome-applets-2.21.4-cpufreq.patch b/gnome-applets-2.21.4-cpufreq.patch
deleted file mode 100644
index fadbdbc..0000000
--- a/gnome-applets-2.21.4-cpufreq.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c
---- gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq 2008-01-03 15:36:29.000000000 -0500
-+++ gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c 2008-01-16 01:28:07.000000000 -0500
-@@ -109,6 +109,9 @@ cpufreq_utils_selector_is_available (voi
- if (!path)
- return FALSE;
-
-+ g_free (path);
-+ return TRUE;
-+
- if (geteuid () == 0) {
- g_free (path);
- return TRUE;
-diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c
---- gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq 2008-01-03 15:36:29.000000000 -0500
-+++ gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c 2008-01-16 01:27:14.000000000 -0500
-@@ -176,20 +176,13 @@ static void
- cpufreq_popup_run_selector (CPUFreqPopup *popup,
- const gchar *params)
- {
-- gchar *path;
- guint cpu;
- gchar *command;
- GError *error = NULL;
-
-- path = g_find_program_in_path ("cpufreq-selector");
--
-- if (!path)
-- return;
--
- cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
-
-- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
-- g_free (path);
-+ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
-
- g_spawn_command_line_async (command, &error);
- g_free (command);
diff --git a/gnome-applets-2.23.3-use-builtin-apm.patch b/gnome-applets-2.23.3-use-builtin-apm.patch
new file mode 100644
index 0000000..c91aadb
--- /dev/null
+++ b/gnome-applets-2.23.3-use-builtin-apm.patch
@@ -0,0 +1,16 @@
+diff -up gnome-applets-2.23.3/configure.in.use-builtin-apm gnome-applets-2.23.3/configure.in
+--- gnome-applets-2.23.3/configure.in.use-builtin-apm 2008-07-31 21:52:11.000000000 -0400
++++ gnome-applets-2.23.3/configure.in 2008-07-31 21:53:29.000000000 -0400
+@@ -414,12 +414,10 @@ if test x$disable_battstat = xno; then
+ case "${host}" in
+ powerpc-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that use libapm
+ *-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that do not use libapm
+ i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
index dcfbbbc..2cb1526 100644
--- a/gnome-applets-2.3.6-ppp-command.patch
+++ b/gnome-applets-2.3.6-ppp-command.patch
@@ -1,5 +1,6 @@
---- gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:22.000000000 +0200
-+++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:59.000000000 +0200
+diff -up gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command gnome-applets-2.23.4/modemlights/modemlights.schemas.in
+--- gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command 2003-07-26 08:50:45.000000000 -0400
++++ gnome-applets-2.23.4/modemlights/modemlights.schemas.in 2008-08-04 23:27:17.000000000 -0400
@@ -27,7 +27,7 @@
<key>/schemas/apps/modemlights/prefs/connect</key>
<owner>modemlights_applet2</owner>
@@ -8,7 +9,7 @@
+ <default>/sbin/ifup ppp0</default>
<locale name="C">
<short>Command executed when connecting</short>
- <long></long>
+ <long>Use this command to connect the modem.</long>
@@ -38,7 +38,7 @@
<key>/schemas/apps/modemlights/prefs/disconnect</key>
<owner>modemlights_applet2</owner>
@@ -17,4 +18,4 @@
+ <default>/sbin/ifdown ppp0</default>
<locale name="C">
<short>Command executed when disconnecting</short>
- <long></long>
+ <long>Use this command to disconnect the modem.</long>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9c8f3de..3e93860 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.3
-Release: 3%{?dist}
+Version: 2.23.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -46,7 +46,7 @@ Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
-Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
+Patch2: gnome-applets-2.23.3-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
@@ -56,23 +56,14 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=370937
-# Patch34: mixer-wakeups.patch
-
Patch34: ppp-includes.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
-Patch35: gnome-applets-2.21.1-mixer-sync.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=511446
-Patch44: gweather-gnome-vfs.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -156,10 +147,8 @@ small utilities for the GNOME panel.
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
-%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch44 -p1 -b .gweather-gnome-vfs
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -319,6 +308,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Mon Aug 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.4-1
+- Update to 2.23.4
+
* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1:2.23.3-3
- fix license tag
diff --git a/gweather-gnome-vfs.patch b/gweather-gnome-vfs.patch
deleted file mode 100644
index c09973f..0000000
--- a/gweather-gnome-vfs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up gnome-applets-2.22.1/gweather/Makefile.am.gweather-gnome-vfs gnome-applets-2.22.1/gweather/Makefile.am
---- gnome-applets-2.22.1/gweather/Makefile.am.gweather-gnome-vfs 2008-04-07 17:59:56.000000000 -0400
-+++ gnome-applets-2.22.1/gweather/Makefile.am 2008-04-07 20:49:48.000000000 -0400
-@@ -7,7 +7,6 @@ INCLUDES = \
- -I$(top_srcdir) \
- -DGTK_ENABLE_BROKEN \
- $(GNOME_APPLETS_CFLAGS) \
-- $(GNOME_VFS_APPLETS_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(LIBGWEATHER_CFLAGS)
-
-@@ -24,7 +23,6 @@ gweather_applet_2_SOURCES = \
- gweather_applet_2_LDADD = \
- $(LIBNOTIFY_LIBS) \
- $(GNOME_APPLETS_LIBS) \
-- $(GNOME_VFS_APPLETS_LIBS) \
- $(LIBGWEATHER_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
-diff -up gnome-applets-2.22.1/Makefile.am.gweather-gnome-vfs gnome-applets-2.22.1/Makefile.am
---- gnome-applets-2.22.1/Makefile.am.gweather-gnome-vfs 2008-04-07 17:59:57.000000000 -0400
-+++ gnome-applets-2.22.1/Makefile.am 2008-04-07 20:25:49.000000000 -0400
-@@ -6,8 +6,7 @@ gtop_SUBDIRS = $(gtop_applets)
- endif
-
- vfs_applets = \
-- drivemount \
-- gweather
-+ drivemount
- if BUILD_GNOME_VFS_APPLETS
- vfs_SUBDIRS = $(vfs_applets)
- endif
-@@ -47,6 +46,7 @@ endif
- always_built_SUBDIRS = \
- charpick \
- geyes \
-+ gweather \
- mini-commander \
- gkb-new \
- stickynotes \
diff --git a/gweather-network.patch b/gweather-network.patch
index feb574d..8e97259 100644
--- a/gweather-network.patch
+++ b/gweather-network.patch
@@ -1,6 +1,6 @@
-diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-applets-2.21.2/gweather/gweather-applet.c
---- gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network 2007-11-27 03:59:41.000000000 -0500
-+++ gnome-applets-2.21.2/gweather/gweather-applet.c 2008-01-05 23:05:00.000000000 -0500
+diff -up gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network gnome-applets-2.23.3/gweather/gweather-applet.c
+--- gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network 2008-06-11 02:34:08.000000000 -0400
++++ gnome-applets-2.23.3/gweather/gweather-applet.c 2008-07-31 21:58:21.000000000 -0400
@@ -29,6 +29,10 @@
#include <libnotify/notification.h>
#endif
@@ -9,10 +9,10 @@ diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-
+#include <dbus/dbus-glib-lowlevel.h>
+#include <NetworkManager/NetworkManager.h>
+
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
- #include "gweather-about.h"
- #include "gweather-pref.h"
-@@ -288,6 +292,8 @@ applet_destroy (GtkWidget *widget, GWeat
+@@ -289,6 +293,8 @@ applet_destroy (GtkWidget *widget, GWeat
weather_info_abort (gw_applet->gweather_info);
}
@@ -21,7 +21,7 @@ diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-
void gweather_applet_create (GWeatherApplet *gw_applet)
{
AtkObject *atk_obj;
-@@ -323,7 +329,7 @@ void gweather_applet_create (GWeatherApp
+@@ -324,7 +330,7 @@ void gweather_applet_create (GWeatherApp
g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",
@@ -30,7 +30,7 @@ diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-
gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
-@@ -353,9 +359,9 @@ void gweather_applet_create (GWeatherApp
+@@ -354,9 +360,9 @@ void gweather_applet_create (GWeatherApp
NULL);
}
@@ -43,7 +43,7 @@ diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-
}
gint timeout_cb (gpointer data)
-@@ -520,3 +526,88 @@ void gweather_update (GWeatherApplet *gw
+@@ -521,3 +527,88 @@ void gweather_update (GWeatherApplet *gw
update_finish, gw_applet);
}
}
diff --git a/mixer-wakeups.patch b/mixer-wakeups.patch
deleted file mode 100644
index 51e7b1e..0000000
--- a/mixer-wakeups.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -up gnome-applets-2.19.1/mixer/applet.c.wakeups gnome-applets-2.19.1/mixer/applet.c
---- gnome-applets-2.19.1/mixer/applet.c.wakeups 2007-08-12 23:00:22.000000000 -0400
-+++ gnome-applets-2.19.1/mixer/applet.c 2007-08-12 23:00:29.000000000 -0400
-@@ -80,6 +80,11 @@ static void gnome_volume_applet_orientat
-
- static void gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
- gboolean force_refresh);
-+
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
-+#endif
-+
- static gboolean cb_check (gpointer data);
-
- static void cb_volume (GtkAdjustment *adj,
-@@ -242,6 +247,14 @@ gnome_volume_applet_init (GnomeVolumeApp
- /* i18n */
- ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
- atk_object_set_name (ao, _("Volume Control"));
-+
-+ /* Bus for notifications */
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+ applet->bus = gst_bus_new ();
-+ gst_bus_add_signal_watch (applet->bus);
-+ g_signal_connect (G_OBJECT (applet->bus), "message::element",
-+ (GCallback) cb_notify_message, applet);
-+#endif
- }
-
- /* Parse the list of tracks that are stored in GConf */
-@@ -368,12 +381,37 @@ select_element_and_track (GnomeVolumeApp
- return FALSE;
-
- applet->mixer = g_object_ref (active_element);
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
-+#endif
- applet->tracks = active_tracks;
- g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
-
- return TRUE;
- }
-
-+static void
-+gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
-+{
-+ gboolean need_timeout = TRUE;
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
-+ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
-+#endif
-+
-+ if (need_timeout) {
-+ if (applet->timeout == 0) {
-+ applet->timeout = g_timeout_add (100, cb_check, applet);
-+ }
-+ }
-+ else {
-+ if (applet->timeout != 0) {
-+ g_source_remove (applet->timeout);
-+ applet->timeout = 0;
-+ }
-+ }
-+}
-+
- gboolean
- gnome_volume_applet_setup (GnomeVolumeApplet *applet,
- GList *elements)
-@@ -436,9 +474,8 @@ gnome_volume_applet_setup (GnomeVolumeAp
- g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
-
- gnome_volume_applet_refresh (applet, TRUE);
-- if (res) {
-- applet->timeout = g_timeout_add (100, cb_check, applet);
-- }
-+ if (res)
-+ gnome_volume_applet_setup_timeout (applet);
-
- if (res) {
- /* gconf */
-@@ -479,6 +516,13 @@ gnome_volume_applet_dispose (GObject *ob
- g_list_free (applet->elements);
- applet->elements = NULL;
- }
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+ gst_bus_remove_signal_watch (applet->bus);
-+ if (applet->bus) {
-+ gst_object_unref (applet->bus);
-+ applet->bus = NULL;
-+ }
-+#endif
-
- if (applet->tracks) {
- g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
-@@ -1152,6 +1196,38 @@ gnome_volume_applet_refresh (GnomeVolume
- "state", mute ? "1" : "0", NULL);
- }
-
-+#ifdef HAVE_GST_MIXER_NOTIFIES
-+static void
-+cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
-+{
-+ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
-+ GstMixerMessageType type;
-+ GstMixerTrack *first_track;
-+ GstMixerTrack *track = NULL;
-+
-+ if (applet->tracks == NULL ||
-+ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
-+ /* No tracks, or not from our mixer - can't update anything anyway */
-+ return;
-+ }
-+
-+ first_track = g_list_first (applet->tracks)->data;
-+
-+ /* This code only calls refresh if the first_track changes, because the
-+ * refresh code only retrieves the current value from that track anyway */
-+ type = gst_mixer_message_get_type (message);
-+ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
-+ gst_mixer_message_parse_mute_toggled (message, &track, NULL);
-+ }
-+ else {
-+ gst_mixer_message_parse_volume_changed (message, &track, NULL, NULL);
-+ }
-+
-+ if (first_track == track)
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
-+}
-+#endif
-+
- static gboolean
- cb_check (gpointer data)
- {
-@@ -1214,6 +1290,8 @@ cb_gconf (GConfClient *client,
- /* save */
- gst_object_replace ((GstObject **) &applet->mixer, item->data);
- gst_element_set_state (old_element, GST_STATE_NULL);
-+
-+ gnome_volume_applet_setup_timeout (applet);
- newdevice = TRUE;
- }
- break;
-diff -up gnome-applets-2.19.1/mixer/applet.h.wakeups gnome-applets-2.19.1/mixer/applet.h
---- gnome-applets-2.19.1/mixer/applet.h.wakeups 2007-08-12 23:00:17.000000000 -0400
-+++ gnome-applets-2.19.1/mixer/applet.h 2007-08-12 23:00:29.000000000 -0400
-@@ -71,6 +71,7 @@ typedef struct _GnomeVolumeApplet {
-
- /* element */
- GstMixer *mixer;
-+ GstBus *bus;
- gboolean lock;
- gint state;
- GList *tracks;
-diff -up gnome-applets-2.19.1/configure.in.wakeups gnome-applets-2.19.1/configure.in
---- gnome-applets-2.19.1/configure.in.wakeups 2007-08-12 23:03:29.000000000 -0400
-+++ gnome-applets-2.19.1/configure.in 2007-08-12 23:03:55.000000000 -0400
-@@ -479,11 +479,22 @@ esac
-
- AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
- AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
-+
-+HAVE_GST_MIXER_NOTIFIES=no
- if test "x$HAVE_GST_VER" = "x0.10" ; then
- AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
- # these don't seem to come from any pkg-config file
- MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-+
-+ PKG_CHECK_MODULES(GST_MIXER_NOTIFICATIONS,
-+ gstreamer-plugins-base-0.10 >= 0.10.13.1,
-+ HAVE_GST_MIXER_NOTIFIES=yes, HAVE_GST_MIXER_NOTIFIES=no)
-+ if test "x$HAVE_GST_MIXER_NOTIFIES" = "xyes"; then
-+ AC_DEFINE(HAVE_GST_MIXER_NOTIFIES, 1,
-+ [Have GStreamer mixer notification API])
-+ fi
- fi
-+AM_CONDITIONAL(HAVE_GST_MIXER_NOTIFIES, test "x$HAVE_GST_MIXER_NOTIFIES" = "xyes")
-
- AC_SUBST(MIXER_CFLAGS)
- AC_SUBST(MIXER_LIBS)
-@@ -766,6 +777,7 @@ gnome-applets-$VERSION configure summary
- - invest-applet $BUILD_INVEST_APPLET
- - mini-commander $enable_mini_commander
- - mixer $HAVE_GST
-+ - mixer notifications $HAVE_GST_MIXER_NOTIFIES
- - modemlights $BUILD_MODEM_LIGHTS
- - multiload $build_gtop_applets
- - stickynotes $enable_stickynotes
diff --git a/sources b/sources
index 354f3b8..19122dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ea5de6ff5400a0e70df78efab902a76e gnome-applets-2.23.3.tar.bz2
+e1ff4f88761faaa0dd46294c471ec7c0 gnome-applets-2.23.4.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 3fd8cbc5674886ee8bcc45f17b4d075c9497a863
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jul 23 16:19:16 2008 +0000
fix license tag
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 57ed461..9c8f3de 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,9 +35,9 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
-License: GPLv2+ and GFDL+
+License: GPLv2+ and GFDL
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -319,6 +319,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1:2.23.3-3
+- fix license tag
+
* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.3-1
- Update to 2.23.3
commit ca3a3d8889dfe1ce62642f1a99b20ef265b4c60a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 19 01:52:23 2008 +0000
another try
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 57ba7ba..57ed461 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define build_stickynotes 0
+%define build_stickynotes 1
Summary: Small applications for the GNOME panel
Name: gnome-applets
@@ -177,8 +177,6 @@ autoreconf
--enable-suid=no \
%if %{build_stickynotes}
--enable-stickynotes \
-%else
- --disable-stickynotes \
%endif
--disable-battstat \
--disable-scrollkeeper \
commit 12b5edb9ae351d65ea506e372b7164f429beca81
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 19 01:27:48 2008 +0000
try again
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 39e5318..57ba7ba 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -177,6 +177,8 @@ autoreconf
--enable-suid=no \
%if %{build_stickynotes}
--enable-stickynotes \
+%else
+ --disable-stickynotes \
%endif
--disable-battstat \
--disable-scrollkeeper \
@@ -315,7 +317,7 @@ fi
%{_libexecdir}/invest-applet
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
-%{_datadir}/dbus-1/system-services/org.gnome/CPUFreqSelector.service
+%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
commit f148bdd13bd8a43e48bbbdfd4da51e1ca49d1bff
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 19 00:49:13 2008 +0000
fix spec again
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 28da421..39e5318 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -113,6 +113,9 @@ BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
BuildRequires: libgweather-devel >= 2.22.1
+# For cpufreq
+BuildRequires: dbus-devel
+BuildRequires: PolicyKit-gnome-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -133,9 +136,6 @@ Requires(postun): scrollkeeper
Requires: gnome-python2-applet
Requires: gnome-python2-libegg
-# For cpufreq
-Requires: dbus
-Requires: PolicyKit-gnome
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
commit 68d0cd66004b34ad8c97013580355e2eefd27c58
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 23:46:00 2008 +0000
fix file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2499df0..28da421 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -197,14 +197,6 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
-# usermode-ify cpufreq-selector
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector $RPM_BUILD_ROOT%{_sbindir}
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,security/console.apps}
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/cpufreq-selector
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cpufreq-selector
-
# drop non-XKB support files
rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
@@ -321,10 +313,7 @@ fi
%{_libexecdir}/trashapplet
%{_libexecdir}/invest-applet
-%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/pam.d/*
-%{_sysconfdir}/security/console.apps/*
%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
%{_datadir}/dbus-1/system-services/org.gnome/CPUFreqSelector.service
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
commit a015e28187059c4016a3ab81f9ad7c4f7c03afcd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 23:21:13 2008 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 57bd2f7..2499df0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define build_stickynotes 1
+%define build_stickynotes 0
Summary: Small applications for the GNOME panel
Name: gnome-applets
@@ -129,15 +129,13 @@ Requires(post): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-# For cpufreq-selector
-Requires: usermode
-Source10: cpufreq-selector.app
-Source11: cpufreq-selector.pam
-
# For invest-applet
Requires: gnome-python2-applet
Requires: gnome-python2-libegg
+# For cpufreq
+Requires: dbus
+Requires: PolicyKit-gnome
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -168,7 +166,6 @@ rm -rf modemlights
tar xjf %{SOURCE2}
%patch3 -p1 -b .ppp-command
-
%patch34 -p1 -b .ppp-includes
intltoolize --force
@@ -183,7 +180,7 @@ autoreconf
%endif
--disable-battstat \
--disable-scrollkeeper \
- --enable-mini-commander
+ --enable-mini-commander
make
%install
commit a058a1f56aaa2f7b5509c6f0f83addb51e3d1620
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 22:10:02 2008 +0000
fix sources
diff --git a/sources b/sources
index 66abdcf..354f3b8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ea5de6ff5400a0e70df78efab902a76e gnome-applets-2.23.3.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 740b16c6eda1b0b2f4241f05ebe880c8e36c4b4a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 22:03:30 2008 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9f15489..57bd2f7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -48,7 +48,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.21.4-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
@@ -120,6 +119,9 @@ Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
+Requires: dbus >= %{dbus_version}
+Requires: PolicyKit
+
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
@@ -152,7 +154,6 @@ small utilities for the GNOME panel.
%setup -q
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
-%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
%patch31 -p1 -b .fix-find
@@ -300,7 +301,6 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-applets
-%{_datadir}/omf/*
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
@@ -328,6 +328,9 @@ fi
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
+%{_datadir}/dbus-1/system-services/org.gnome/CPUFreqSelector.service
+%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.3-1
commit f8baf7b6646a6416e6731e164f5caca31fc2f31d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 16:47:54 2008 +0000
2.23.3
diff --git a/.cvsignore b/.cvsignore
index 475b1f0..a0bce07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.23.2.tar.bz2
+gnome-applets-2.23.3.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0f896eb..9f15489 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.23.2
+Version: 2.23.3
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
@@ -330,6 +330,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.3-1
+- Update to 2.23.3
+
* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-2
- Rebuild
diff --git a/sources b/sources
index 136a229..66abdcf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b2fc9f167abceadd0b1ec576871bfa8b gnome-applets-2.23.2.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+ea5de6ff5400a0e70df78efab902a76e gnome-applets-2.23.3.tar.bz2
commit 6d87c34ab15792ccac871eaa3d82a8e18c6e3f4a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 4 20:41:32 2008 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3afd9de..0f896eb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -330,6 +330,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-2
+- Rebuild
+
* Tue May 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-1
- Update to 2.23.2
- Drop upstreamed patches
commit 22f914bd27c0f3dbc8555b5adb0a8ee3669565c6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue May 13 22:11:49 2008 +0000
drop upstreamed patches
diff --git a/gnome-applets-trashiconsize.patch b/gnome-applets-trashiconsize.patch
deleted file mode 100644
index c23ad3f..0000000
--- a/gnome-applets-trashiconsize.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up gnome-applets-2.22.1/trashapplet/src/trashapplet.c.iconsize gnome-applets-2.22.1/trashapplet/src/trashapplet.c
---- gnome-applets-2.22.1/trashapplet/src/trashapplet.c.iconsize 2008-04-23 13:58:38.000000000 -0400
-+++ gnome-applets-2.22.1/trashapplet/src/trashapplet.c 2008-04-23 13:58:53.000000000 -0400
-@@ -160,12 +160,12 @@ trash_applet_size_allocate (GtkWidget
- {
- case PANEL_APPLET_ORIENT_LEFT:
- case PANEL_APPLET_ORIENT_RIGHT:
-- gtk_image_set_pixel_size (applet->image, allocation->width);
-+ gtk_image_set_pixel_size (applet->image, allocation->width - 2);
- break;
-
- case PANEL_APPLET_ORIENT_UP:
- case PANEL_APPLET_ORIENT_DOWN:
-- gtk_image_set_pixel_size (applet->image, allocation->height);
-+ gtk_image_set_pixel_size (applet->image, allocation->height - 2);
- break;
- }
-
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4aeb10c..3afd9de 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -71,18 +71,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=382100
-Patch42: vertical-invest.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=511446
Patch44: gweather-gnome-vfs.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=517500
-Patch50: keyboard-properties.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=529579
-Patch51: gnome-applets-trashiconsize.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -169,12 +160,7 @@ small utilities for the GNOME panel.
%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch42 -p1 -b .vertical-invest
%patch44 -p1 -b .gweather-gnome-vfs
-%patch50 -p1 -b .keyboard-properties
-%patch51 -p1 -b .trashiconsize
-
-cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -346,6 +332,7 @@ fi
%changelog
* Tue May 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-1
- Update to 2.23.2
+- Drop upstreamed patches
* Tue May 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-3
- Drop gnome-netstatus dependency (#445059)
diff --git a/keyboard-properties.patch b/keyboard-properties.patch
deleted file mode 100644
index cddc6b7..0000000
--- a/keyboard-properties.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.22.0/accessx-status/applet.c.keyboard-properties gnome-applets-2.22.0/accessx-status/applet.c
---- gnome-applets-2.22.0/accessx-status/applet.c.keyboard-properties 2008-04-04 15:31:25.000000000 -0400
-+++ gnome-applets-2.22.0/accessx-status/applet.c 2008-04-04 15:31:52.000000000 -0400
-@@ -204,6 +204,8 @@ dialog_cb (BonoboUIComponent *component,
- &error);
-
- if (error != NULL) {
-+ g_error_free (error);
-+ error = NULL;
- gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)),
- "gnome-keyboard-properties --a11y",
- &error);
diff --git a/locations.patch b/locations.patch
deleted file mode 100644
index f95de85..0000000
--- a/locations.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.21.4/gweather/gweather-xml.c.locations gnome-applets-2.21.4/gweather/gweather-xml.c
---- gnome-applets-2.21.4/gweather/gweather-xml.c.locations 2008-01-20 14:52:49.000000000 -0500
-+++ gnome-applets-2.21.4/gweather/gweather-xml.c 2008-01-20 14:53:00.000000000 -0500
-@@ -368,7 +368,7 @@ gweather_xml_load_locations( GtkTreeView
- int ret = -1;
-
- /* Open the xml file containing the different locations */
-- xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
-+ xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION);
- if( xml == NULL )
- goto error_out;
-
diff --git a/trash-gio.patch b/trash-gio.patch
deleted file mode 100644
index 2c9808d..0000000
--- a/trash-gio.patch
+++ /dev/null
@@ -1,906 +0,0 @@
-diff -up gnome-applets-2.21.4/trashapplet/src/trash-monitor.c.giotrash gnome-applets-2.21.4/trashapplet/src/trash-monitor.c
---- gnome-applets-2.21.4/trashapplet/src/trash-monitor.c.giotrash 2007-11-27 03:48:48.000000000 -0500
-+++ gnome-applets-2.21.4/trashapplet/src/trash-monitor.c 2008-01-22 23:14:52.000000000 -0500
-@@ -22,14 +22,12 @@
-
- #include "trash-monitor.h"
- #include <string.h>
--#include <libgnomevfs/gnome-vfs.h>
-+#include <gio/gio.h>
-
- struct _TrashMonitor {
- GObject parent;
--
-- GHashTable *volumes;
-+ GFileMonitor *file_monitor;
- gint total_item_count;
-- gint notify_id;
- };
-
- struct _TrashMonitorClass {
-@@ -38,16 +36,6 @@ struct _TrashMonitorClass {
- void (* item_count_changed) (TrashMonitor *monitor);
- };
-
--typedef struct {
-- TrashMonitor *monitor;
-- GnomeVFSVolume *volume;
-- gchar *trash_uri;
-- GnomeVFSAsyncHandle *find_handle;
-- GnomeVFSMonitorHandle *trash_change_monitor;
-- gint item_count;
--} VolumeInfo;
--
--
- static void trash_monitor_init (TrashMonitor *monitor);
- static void trash_monitor_class_init (TrashMonitorClass *class);
-
-@@ -59,21 +47,14 @@ static GObjectClass *parent_class;
- static guint signals[LAST_SIGNAL];
-
-
--static void volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
-- GnomeVFSVolume *volume,
-- TrashMonitor *monitor);
--static void volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
-- GnomeVFSVolume *volume,
-- TrashMonitor *monitor);
--
--static void add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
--static void remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
--
--static void trash_changed_queue_notify (TrashMonitor *monitor);
-+static void file_changed (GFileMonitor *monitor,
-+ GFile *child,
-+ GFile *other_child,
-+ GFileMonitorEvent event_type,
-+ gpointer user_data);
-
- G_DEFINE_TYPE (TrashMonitor, trash_monitor, G_TYPE_OBJECT)
-
--
- static void
- trash_monitor_class_init (TrashMonitorClass *class)
- {
-@@ -90,32 +71,62 @@ trash_monitor_class_init (TrashMonitorCl
- }
-
- static void
--trash_monitor_init (TrashMonitor *monitor)
-+count_children (TrashMonitor *monitor,
-+ GFile *file)
- {
-- GnomeVFSVolumeMonitor *volume_monitor;
-- GList *volumes, *tmp;
-+ GFileEnumerator *enumerator;
-+ GError *error = NULL;
-+ GFileInfo *info;
-+ gint count;
-
-- monitor->volumes = g_hash_table_new (NULL, NULL);
- monitor->total_item_count = 0;
-- monitor->notify_id = 0;
-
-- volume_monitor = gnome_vfs_get_volume_monitor ();
-+ enumerator = g_file_enumerate_children (file,
-+ G_FILE_ATTRIBUTE_STANDARD_TYPE,
-+ G_FILE_QUERY_INFO_NONE,
-+ NULL, &error);
-+
-+ count = 0;
-+
-+ if (error)
-+ {
-+ g_print ("failed to count trash content: %s\n", error->message);
-+ return;
-+ }
-
-- g_signal_connect_object (volume_monitor, "volume_mounted",
-- G_CALLBACK (volume_mounted_callback),
-- monitor, 0);
-- g_signal_connect_object (volume_monitor, "volume_pre_unmount",
-- G_CALLBACK (volume_unmount_started_callback),
-- monitor, 0);
--
-- volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
-- for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
-- GnomeVFSVolume *volume = tmp->data;
-+ while (1)
-+ {
-+ info = g_file_enumerator_next_file (enumerator, NULL, &error);
-+ if (error)
-+ {
-+ g_print ("failed to count trash content: %s\n", error->message);
-+ return;
-+ }
-+ if (!info)
-+ break;
-
-- add_volume (monitor, volume);
-- gnome_vfs_volume_unref (volume);
-- }
-- g_list_free (volumes);
-+ g_object_unref (info);
-+ count++;
-+ }
-+
-+ monitor->total_item_count = count;
-+ g_object_unref (enumerator);
-+}
-+
-+static void
-+trash_monitor_init (TrashMonitor *monitor)
-+{
-+ GFile *location;
-+
-+ monitor->total_item_count = 0;
-+
-+ location = g_file_new_for_uri ("trash:///");
-+ count_children (monitor, location);
-+ monitor->file_monitor = g_file_monitor_directory (location, 0, NULL, NULL);
-+ g_object_unref (location);
-+
-+ g_signal_connect_object (monitor->file_monitor, "changed",
-+ G_CALLBACK (file_changed), monitor, 0);
- }
-
- TrashMonitor *
-@@ -130,293 +141,157 @@ trash_monitor_get (void)
- }
-
- static void
--volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
-- GnomeVFSVolume *volume,
-- TrashMonitor *monitor)
-+file_changed (GFileMonitor *file_monitor,
-+ GFile *child,
-+ GFile *other_file,
-+ GFileMonitorEvent event_type,
-+ gpointer user_data)
- {
-- add_volume (monitor, volume);
--}
--
--static void
--volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
-- GnomeVFSVolume *volume,
-- TrashMonitor *monitor)
--{
-- remove_volume (monitor, volume);
--}
--
--static void
--trash_dir_changed (GnomeVFSMonitorHandle *handle,
-- const gchar *monitor_uri,
-- const gchar *info_uri,
-- GnomeVFSMonitorEventType type,
-- gpointer user_data)
--{
-- VolumeInfo *volinfo;
-- GnomeVFSResult res;
-- GList *dirlist, *tmp;
-- gint count = 0;
--
-- volinfo = user_data;
--
-- res = gnome_vfs_directory_list_load (&dirlist, volinfo->trash_uri,
-- GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-- if (res != GNOME_VFS_OK) {
-- g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
-- return;
-- }
--
-- for (tmp = dirlist; tmp != NULL; tmp = tmp->next) {
-- GnomeVFSFileInfo *info = tmp->data;
--
-- if (!strcmp (info->name, ".") || !strcmp (info->name, ".."))
-- continue;
-- count++;
-- }
-- gnome_vfs_file_info_list_free (dirlist);
--
-- if (count != volinfo->item_count) {
-- volinfo->item_count = count;
-- trash_changed_queue_notify (volinfo->monitor);
-- }
--}
--
--static void
--find_directory_callback (GnomeVFSAsyncHandle *handle,
-- GList *results,
-- gpointer callback_data)
--{
-- VolumeInfo *volinfo;
-- GnomeVFSFindDirectoryResult *result;
-- GnomeVFSResult res;
--
-- volinfo = callback_data;
--
-- /* we are done finding the volume */
-- volinfo->find_handle = NULL;
--
-- /* If we can't find the trash, ignore it silently. */
-- result = results->data;
-- if (result->result != GNOME_VFS_OK)
-- return;
-+ TrashMonitor *monitor;
-
-- volinfo->trash_uri = gnome_vfs_uri_to_string (result->uri,
-- GNOME_VFS_URI_HIDE_NONE);
-- /* g_message ("found trash dir: %s", volinfo->trash_uri); */
--
-- /* simulate a change to update the directory count */
-- trash_dir_changed (NULL, NULL, NULL, GNOME_VFS_MONITOR_EVENT_CHANGED,
-- volinfo);
--
-- res = gnome_vfs_monitor_add (&volinfo->trash_change_monitor,
-- volinfo->trash_uri, GNOME_VFS_MONITOR_DIRECTORY,
-- trash_dir_changed,
-- volinfo);
--
-- if (res != GNOME_VFS_OK) {
-- g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
-- volinfo->trash_change_monitor = NULL;
-- }
--}
-+ monitor = TRASH_MONITOR (user_data);
-
--static gboolean
--get_trash_volume (TrashMonitor *monitor,
-- GnomeVFSVolume *volume,
-- VolumeInfo **volinfo,
-- GnomeVFSURI **mount_uri)
--{
-- char *uri_str;
--
-- *volinfo = g_hash_table_lookup (monitor->volumes, volume);
--
-- if (*volinfo != NULL && (*volinfo)->trash_uri != NULL)
-- return FALSE;
--
-- if (!gnome_vfs_volume_handles_trash (volume))
-- return FALSE;
--
-- uri_str = gnome_vfs_volume_get_activation_uri (volume);
-- *mount_uri = gnome_vfs_uri_new (uri_str);
-- g_free (uri_str);
--
-- if (*volinfo == NULL) {
-- *volinfo = g_new0 (VolumeInfo, 1);
-- (*volinfo)->monitor = monitor;
-- (*volinfo)->volume = gnome_vfs_volume_ref (volume);
-- g_hash_table_insert (monitor->volumes, volume, *volinfo);
-- }
--
-- return TRUE;
-+ switch (event_type)
-+ {
-+ case G_FILE_MONITOR_EVENT_DELETED:
-+ monitor->total_item_count--;
-+ g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
-+ break;
-+ case G_FILE_MONITOR_EVENT_CREATED:
-+ monitor->total_item_count++;
-+ g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
-+ break;
-+ default: ;
-+ }
- }
-
--static void
--add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
-+typedef struct _EmptyTrashJob EmptyTrashJob;
-+struct _EmptyTrashJob
- {
-- VolumeInfo *volinfo;
-- GnomeVFSURI *mount_uri;
-- GList vfs_uri_as_list;
-+ GCancellable *cancellable;
-+ GList *trash_dirs;
-+ gint ref_count;
-+};
-
-- if (!get_trash_volume (monitor, volume, &volinfo, &mount_uri))
-- return;
-+static EmptyTrashJob *
-+empty_trash_job_new (void)
-+{
-+ EmptyTrashJob *job;
-
-- if (volinfo->find_handle) {
-- /* already searchinf for trash */
-- gnome_vfs_uri_unref (mount_uri);
-- return;
-- }
-+ job = g_new0 (EmptyTrashJob, 1);
-+ job->ref_count = 1;
-
--
-- vfs_uri_as_list.data = mount_uri;
-- vfs_uri_as_list.next = NULL;
-- vfs_uri_as_list.prev = NULL;
--
-- gnome_vfs_async_find_directory (&volinfo->find_handle, &vfs_uri_as_list,
-- GNOME_VFS_DIRECTORY_KIND_TRASH,
-- FALSE, TRUE, 0777,
-- GNOME_VFS_PRIORITY_DEFAULT,
-- find_directory_callback, volinfo);
-- gnome_vfs_uri_unref (mount_uri);
-+ return job;
- }
-
- static void
--remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
-+empty_trash_job_ref (EmptyTrashJob *job)
- {
-- VolumeInfo *volinfo;
--
-- volinfo = g_hash_table_lookup (monitor->volumes, volume);
-- if (volinfo != NULL) {
-- g_hash_table_remove (monitor->volumes, volume);
--
-- /* g_message ("removing volume %s", volinfo->trash_uri); */
-- if (volinfo->find_handle != NULL)
-- gnome_vfs_async_cancel (volinfo->find_handle);
-- if (volinfo->trash_change_monitor != NULL)
-- gnome_vfs_monitor_cancel (volinfo->trash_change_monitor);
--
-- if (volinfo->trash_uri)
-- g_free (volinfo->trash_uri);
--
-- /* if this volume contained some trash, then notify that the trash
-- * state has changed */
-- if (volinfo->item_count != 0)
-- trash_changed_queue_notify (monitor);
--
-- gnome_vfs_volume_unref (volinfo->volume);
-- g_free (volinfo);
-- }
-+ job->ref_count++;
- }
-
--/* --- */
--
- static void
--readd_volumes (gpointer key, gpointer value, gpointer user_data)
-+empty_trash_job_unref (EmptyTrashJob *job)
- {
-- TrashMonitor *monitor = user_data;
-- GnomeVFSVolume *volume;
-+ job->ref_count--;
-+ if (job->ref_count == 0)
-+ {
-+ g_list_foreach (job->trash_dirs, (GFunc)g_object_unref, NULL);
-+ g_list_free (job->trash_dirs);
-
-- volume = key;
-- add_volume (monitor, volume);
--}
--void
--trash_monitor_recheck_trash_dirs (TrashMonitor *monitor)
--{
-- /* call add_volume() on each volume, to add trash dirs where missing */
-- g_hash_table_foreach (monitor->volumes, readd_volumes, monitor);
-+ g_object_unref (job->cancellable);
-+ g_free (job);
-+ }
- }
-
--/* --- */
--
--void
--trash_monitor_empty_trash (TrashMonitor *monitor,
-- GnomeVFSAsyncHandle **handle,
-- GnomeVFSAsyncXferProgressCallback func,
-- gpointer user_data)
--{
-- GList *trash_dirs = NULL, *volumes, *tmp;
-- GnomeVFSVolume *volume;
-- GnomeVFSURI *mount_uri, *trash_uri;
-- gchar *uri_str;
--
-- /* collect the trash directories */
-- volumes = gnome_vfs_volume_monitor_get_mounted_volumes (gnome_vfs_get_volume_monitor ());
-- for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
-- volume = tmp->data;
-- if (gnome_vfs_volume_handles_trash (volume)) {
-- /* get the mount point for this volume */
-- uri_str = gnome_vfs_volume_get_activation_uri (volume);
-- mount_uri = gnome_vfs_uri_new (uri_str);
-- g_free (uri_str);
--
-- g_assert (mount_uri != NULL);
--
-- /* Look for the trash directory. Since we tell it not to create or
-- * look for the dir, it doesn't block. */
-- if (gnome_vfs_find_directory (mount_uri,
-- GNOME_VFS_DIRECTORY_KIND_TRASH, &trash_uri,
-- FALSE, FALSE, 0777) == GNOME_VFS_OK) {
-- trash_dirs = g_list_prepend (trash_dirs, trash_uri);
-- }
-- gnome_vfs_uri_unref (mount_uri);
-- }
-- gnome_vfs_volume_unref (volume);
-- }
-- g_list_free (volumes);
-+static void
-+delete_trash_file (EmptyTrashJob *job,
-+ GFile *file,
-+ gboolean del_dir)
-+{
-+ GFileInfo *info;
-+ GFile *child;
-+ GFileEnumerator *enumerator;
-
-- if (trash_dirs != NULL)
-- gnome_vfs_async_xfer (handle, trash_dirs, NULL,
-- GNOME_VFS_XFER_EMPTY_DIRECTORIES,
-- GNOME_VFS_XFER_ERROR_MODE_ABORT,
-- GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-- GNOME_VFS_PRIORITY_DEFAULT,
-- func, user_data, NULL, NULL);
-- gnome_vfs_uri_list_free (trash_dirs);
--}
-+ if (g_cancellable_is_cancelled (job->cancellable))
-+ return;
-
-+ /* FIXME: progress */
-
--/* --- */
-+ enumerator = g_file_enumerate_children (file,
-+ G_FILE_ATTRIBUTE_STANDARD_NAME,
-+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+ job->cancellable,
-+ NULL);
-+ if (enumerator)
-+ {
-+ while ((info = g_file_enumerator_next_file (enumerator, job->cancellable, NULL)) != NULL)
-+ {
-+ child = g_file_get_child (file,
-+ g_file_info_get_name (info));
-+ delete_trash_file (job, child, TRUE);
-+ g_object_unref (child);
-+ g_object_unref (info);
-+
-+ if (g_cancellable_is_cancelled (job->cancellable))
-+ break;
-+ }
-
--static void
--count_items (gpointer key, gpointer value, gpointer user_data)
--{
-- VolumeInfo *volinfo;
-- gint *item_count;
-+ g_object_unref (enumerator);
-+ }
-
-- volinfo = value;
-- item_count = user_data;
-- *item_count += volinfo->item_count;
-+ if (!g_cancellable_is_cancelled (job->cancellable) && del_dir)
-+ g_file_delete (file, job->cancellable, NULL);
- }
-
- static gboolean
--trash_changed_notify (gpointer user_data)
-+empty_trash_job_done (gpointer user_data)
- {
-- TrashMonitor *monitor = user_data;
-- gint item_count;
-+ EmptyTrashJob *job = user_data;
-
-- /* reset notification id */
-- monitor->notify_id = 0;
-+ /* FIXME finish progress */
-
-- /* count the volumes */
-- item_count = 0;
-- g_hash_table_foreach (monitor->volumes, count_items, &item_count);
--
-- /* if the item count has changed ... */
-- if (item_count != monitor->total_item_count) {
-- monitor->total_item_count = item_count;
-- /* g_message ("item count is %d", item_count); */
-- g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
-- }
-+ empty_trash_job_unref (job);
-
- return FALSE;
- }
-
- static void
--trash_changed_queue_notify (TrashMonitor *monitor)
-+empty_trash_job (GIOSchedulerJob *io_job,
-+ GCancellable *cancellable,
-+ gpointer user_data)
- {
-- /* already queued */
-- if (monitor->notify_id != 0)
-- return;
-+ EmptyTrashJob *job = user_data;
-+ GList *l;
-
-- monitor->notify_id = g_idle_add (trash_changed_notify, monitor);
-+ /* FIXME start progress */
-+
-+ for (l = job->trash_dirs;
-+ l && !g_cancellable_is_cancelled (cancellable);
-+ l = l->next)
-+ delete_trash_file (job, l->data, FALSE);
-+
-+ empty_trash_job_ref (job);
-+ g_io_scheduler_job_send_to_mainloop_async (io_job,
-+ empty_trash_job_done,
-+ job,
-+ (GDestroyNotify)empty_trash_job_unref);
-+}
-+
-+void
-+trash_monitor_empty_trash (TrashMonitor *monitor,
-+ GCancellable *cancellable,
-+ gpointer func,
-+ gpointer user_data)
-+{
-+ EmptyTrashJob *job;
-+
-+ job = empty_trash_job_new ();
-+ job->cancellable = g_object_ref (cancellable);
-+ job->trash_dirs = g_list_prepend (job->trash_dirs,
-+ g_file_new_for_uri ("trash:"));
-+
-+ g_io_scheduler_push_job (empty_trash_job, job, (GDestroyNotify)empty_trash_job_unref, 0, cancellable);
- }
-
- int
-@@ -433,11 +308,6 @@ main (int argc, char **argv)
- {
- TrashMonitor *monitor;
-
-- if (!gnome_vfs_init ()) {
-- g_printerr ("Can not initialise gnome-vfs.\n");
-- return 1;
-- }
--
- monitor = trash_monitor_get ();
-
- g_main_loop_run (g_main_loop_new (NULL, FALSE));
-diff -up gnome-applets-2.21.4/trashapplet/src/Makefile.am.giotrash gnome-applets-2.21.4/trashapplet/src/Makefile.am
---- gnome-applets-2.21.4/trashapplet/src/Makefile.am.giotrash 2007-11-27 03:48:48.000000000 -0500
-+++ gnome-applets-2.21.4/trashapplet/src/Makefile.am 2008-01-22 23:14:52.000000000 -0500
-@@ -1,6 +1,6 @@
- INCLUDES = -I$(top_srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-- $(GNOME_VFS_APPLETS_CFLAGS) \
-+ $(GIO_CFLAGS) \
- $(LIBGLADE_CFLAGS)
-
- libexec_PROGRAMS = trashapplet
-@@ -13,7 +13,7 @@ trashapplet_SOURCES = \
- xstuff.c \
- xstuff.h
-
--trashapplet_LDADD = \
-- $(GNOME_APPLETS_LIBS) \
-- $(GNOME_VFS_APPLETS_LIBS) \
-+trashapplet_LDADD = \
-+ $(GNOME_APPLETS_LIBS) \
-+ $(GIO_LIBS) \
- $(LIBGLADE_LIBS)
-diff -up gnome-applets-2.21.4/trashapplet/src/trashapplet.c.giotrash gnome-applets-2.21.4/trashapplet/src/trashapplet.c
---- gnome-applets-2.21.4/trashapplet/src/trashapplet.c.giotrash 2007-11-27 03:48:48.000000000 -0500
-+++ gnome-applets-2.21.4/trashapplet/src/trashapplet.c 2008-01-22 23:14:52.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <gconf/gconf-client.h>
- #include <libgnome/gnome-help.h>
- #include <glade/glade.h>
-+#include <gio/gio.h>
-
- #include "trashapplet.h"
- #include "trash-monitor.h"
-@@ -118,9 +119,6 @@ trash_applet_class_init (TrashAppletClas
- static void
- trash_applet_init (TrashApplet *applet)
- {
-- GnomeVFSResult res;
-- GnomeVFSURI *trash_uri;
--
- gtk_window_set_default_icon_name (TRASH_ICON_FULL);
-
- panel_applet_set_flags (PANEL_APPLET (applet),
-@@ -148,20 +146,6 @@ trash_applet_init (TrashApplet *applet)
- gtk_widget_show (applet->image);
- applet->icon_state = TRASH_STATE_UNKNOWN;
-
-- /* create local trash directory if needed */
-- res = gnome_vfs_find_directory (NULL,
-- GNOME_VFS_DIRECTORY_KIND_TRASH,
-- &trash_uri,
-- TRUE,
-- TRUE,
-- 0700);
-- if (trash_uri)
-- gnome_vfs_uri_unref (trash_uri);
-- if (res != GNOME_VFS_OK) {
-- g_warning (_("Unable to find the Trash directory: %s"),
-- gnome_vfs_result_to_string (res));
-- }
--
- /* set up trash monitor */
- applet->monitor = trash_monitor_get ();
- applet->monitor_signal_id =
-@@ -239,6 +223,7 @@ trash_applet_change_orient (PanelApplet
- break;
- case PANEL_APPLET_ORIENT_UP:
- case PANEL_APPLET_ORIENT_DOWN:
-+ default:
- applet->orient = GTK_ORIENTATION_HORIZONTAL;
- new_size = GTK_WIDGET (applet)->allocation.height;
- break;
-@@ -503,6 +488,7 @@ error_dialog (TrashApplet *applet, const
- g_free (error_string);
- }
-
-+#if 0
- static gint
- update_transfer_callback (GnomeVFSAsyncHandle *handle,
- GnomeVFSXferProgressInfo *progress_info,
-@@ -561,6 +547,7 @@ update_transfer_callback (GnomeVFSAsyncH
-
- return 1;
- }
-+#endif
-
- /* this function is based on the one with the same name in
- libnautilus-private/nautilus-file-operations.c */
-@@ -627,12 +614,9 @@ confirm_empty_trash (GtkWidget *parent_v
- }
-
- static void
--on_empty_trash_cancel (GtkWidget *widget, GnomeVFSAsyncHandle **handle)
-+on_empty_trash_cancel (GtkWidget *widget, GCancellable *cancellable)
- {
-- if (handle != NULL) {
-- gnome_vfs_async_cancel ((GnomeVFSAsyncHandle *) handle);
-- }
--
-+ g_cancellable_cancel (cancellable);
- gtk_widget_hide (widget);
- }
-
-@@ -643,7 +627,7 @@ trash_applet_do_empty (BonoboUIComponent
- {
- GtkWidget *dialog;
-
-- GnomeVFSAsyncHandle *hnd;
-+ GCancellable *cancellable;
-
- g_return_if_fail (TRASH_IS_APPLET (applet));
-
-@@ -656,16 +640,17 @@ trash_applet_do_empty (BonoboUIComponent
- if (!applet->xml)
- applet->xml = glade_xml_new (GNOME_GLADEDIR "/trashapplet.glade", NULL, NULL);
-
-- dialog = glade_xml_get_widget(applet->xml, "empty_trash");
-+ dialog = glade_xml_get_widget (applet->xml, "empty_trash");
-
-- g_signal_connect(dialog, "response", G_CALLBACK (on_empty_trash_cancel), &hnd);
-+ cancellable = g_cancellable_new ();
-+ g_signal_connect (dialog, "response", G_CALLBACK (on_empty_trash_cancel), cancellable);
-
-- gtk_widget_show_all(dialog);
-+ gtk_widget_show_all (dialog);
-
- trash_monitor_empty_trash (applet->monitor,
-- &hnd, update_transfer_callback, applet);
-+ cancellable, NULL, applet);
-
-- gtk_widget_hide(dialog);
-+ gtk_widget_hide (dialog);
-
- }
-
-@@ -846,80 +831,50 @@ trash_applet_drag_data_received (GtkWidg
- guint time_)
- {
- TrashApplet *applet = TRASH_APPLET (widget);
-- GList *list, *scan;
-- GList *source_uri_list, *target_uri_list, *unmovable_uri_list;
-- GnomeVFSResult result;
--
-- list = gnome_vfs_uri_list_parse ((gchar *)selectiondata->data);
--
-- source_uri_list = NULL;
-- target_uri_list = NULL;
-- unmovable_uri_list = NULL;
-- for (scan = g_list_first (list); scan; scan = g_list_next (scan)) {
-- GnomeVFSURI *source_uri = scan->data;
-- GnomeVFSURI *trash_uri, *target_uri;
-- gchar *source_basename;
--
-- /* find the trash directory for this file */
-- result = gnome_vfs_find_directory (source_uri,
-- GNOME_VFS_DIRECTORY_KIND_TRASH,
-- &trash_uri, TRUE, FALSE, 0);
-- if (result != GNOME_VFS_OK) {
-- unmovable_uri_list = g_list_prepend (unmovable_uri_list,
-- gnome_vfs_uri_ref (source_uri));
-- continue;
-+ gchar **list;
-+ gint i;
-+ GList *trashed = NULL;
-+ GList *untrashable = NULL;
-+ GList *l;
-+ GError *error = NULL;
-+
-+ list = g_uri_list_extract_uris ((gchar *)selectiondata->data);
-+
-+ for (i = 0; list[i]; i++) {
-+ GFile *file;
-+
-+ file = g_file_new_for_uri (list[i]);
-+ if (!g_file_trash (file, NULL, NULL)) {
-+ untrashable = g_list_prepend (untrashable, file);
- }
--
-- source_basename = gnome_vfs_uri_extract_short_name
-- (source_uri);
--
-- target_uri = gnome_vfs_uri_append_file_name(trash_uri,
-- source_basename);
-- g_free (source_basename);
-- gnome_vfs_uri_unref (trash_uri);
--
-- source_uri_list = g_list_prepend (source_uri_list,
-- gnome_vfs_uri_ref (source_uri));
-- target_uri_list = g_list_prepend (target_uri_list,
-- target_uri);
-- }
--
-- gnome_vfs_uri_list_free(list);
--
-- /* we might have added a trash dir, so recheck */
-- trash_monitor_recheck_trash_dirs (applet->monitor);
--
-- if (source_uri_list) {
-- result = gnome_vfs_xfer_uri_list (source_uri_list, target_uri_list,
-- GNOME_VFS_XFER_REMOVESOURCE |
-- GNOME_VFS_XFER_RECURSIVE,
-- GNOME_VFS_XFER_ERROR_MODE_ABORT,
-- GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-- NULL, NULL);
-- gnome_vfs_uri_list_free (source_uri_list);
-- gnome_vfs_uri_list_free (target_uri_list);
-- if (result != GNOME_VFS_OK) {
-- error_dialog (applet, _("Unable to move to trash:\n%s"),
-- gnome_vfs_result_to_string (result));
-+ else {
-+ trashed = g_list_prepend (trashed, file);
- }
- }
-- if (unmovable_uri_list) {
-- if (confirm_delete_immediately (widget,
-- g_list_length (unmovable_uri_list),
-- source_uri_list == NULL)) {
-- result = gnome_vfs_xfer_delete_list (unmovable_uri_list,
-- GNOME_VFS_XFER_ERROR_MODE_ABORT,
-- GNOME_VFS_XFER_RECURSIVE,
-- NULL, NULL);
-- } else {
-- result = GNOME_VFS_OK;
-- }
-- gnome_vfs_uri_list_free (unmovable_uri_list);
-- if (result != GNOME_VFS_OK) {
-- error_dialog (applet, _("Unable to move to trash:\n%s"),
-- gnome_vfs_result_to_string (result));
-+
-+ if (untrashable) {
-+ if (confirm_delete_immediately (widget,
-+ g_list_length (untrashable),
-+ trashed == NULL)) {
-+ for (l = untrashable; l; l = l->next) {
-+ if (!g_file_delete (l->data, NULL, &error)) {
-+ error_dialog (applet,
-+ _("Unable to delete '%s': %s"),
-+ g_file_get_uri (l->data),
-+ error->message);
-+ g_clear_error (&error);
-+ }
-+ }
- }
- }
-+
-+ g_list_foreach (untrashable, (GFunc)g_object_unref, NULL);
-+ g_list_free (untrashable);
-+ g_list_foreach (trashed, (GFunc)g_object_unref, NULL);
-+ g_list_free (trashed);
-+
-+ g_strfreev (list);
-+
- gtk_drag_finish (context, TRUE, FALSE, time_);
- }
-
-@@ -951,6 +906,8 @@ trash_applet_factory (PanelApplet *apple
- int
- main (int argc, char *argv [])
- {
-+ g_thread_init (NULL);
-+
- /* gettext stuff */
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-diff -up gnome-applets-2.21.4/trashapplet/src/trash-monitor.h.giotrash gnome-applets-2.21.4/trashapplet/src/trash-monitor.h
---- gnome-applets-2.21.4/trashapplet/src/trash-monitor.h.giotrash 2007-11-27 03:48:48.000000000 -0500
-+++ gnome-applets-2.21.4/trashapplet/src/trash-monitor.h 2008-01-22 23:14:52.000000000 -0500
-@@ -23,7 +23,7 @@
- #ifndef __TRASH_MONITOR_H__
- #define __TRASH_MONITOR_H__
-
--#include <libgnomevfs/gnome-vfs.h>
-+#include <gio/gio.h>
-
- typedef struct _TrashMonitor TrashMonitor;
- typedef struct _TrashMonitorClass TrashMonitorClass;
-@@ -41,9 +41,9 @@ TrashMonitor *trash_monitor_get (v
- /* check if new trash dirs have been created */
- void trash_monitor_recheck_trash_dirs (TrashMonitor *monitor);
- void trash_monitor_empty_trash (TrashMonitor *monitor,
-- GnomeVFSAsyncHandle **handle,
-- GnomeVFSAsyncXferProgressCallback func,
-- gpointer user_data);
-+ GCancellable *cancellable,
-+ gpointer func,
-+ gpointer user_data);
- int trash_monitor_get_item_count (TrashMonitor *monitor);
-
- #endif
-diff -up gnome-applets-2.21.4/Makefile.am.giotrash gnome-applets-2.21.4/Makefile.am
---- gnome-applets-2.21.4/Makefile.am.giotrash 2008-01-12 19:32:14.000000000 -0500
-+++ gnome-applets-2.21.4/Makefile.am 2008-01-22 23:14:52.000000000 -0500
-@@ -7,8 +7,7 @@ endif
-
- vfs_applets = \
- drivemount \
-- gweather \
-- trashapplet
-+ gweather
- if BUILD_GNOME_VFS_APPLETS
- vfs_SUBDIRS = $(vfs_applets)
- endif
-@@ -45,12 +44,13 @@ if BUILD_INVEST_APPLET
- invest_applet_SUBDIR = invest-applet
- endif
-
--always_built_SUBDIRS = \
-+always_built_SUBDIRS = \
- charpick \
- geyes \
- mini-commander \
- gkb-new \
- stickynotes \
-+ trashapplet \
- null_applet
-
- SUBDIRS = \
-diff -up gnome-applets-2.21.4/configure.in.giotrash gnome-applets-2.21.4/configure.in
---- gnome-applets-2.21.4/configure.in.giotrash 2008-01-22 23:14:52.000000000 -0500
-+++ gnome-applets-2.21.4/configure.in 2008-01-22 23:17:06.000000000 -0500
-@@ -13,6 +13,7 @@ dnl *** Minimum library versions for GNO
- dnl ***************************************************************************
- GTK_REQUIRED=2.11.0
- GLIB_REQUIRED=2.13.0
-+GIO_REQUIRED=2.15.3
- LIBGNOME_REQUIRED=2.8.0
- LIBGNOMEUI_REQUIRED=2.8.0
- GNOME_VFS_REQUIRED=2.15.4
-@@ -110,6 +111,11 @@ PKG_CHECK_MODULES(GAILUTIL, gail >= $LIB
- AC_SUBST(GAILUTIL_CFLAGS)
- AC_SUBST(GAILUTIL_LIBS)
-
-+dnl -- check for gio (required) ------------------------------------------
-+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
-+AC_SUBST(GIO_CFLAGS)
-+AC_SUBST(GIO_LIBS)
-+
- dnl -- Check for GTK+ 2.0 (required) ------------------------------------------
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
- AC_SUBST(GTK_FLAGS)
diff --git a/vertical-invest.patch b/vertical-invest.patch
deleted file mode 100644
index 5f11794..0000000
--- a/vertical-invest.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -up gnome-applets-2.21.4/invest-applet/invest/applet.py.vertical gnome-applets-2.21.4/invest-applet/invest/applet.py
---- gnome-applets-2.21.4/invest-applet/invest/applet.py.vertical 2008-01-21 23:24:51.000000000 -0500
-+++ gnome-applets-2.21.4/invest-applet/invest/applet.py 2008-01-21 23:24:55.000000000 -0500
-@@ -45,8 +45,15 @@ class InvestApplet:
-
- self.investwidget.connect('row-activated', lambda treeview, path, view_column: self.tb.set_active(False))
- get_quotes_updater().connect('quotes-updated', self._on_quotes_updated)
--
-- box = gtk.HBox()
-+
-+ applet.connect('change-orient', self._on_orient_changed)
-+
-+ orient = applet.get_orient()
-+ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
-+ box = gtk.VBox()
-+ else:
-+ box = gtk.HBox()
-+
- box.add(self.tb)
- box.add(self.investticker)
-
-@@ -68,6 +75,22 @@ class InvestApplet:
- def on_refresh(self, component, verb):
- get_quotes_updater().refresh()
-
-+ def _on_orient_changed(self, applet, orient):
-+ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
-+ box = gtk.VBox()
-+ else:
-+ box = gtk.HBox()
-+
-+ oldbox = self.investticker.parent
-+ self.investticker.reparent(box)
-+ self.tb = ToggleButton(applet, self.pw)
-+ box.add(self.tb)
-+
-+ box.show_all()
-+ self.applet.remove(oldbox)
-+ self.applet.add(box)
-+
-+
- def _on_quotes_updated(self, updater):
- pass
- #invest.dbusnotification.notify(
-@@ -93,10 +116,13 @@ class ToggleButton(gtk.ToggleButton):
- except Exception, msg:
- image.set_from_icon_name("stock_chart", gtk.ICON_SIZE_BUTTON)
-
-- hbox = gtk.HBox()
-- hbox.pack_start(image)
--
- orient = applet.get_orient()
-+ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
-+ box = gtk.VBox()
-+ else:
-+ box = gtk.HBox()
-+
-+ box.pack_start(image)
- arrow_dir = gtk.ARROW_DOWN
- if orient == gnomeapplet.ORIENT_RIGHT:
- arrow_dir = gtk.ARROW_RIGHT
-@@ -107,9 +133,9 @@ class ToggleButton(gtk.ToggleButton):
- elif orient == gnomeapplet.ORIENT_UP:
- arrow_dir = gtk.ARROW_UP
-
-- hbox.pack_start(gtk.Arrow(arrow_dir, gtk.SHADOW_NONE))
-+ box.pack_start(gtk.Arrow(arrow_dir, gtk.SHADOW_NONE))
-
-- self.add(hbox)
-+ self.add(box)
-
- def toggled(self, togglebutton):
- if togglebutton.get_active():
commit 85d50d05a2d8954086b1b3b7c86be31e011e8681
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue May 13 17:48:00 2008 +0000
2.23.2
diff --git a/.cvsignore b/.cvsignore
index 56cdaac..475b1f0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.22.1.tar.bz2
+gnome-applets-2.23.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5bc1121..4aeb10c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.22.1
-Release: 3%{?dist}
+Version: 2.23.2
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -344,6 +344,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Tue May 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.23.2-1
+- Update to 2.23.2
+
* Tue May 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-3
- Drop gnome-netstatus dependency (#445059)
diff --git a/sources b/sources
index 89c33c0..136a229 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d6df0a48c875b77a4fafe47fc81bde29 gnome-applets-2.22.1.tar.bz2
+b2fc9f167abceadd0b1ec576871bfa8b gnome-applets-2.23.2.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit bfa8b0b524f3740ed57cbe445d88becef9eba143
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue May 6 23:08:08 2008 +0000
drop gnome-netstatus dependency
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0a1ece0..5bc1121 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.22.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -136,9 +136,6 @@ Requires(post): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-# For wireless-applet backwards compat
-Requires: gnome-netstatus >= 2.8.0-2
-
# For cpufreq-selector
Requires: usermode
Source10: cpufreq-selector.app
@@ -347,6 +344,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Tue May 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-3
+- Drop gnome-netstatus dependency (#445059)
+
* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-2
- Reduce the trash icon size (#438620)
commit 716740c1501d86e465b971e6ac59674d645c9920
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 23 18:22:27 2008 +0000
reduce trash icon size
diff --git a/gnome-applets-trashiconsize.patch b/gnome-applets-trashiconsize.patch
new file mode 100644
index 0000000..c23ad3f
--- /dev/null
+++ b/gnome-applets-trashiconsize.patch
@@ -0,0 +1,18 @@
+diff -up gnome-applets-2.22.1/trashapplet/src/trashapplet.c.iconsize gnome-applets-2.22.1/trashapplet/src/trashapplet.c
+--- gnome-applets-2.22.1/trashapplet/src/trashapplet.c.iconsize 2008-04-23 13:58:38.000000000 -0400
++++ gnome-applets-2.22.1/trashapplet/src/trashapplet.c 2008-04-23 13:58:53.000000000 -0400
+@@ -160,12 +160,12 @@ trash_applet_size_allocate (GtkWidget
+ {
+ case PANEL_APPLET_ORIENT_LEFT:
+ case PANEL_APPLET_ORIENT_RIGHT:
+- gtk_image_set_pixel_size (applet->image, allocation->width);
++ gtk_image_set_pixel_size (applet->image, allocation->width - 2);
+ break;
+
+ case PANEL_APPLET_ORIENT_UP:
+ case PANEL_APPLET_ORIENT_DOWN:
+- gtk_image_set_pixel_size (applet->image, allocation->height);
++ gtk_image_set_pixel_size (applet->image, allocation->height - 2);
+ break;
+ }
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c9a7d3f..0a1ece0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -80,6 +80,9 @@ Patch44: gweather-gnome-vfs.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=517500
Patch50: keyboard-properties.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=529579
+Patch51: gnome-applets-trashiconsize.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -172,6 +175,7 @@ small utilities for the GNOME panel.
%patch42 -p1 -b .vertical-invest
%patch44 -p1 -b .gweather-gnome-vfs
%patch50 -p1 -b .keyboard-properties
+%patch51 -p1 -b .trashiconsize
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -343,6 +347,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-2
+- Reduce the trash icon size (#438620)
+
* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-1
- Update to 2.22.1
commit 3b3cce58d49028d67aa15d69d08bb36ae71b33a1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 8 00:51:38 2008 +0000
update patches
diff --git a/gweather-gnome-vfs.patch b/gweather-gnome-vfs.patch
index a10da16..c09973f 100644
--- a/gweather-gnome-vfs.patch
+++ b/gweather-gnome-vfs.patch
@@ -1,6 +1,25 @@
-diff -up gnome-applets-2.21.4/Makefile.am.gweather-gnome-vfs gnome-applets-2.21.4/Makefile.am
---- gnome-applets-2.21.4/Makefile.am.gweather-gnome-vfs 2008-01-25 22:21:25.000000000 -0500
-+++ gnome-applets-2.21.4/Makefile.am 2008-01-25 22:22:19.000000000 -0500
+diff -up gnome-applets-2.22.1/gweather/Makefile.am.gweather-gnome-vfs gnome-applets-2.22.1/gweather/Makefile.am
+--- gnome-applets-2.22.1/gweather/Makefile.am.gweather-gnome-vfs 2008-04-07 17:59:56.000000000 -0400
++++ gnome-applets-2.22.1/gweather/Makefile.am 2008-04-07 20:49:48.000000000 -0400
+@@ -7,7 +7,6 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -DGTK_ENABLE_BROKEN \
+ $(GNOME_APPLETS_CFLAGS) \
+- $(GNOME_VFS_APPLETS_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(LIBGWEATHER_CFLAGS)
+
+@@ -24,7 +23,6 @@ gweather_applet_2_SOURCES = \
+ gweather_applet_2_LDADD = \
+ $(LIBNOTIFY_LIBS) \
+ $(GNOME_APPLETS_LIBS) \
+- $(GNOME_VFS_APPLETS_LIBS) \
+ $(LIBGWEATHER_LIBS)
+
+ uidir = $(datadir)/gnome-2.0/ui
+diff -up gnome-applets-2.22.1/Makefile.am.gweather-gnome-vfs gnome-applets-2.22.1/Makefile.am
+--- gnome-applets-2.22.1/Makefile.am.gweather-gnome-vfs 2008-04-07 17:59:57.000000000 -0400
++++ gnome-applets-2.22.1/Makefile.am 2008-04-07 20:25:49.000000000 -0400
@@ -6,8 +6,7 @@ gtop_SUBDIRS = $(gtop_applets)
endif
@@ -19,22 +38,3 @@ diff -up gnome-applets-2.21.4/Makefile.am.gweather-gnome-vfs gnome-applets-2.21.
mini-commander \
gkb-new \
stickynotes \
-diff -up gnome-applets-2.21.4/gweather/Makefile.am.gweather-gnome-vfs gnome-applets-2.21.4/gweather/Makefile.am
---- gnome-applets-2.21.4/gweather/Makefile.am.gweather-gnome-vfs 2008-01-12 19:32:14.000000000 -0500
-+++ gnome-applets-2.21.4/gweather/Makefile.am 2008-01-25 22:21:25.000000000 -0500
-@@ -7,7 +7,6 @@ INCLUDES = \
- -I$(top_srcdir) \
- -DGTK_ENABLE_BROKEN \
- $(GNOME_APPLETS_CFLAGS) \
-- $(GNOME_VFS_APPLETS_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(XML2_CFLAGS) \
- $(LIBGWEATHER_CFLAGS) \
-@@ -27,7 +26,6 @@ gweather_applet_2_SOURCES = \
- gweather_applet_2_LDADD = \
- $(LIBNOTIFY_LIBS) \
- $(GNOME_APPLETS_LIBS) \
-- $(GNOME_VFS_APPLETS_LIBS) \
- $(XML2_LIBS) \
- $(LIBGWEATHER_LIBS)
-
commit cee86ee0d348348293ee51b40c70b5000a81fd8c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 7 23:56:22 2008 +0000
2.22.1
diff --git a/.cvsignore b/.cvsignore
index 5ab8e69..56cdaac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.22.0.tar.bz2
+gnome-applets-2.22.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index eef9d16..c9a7d3f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.22.0
-Release: 2%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -119,7 +119,7 @@ BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
-BuildRequires: libgweather-devel
+BuildRequires: libgweather-devel >= 2.22.1
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -343,6 +343,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.1-1
+- Update to 2.22.1
+
* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-2
- Fix a bug in the keyboard accessibility applet
diff --git a/sources b/sources
index 2137c43..89c33c0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cd31cc9171cc350e7d0074b1a8092fbd gnome-applets-2.22.0.tar.bz2
+d6df0a48c875b77a4fafe47fc81bde29 gnome-applets-2.22.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit befb24d032e22bd9178320e27942503c02e18b15
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 4 22:27:12 2008 +0000
add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e6b7e2d..eef9d16 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -77,6 +77,7 @@ Patch42: vertical-invest.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=511446
Patch44: gweather-gnome-vfs.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=517500
Patch50: keyboard-properties.patch
BuildRequires: glib2-devel >= %{glib2_version}
commit 9d9adefc9eb1163c8e52d6f0cbc403d3ad84d674
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 4 22:23:13 2008 +0000
Fix launching keyboard properties from accessx-status-applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5c0a836..e6b7e2d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -77,6 +77,8 @@ Patch42: vertical-invest.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=511446
Patch44: gweather-gnome-vfs.patch
+Patch50: keyboard-properties.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -168,6 +170,7 @@ small utilities for the GNOME panel.
%patch40 -p1 -b .battstat-null
%patch42 -p1 -b .vertical-invest
%patch44 -p1 -b .gweather-gnome-vfs
+%patch50 -p1 -b .keyboard-properties
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -339,6 +342,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-2
+- Fix a bug in the keyboard accessibility applet
+
* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-1
- Update to 2.22.0
diff --git a/keyboard-properties.patch b/keyboard-properties.patch
new file mode 100644
index 0000000..cddc6b7
--- /dev/null
+++ b/keyboard-properties.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.22.0/accessx-status/applet.c.keyboard-properties gnome-applets-2.22.0/accessx-status/applet.c
+--- gnome-applets-2.22.0/accessx-status/applet.c.keyboard-properties 2008-04-04 15:31:25.000000000 -0400
++++ gnome-applets-2.22.0/accessx-status/applet.c 2008-04-04 15:31:52.000000000 -0400
+@@ -204,6 +204,8 @@ dialog_cb (BonoboUIComponent *component,
+ &error);
+
+ if (error != NULL) {
++ g_error_free (error);
++ error = NULL;
+ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)),
+ "gnome-keyboard-properties --a11y",
+ &error);
commit 7c5f9caa7f5ad43659a330e8d68e2d67b761c336
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Mar 15 17:37:41 2008 +0000
fix silly typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6d2882b..5c0a836 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -338,7 +338,7 @@ fi
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%`changelog
+%changelog
* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-1
- Update to 2.22.0
commit 0dcf327b607d2e90c4a75790c8ce39557c28b603
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 10 17:51:26 2008 +0000
2.22.0
diff --git a/.cvsignore b/.cvsignore
index b857810..5ab8e69 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.21.92.tar.bz2
+gnome-applets-2.22.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 93efe69..6d2882b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.92
+Version: 2.22.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -338,7 +338,10 @@ fi
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%changelog
+%`changelog
+* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.22.0-1
+- Update to 2.22.0
+
* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.92-1
- Update to 2.21.92
diff --git a/sources b/sources
index dcf6996..2137c43 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-54a58919c72dfa7e6654f9932b482b36 gnome-applets-2.21.92.tar.bz2
+cd31cc9171cc350e7d0074b1a8092fbd gnome-applets-2.22.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit dcb4db29560c9f4e9bd9bcb20941530e2af841b0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 26 17:29:12 2008 +0000
fix patches
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0149a99..93efe69 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -74,8 +74,6 @@ Patch40: gnome-applets-null-battstat.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=382100
Patch42: vertical-invest.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=509759
-Patch43: trash-gio.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=511446
Patch44: gweather-gnome-vfs.patch
@@ -169,7 +167,6 @@ small utilities for the GNOME panel.
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
%patch42 -p1 -b .vertical-invest
-%patch43 -p1 -b .trash-gio
%patch44 -p1 -b .gweather-gnome-vfs
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
commit 6643550c32d3eac758118e72e2b162a14f30fab0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 26 17:03:09 2008 +0000
fix sources
diff --git a/sources b/sources
index 52b67e1..dcf6996 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
54a58919c72dfa7e6654f9932b482b36 gnome-applets-2.21.92.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 02ce5d99daad3912d02711185971c655e4922b66
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 26 16:22:50 2008 +0000
2.21.92
diff --git a/.cvsignore b/.cvsignore
index 38a5a40..b857810 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.21.91.tar.bz2
+gnome-applets-2.21.92.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index de8044b..0149a99 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.91
+Version: 2.21.92
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
@@ -342,6 +342,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.92-1
+- Update to 2.21.92
+
* Tue Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.91-1
- Update to 2.21.91
diff --git a/sources b/sources
index e62fc19..52b67e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-44734254ba661dfd539fdabab6d859c6 gnome-applets-2.21.91.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+54a58919c72dfa7e6654f9932b482b36 gnome-applets-2.21.92.tar.bz2
commit b03b69d6b2b5b8074a10378d7389cbb002ebbf33
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 12 05:29:24 2008 +0000
2.21.91
diff --git a/.cvsignore b/.cvsignore
index 6697a86..38a5a40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.21.4.tar.bz2
+gnome-applets-2.21.91.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9fef8ab..de8044b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,4 +1,4 @@
-%define glib2_version 2.6.0
+%define glib2_version 2.15.3
%define pango_version 1.2.0
%define gtk2_version 2.6.0
%define libgnome_version 2.8.0
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.4
-Release: 5%{?dist}
+Version: 2.21.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -71,9 +71,6 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# fixed in upstream svn
-Patch41: locations.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=382100
Patch42: vertical-invest.patch
@@ -171,7 +168,6 @@ small utilities for the GNOME panel.
%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .locations
%patch42 -p1 -b .vertical-invest
%patch43 -p1 -b .trash-gio
%patch44 -p1 -b .gweather-gnome-vfs
@@ -346,6 +342,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Tue Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.91-1
+- Update to 2.21.91
+
* Thu Jan 31 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-5
- Rebuild against new libxklavier
diff --git a/sources b/sources
index 969a690..e62fc19 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dba81fa85a3b238b1a3b600865c2201d gnome-applets-2.21.4.tar.bz2
+44734254ba661dfd539fdabab6d859c6 gnome-applets-2.21.91.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit aaf67f1940b3e2dd1cd5d58c18c13e7f73496476
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 1 02:59:25 2008 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 40425e4..9fef8ab 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -12,7 +12,7 @@
%define gstreamer_version 0.10.14
%define gstreamer_plugins_version 0.10.14
%define gstreamer_plugins_good_version 0.10.6
-%define libxklavier_version 2.91
+%define libxklavier_version 3.4
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.11.1
%define gnome_utils_version 2.8.1
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.21.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -346,6 +346,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Thu Jan 31 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-5
+- Rebuild against new libxklavier
+
* Fri Jan 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-4
- Port trash applet to gvfs
- Remove gnome-vfs dependency in gweather
commit a41edecc9fa57fc001d089136606d3d1a23d6a13
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jan 26 03:23:58 2008 +0000
fix patch
diff --git a/gweather-gnome-vfs.patch b/gweather-gnome-vfs.patch
index c19d52c..a10da16 100644
--- a/gweather-gnome-vfs.patch
+++ b/gweather-gnome-vfs.patch
@@ -1,25 +1,27 @@
-diff -up gnome-applets-2.21.4/Makefile.am.gweather gnome-applets-2.21.4/Makefile.am
---- gnome-applets-2.21.4/Makefile.am.gweather 2008-01-22 23:54:12.000000000 -0500
-+++ gnome-applets-2.21.4/Makefile.am 2008-01-22 23:54:32.000000000 -0500
-@@ -7,7 +7,6 @@ endif
+diff -up gnome-applets-2.21.4/Makefile.am.gweather-gnome-vfs gnome-applets-2.21.4/Makefile.am
+--- gnome-applets-2.21.4/Makefile.am.gweather-gnome-vfs 2008-01-25 22:21:25.000000000 -0500
++++ gnome-applets-2.21.4/Makefile.am 2008-01-25 22:22:19.000000000 -0500
+@@ -6,8 +6,7 @@ gtop_SUBDIRS = $(gtop_applets)
+ endif
vfs_applets = \
- drivemount \
-- gweather \
- trashapplet
+- drivemount \
+- gweather
++ drivemount
if BUILD_GNOME_VFS_APPLETS
vfs_SUBDIRS = $(vfs_applets)
-@@ -48,6 +47,7 @@ endif
- always_built_SUBDIRS = \
+ endif
+@@ -47,6 +46,7 @@ endif
+ always_built_SUBDIRS = \
charpick \
geyes \
+ gweather \
mini-commander \
gkb-new \
stickynotes \
-diff -up gnome-applets-2.21.4/gweather/Makefile.am.gweather gnome-applets-2.21.4/gweather/Makefile.am
---- gnome-applets-2.21.4/gweather/Makefile.am.gweather 2008-01-22 23:54:41.000000000 -0500
-+++ gnome-applets-2.21.4/gweather/Makefile.am 2008-01-22 23:54:59.000000000 -0500
+diff -up gnome-applets-2.21.4/gweather/Makefile.am.gweather-gnome-vfs gnome-applets-2.21.4/gweather/Makefile.am
+--- gnome-applets-2.21.4/gweather/Makefile.am.gweather-gnome-vfs 2008-01-12 19:32:14.000000000 -0500
++++ gnome-applets-2.21.4/gweather/Makefile.am 2008-01-25 22:21:25.000000000 -0500
@@ -7,7 +7,6 @@ INCLUDES = \
-I$(top_srcdir) \
-DGTK_ENABLE_BROKEN \
commit 86d597a8589f6fc25ce8e1947f6b83b1414d6d22
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jan 26 03:13:14 2008 +0000
add bug refs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b3ccdc1..40425e4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -77,7 +77,9 @@ Patch41: locations.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=382100
Patch42: vertical-invest.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=509759
Patch43: trash-gio.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=511446
Patch44: gweather-gnome-vfs.patch
BuildRequires: glib2-devel >= %{glib2_version}
commit bed896b3793a4a83e97c7ad96499e66cbe007f92
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jan 26 03:10:06 2008 +0000
gvfs porting
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1de7d0d..b3ccdc1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.21.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -77,6 +77,9 @@ Patch41: locations.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=382100
Patch42: vertical-invest.patch
+Patch43: trash-gio.patch
+Patch44: gweather-gnome-vfs.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -168,6 +171,8 @@ small utilities for the GNOME panel.
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .locations
%patch42 -p1 -b .vertical-invest
+%patch43 -p1 -b .trash-gio
+%patch44 -p1 -b .gweather-gnome-vfs
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -339,6 +344,10 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Fri Jan 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-4
+- Port trash applet to gvfs
+- Remove gnome-vfs dependency in gweather
+
* Mon Jan 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-3
- Fix the invest applet on vertical panels
diff --git a/gweather-gnome-vfs.patch b/gweather-gnome-vfs.patch
new file mode 100644
index 0000000..c19d52c
--- /dev/null
+++ b/gweather-gnome-vfs.patch
@@ -0,0 +1,38 @@
+diff -up gnome-applets-2.21.4/Makefile.am.gweather gnome-applets-2.21.4/Makefile.am
+--- gnome-applets-2.21.4/Makefile.am.gweather 2008-01-22 23:54:12.000000000 -0500
++++ gnome-applets-2.21.4/Makefile.am 2008-01-22 23:54:32.000000000 -0500
+@@ -7,7 +7,6 @@ endif
+
+ vfs_applets = \
+ drivemount \
+- gweather \
+ trashapplet
+ if BUILD_GNOME_VFS_APPLETS
+ vfs_SUBDIRS = $(vfs_applets)
+@@ -48,6 +47,7 @@ endif
+ always_built_SUBDIRS = \
+ charpick \
+ geyes \
++ gweather \
+ mini-commander \
+ gkb-new \
+ stickynotes \
+diff -up gnome-applets-2.21.4/gweather/Makefile.am.gweather gnome-applets-2.21.4/gweather/Makefile.am
+--- gnome-applets-2.21.4/gweather/Makefile.am.gweather 2008-01-22 23:54:41.000000000 -0500
++++ gnome-applets-2.21.4/gweather/Makefile.am 2008-01-22 23:54:59.000000000 -0500
+@@ -7,7 +7,6 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -DGTK_ENABLE_BROKEN \
+ $(GNOME_APPLETS_CFLAGS) \
+- $(GNOME_VFS_APPLETS_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(XML2_CFLAGS) \
+ $(LIBGWEATHER_CFLAGS) \
+@@ -27,7 +26,6 @@ gweather_applet_2_SOURCES = \
+ gweather_applet_2_LDADD = \
+ $(LIBNOTIFY_LIBS) \
+ $(GNOME_APPLETS_LIBS) \
+- $(GNOME_VFS_APPLETS_LIBS) \
+ $(XML2_LIBS) \
+ $(LIBGWEATHER_LIBS)
+
diff --git a/trash-gio.patch b/trash-gio.patch
new file mode 100644
index 0000000..2c9808d
--- /dev/null
+++ b/trash-gio.patch
@@ -0,0 +1,906 @@
+diff -up gnome-applets-2.21.4/trashapplet/src/trash-monitor.c.giotrash gnome-applets-2.21.4/trashapplet/src/trash-monitor.c
+--- gnome-applets-2.21.4/trashapplet/src/trash-monitor.c.giotrash 2007-11-27 03:48:48.000000000 -0500
++++ gnome-applets-2.21.4/trashapplet/src/trash-monitor.c 2008-01-22 23:14:52.000000000 -0500
+@@ -22,14 +22,12 @@
+
+ #include "trash-monitor.h"
+ #include <string.h>
+-#include <libgnomevfs/gnome-vfs.h>
++#include <gio/gio.h>
+
+ struct _TrashMonitor {
+ GObject parent;
+-
+- GHashTable *volumes;
++ GFileMonitor *file_monitor;
+ gint total_item_count;
+- gint notify_id;
+ };
+
+ struct _TrashMonitorClass {
+@@ -38,16 +36,6 @@ struct _TrashMonitorClass {
+ void (* item_count_changed) (TrashMonitor *monitor);
+ };
+
+-typedef struct {
+- TrashMonitor *monitor;
+- GnomeVFSVolume *volume;
+- gchar *trash_uri;
+- GnomeVFSAsyncHandle *find_handle;
+- GnomeVFSMonitorHandle *trash_change_monitor;
+- gint item_count;
+-} VolumeInfo;
+-
+-
+ static void trash_monitor_init (TrashMonitor *monitor);
+ static void trash_monitor_class_init (TrashMonitorClass *class);
+
+@@ -59,21 +47,14 @@ static GObjectClass *parent_class;
+ static guint signals[LAST_SIGNAL];
+
+
+-static void volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
+- GnomeVFSVolume *volume,
+- TrashMonitor *monitor);
+-static void volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
+- GnomeVFSVolume *volume,
+- TrashMonitor *monitor);
+-
+-static void add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
+-static void remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
+-
+-static void trash_changed_queue_notify (TrashMonitor *monitor);
++static void file_changed (GFileMonitor *monitor,
++ GFile *child,
++ GFile *other_child,
++ GFileMonitorEvent event_type,
++ gpointer user_data);
+
+ G_DEFINE_TYPE (TrashMonitor, trash_monitor, G_TYPE_OBJECT)
+
+-
+ static void
+ trash_monitor_class_init (TrashMonitorClass *class)
+ {
+@@ -90,32 +71,62 @@ trash_monitor_class_init (TrashMonitorCl
+ }
+
+ static void
+-trash_monitor_init (TrashMonitor *monitor)
++count_children (TrashMonitor *monitor,
++ GFile *file)
+ {
+- GnomeVFSVolumeMonitor *volume_monitor;
+- GList *volumes, *tmp;
++ GFileEnumerator *enumerator;
++ GError *error = NULL;
++ GFileInfo *info;
++ gint count;
+
+- monitor->volumes = g_hash_table_new (NULL, NULL);
+ monitor->total_item_count = 0;
+- monitor->notify_id = 0;
+
+- volume_monitor = gnome_vfs_get_volume_monitor ();
++ enumerator = g_file_enumerate_children (file,
++ G_FILE_ATTRIBUTE_STANDARD_TYPE,
++ G_FILE_QUERY_INFO_NONE,
++ NULL, &error);
++
++ count = 0;
++
++ if (error)
++ {
++ g_print ("failed to count trash content: %s\n", error->message);
++ return;
++ }
+
+- g_signal_connect_object (volume_monitor, "volume_mounted",
+- G_CALLBACK (volume_mounted_callback),
+- monitor, 0);
+- g_signal_connect_object (volume_monitor, "volume_pre_unmount",
+- G_CALLBACK (volume_unmount_started_callback),
+- monitor, 0);
+-
+- volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
+- for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
+- GnomeVFSVolume *volume = tmp->data;
++ while (1)
++ {
++ info = g_file_enumerator_next_file (enumerator, NULL, &error);
++ if (error)
++ {
++ g_print ("failed to count trash content: %s\n", error->message);
++ return;
++ }
++ if (!info)
++ break;
+
+- add_volume (monitor, volume);
+- gnome_vfs_volume_unref (volume);
+- }
+- g_list_free (volumes);
++ g_object_unref (info);
++ count++;
++ }
++
++ monitor->total_item_count = count;
++ g_object_unref (enumerator);
++}
++
++static void
++trash_monitor_init (TrashMonitor *monitor)
++{
++ GFile *location;
++
++ monitor->total_item_count = 0;
++
++ location = g_file_new_for_uri ("trash:///");
++ count_children (monitor, location);
++ monitor->file_monitor = g_file_monitor_directory (location, 0, NULL, NULL);
++ g_object_unref (location);
++
++ g_signal_connect_object (monitor->file_monitor, "changed",
++ G_CALLBACK (file_changed), monitor, 0);
+ }
+
+ TrashMonitor *
+@@ -130,293 +141,157 @@ trash_monitor_get (void)
+ }
+
+ static void
+-volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
+- GnomeVFSVolume *volume,
+- TrashMonitor *monitor)
++file_changed (GFileMonitor *file_monitor,
++ GFile *child,
++ GFile *other_file,
++ GFileMonitorEvent event_type,
++ gpointer user_data)
+ {
+- add_volume (monitor, volume);
+-}
+-
+-static void
+-volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
+- GnomeVFSVolume *volume,
+- TrashMonitor *monitor)
+-{
+- remove_volume (monitor, volume);
+-}
+-
+-static void
+-trash_dir_changed (GnomeVFSMonitorHandle *handle,
+- const gchar *monitor_uri,
+- const gchar *info_uri,
+- GnomeVFSMonitorEventType type,
+- gpointer user_data)
+-{
+- VolumeInfo *volinfo;
+- GnomeVFSResult res;
+- GList *dirlist, *tmp;
+- gint count = 0;
+-
+- volinfo = user_data;
+-
+- res = gnome_vfs_directory_list_load (&dirlist, volinfo->trash_uri,
+- GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
+- if (res != GNOME_VFS_OK) {
+- g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
+- return;
+- }
+-
+- for (tmp = dirlist; tmp != NULL; tmp = tmp->next) {
+- GnomeVFSFileInfo *info = tmp->data;
+-
+- if (!strcmp (info->name, ".") || !strcmp (info->name, ".."))
+- continue;
+- count++;
+- }
+- gnome_vfs_file_info_list_free (dirlist);
+-
+- if (count != volinfo->item_count) {
+- volinfo->item_count = count;
+- trash_changed_queue_notify (volinfo->monitor);
+- }
+-}
+-
+-static void
+-find_directory_callback (GnomeVFSAsyncHandle *handle,
+- GList *results,
+- gpointer callback_data)
+-{
+- VolumeInfo *volinfo;
+- GnomeVFSFindDirectoryResult *result;
+- GnomeVFSResult res;
+-
+- volinfo = callback_data;
+-
+- /* we are done finding the volume */
+- volinfo->find_handle = NULL;
+-
+- /* If we can't find the trash, ignore it silently. */
+- result = results->data;
+- if (result->result != GNOME_VFS_OK)
+- return;
++ TrashMonitor *monitor;
+
+- volinfo->trash_uri = gnome_vfs_uri_to_string (result->uri,
+- GNOME_VFS_URI_HIDE_NONE);
+- /* g_message ("found trash dir: %s", volinfo->trash_uri); */
+-
+- /* simulate a change to update the directory count */
+- trash_dir_changed (NULL, NULL, NULL, GNOME_VFS_MONITOR_EVENT_CHANGED,
+- volinfo);
+-
+- res = gnome_vfs_monitor_add (&volinfo->trash_change_monitor,
+- volinfo->trash_uri, GNOME_VFS_MONITOR_DIRECTORY,
+- trash_dir_changed,
+- volinfo);
+-
+- if (res != GNOME_VFS_OK) {
+- g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
+- volinfo->trash_change_monitor = NULL;
+- }
+-}
++ monitor = TRASH_MONITOR (user_data);
+
+-static gboolean
+-get_trash_volume (TrashMonitor *monitor,
+- GnomeVFSVolume *volume,
+- VolumeInfo **volinfo,
+- GnomeVFSURI **mount_uri)
+-{
+- char *uri_str;
+-
+- *volinfo = g_hash_table_lookup (monitor->volumes, volume);
+-
+- if (*volinfo != NULL && (*volinfo)->trash_uri != NULL)
+- return FALSE;
+-
+- if (!gnome_vfs_volume_handles_trash (volume))
+- return FALSE;
+-
+- uri_str = gnome_vfs_volume_get_activation_uri (volume);
+- *mount_uri = gnome_vfs_uri_new (uri_str);
+- g_free (uri_str);
+-
+- if (*volinfo == NULL) {
+- *volinfo = g_new0 (VolumeInfo, 1);
+- (*volinfo)->monitor = monitor;
+- (*volinfo)->volume = gnome_vfs_volume_ref (volume);
+- g_hash_table_insert (monitor->volumes, volume, *volinfo);
+- }
+-
+- return TRUE;
++ switch (event_type)
++ {
++ case G_FILE_MONITOR_EVENT_DELETED:
++ monitor->total_item_count--;
++ g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
++ break;
++ case G_FILE_MONITOR_EVENT_CREATED:
++ monitor->total_item_count++;
++ g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
++ break;
++ default: ;
++ }
+ }
+
+-static void
+-add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
++typedef struct _EmptyTrashJob EmptyTrashJob;
++struct _EmptyTrashJob
+ {
+- VolumeInfo *volinfo;
+- GnomeVFSURI *mount_uri;
+- GList vfs_uri_as_list;
++ GCancellable *cancellable;
++ GList *trash_dirs;
++ gint ref_count;
++};
+
+- if (!get_trash_volume (monitor, volume, &volinfo, &mount_uri))
+- return;
++static EmptyTrashJob *
++empty_trash_job_new (void)
++{
++ EmptyTrashJob *job;
+
+- if (volinfo->find_handle) {
+- /* already searchinf for trash */
+- gnome_vfs_uri_unref (mount_uri);
+- return;
+- }
++ job = g_new0 (EmptyTrashJob, 1);
++ job->ref_count = 1;
+
+-
+- vfs_uri_as_list.data = mount_uri;
+- vfs_uri_as_list.next = NULL;
+- vfs_uri_as_list.prev = NULL;
+-
+- gnome_vfs_async_find_directory (&volinfo->find_handle, &vfs_uri_as_list,
+- GNOME_VFS_DIRECTORY_KIND_TRASH,
+- FALSE, TRUE, 0777,
+- GNOME_VFS_PRIORITY_DEFAULT,
+- find_directory_callback, volinfo);
+- gnome_vfs_uri_unref (mount_uri);
++ return job;
+ }
+
+ static void
+-remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
++empty_trash_job_ref (EmptyTrashJob *job)
+ {
+- VolumeInfo *volinfo;
+-
+- volinfo = g_hash_table_lookup (monitor->volumes, volume);
+- if (volinfo != NULL) {
+- g_hash_table_remove (monitor->volumes, volume);
+-
+- /* g_message ("removing volume %s", volinfo->trash_uri); */
+- if (volinfo->find_handle != NULL)
+- gnome_vfs_async_cancel (volinfo->find_handle);
+- if (volinfo->trash_change_monitor != NULL)
+- gnome_vfs_monitor_cancel (volinfo->trash_change_monitor);
+-
+- if (volinfo->trash_uri)
+- g_free (volinfo->trash_uri);
+-
+- /* if this volume contained some trash, then notify that the trash
+- * state has changed */
+- if (volinfo->item_count != 0)
+- trash_changed_queue_notify (monitor);
+-
+- gnome_vfs_volume_unref (volinfo->volume);
+- g_free (volinfo);
+- }
++ job->ref_count++;
+ }
+
+-/* --- */
+-
+ static void
+-readd_volumes (gpointer key, gpointer value, gpointer user_data)
++empty_trash_job_unref (EmptyTrashJob *job)
+ {
+- TrashMonitor *monitor = user_data;
+- GnomeVFSVolume *volume;
++ job->ref_count--;
++ if (job->ref_count == 0)
++ {
++ g_list_foreach (job->trash_dirs, (GFunc)g_object_unref, NULL);
++ g_list_free (job->trash_dirs);
+
+- volume = key;
+- add_volume (monitor, volume);
+-}
+-void
+-trash_monitor_recheck_trash_dirs (TrashMonitor *monitor)
+-{
+- /* call add_volume() on each volume, to add trash dirs where missing */
+- g_hash_table_foreach (monitor->volumes, readd_volumes, monitor);
++ g_object_unref (job->cancellable);
++ g_free (job);
++ }
+ }
+
+-/* --- */
+-
+-void
+-trash_monitor_empty_trash (TrashMonitor *monitor,
+- GnomeVFSAsyncHandle **handle,
+- GnomeVFSAsyncXferProgressCallback func,
+- gpointer user_data)
+-{
+- GList *trash_dirs = NULL, *volumes, *tmp;
+- GnomeVFSVolume *volume;
+- GnomeVFSURI *mount_uri, *trash_uri;
+- gchar *uri_str;
+-
+- /* collect the trash directories */
+- volumes = gnome_vfs_volume_monitor_get_mounted_volumes (gnome_vfs_get_volume_monitor ());
+- for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
+- volume = tmp->data;
+- if (gnome_vfs_volume_handles_trash (volume)) {
+- /* get the mount point for this volume */
+- uri_str = gnome_vfs_volume_get_activation_uri (volume);
+- mount_uri = gnome_vfs_uri_new (uri_str);
+- g_free (uri_str);
+-
+- g_assert (mount_uri != NULL);
+-
+- /* Look for the trash directory. Since we tell it not to create or
+- * look for the dir, it doesn't block. */
+- if (gnome_vfs_find_directory (mount_uri,
+- GNOME_VFS_DIRECTORY_KIND_TRASH, &trash_uri,
+- FALSE, FALSE, 0777) == GNOME_VFS_OK) {
+- trash_dirs = g_list_prepend (trash_dirs, trash_uri);
+- }
+- gnome_vfs_uri_unref (mount_uri);
+- }
+- gnome_vfs_volume_unref (volume);
+- }
+- g_list_free (volumes);
++static void
++delete_trash_file (EmptyTrashJob *job,
++ GFile *file,
++ gboolean del_dir)
++{
++ GFileInfo *info;
++ GFile *child;
++ GFileEnumerator *enumerator;
+
+- if (trash_dirs != NULL)
+- gnome_vfs_async_xfer (handle, trash_dirs, NULL,
+- GNOME_VFS_XFER_EMPTY_DIRECTORIES,
+- GNOME_VFS_XFER_ERROR_MODE_ABORT,
+- GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+- GNOME_VFS_PRIORITY_DEFAULT,
+- func, user_data, NULL, NULL);
+- gnome_vfs_uri_list_free (trash_dirs);
+-}
++ if (g_cancellable_is_cancelled (job->cancellable))
++ return;
+
++ /* FIXME: progress */
+
+-/* --- */
++ enumerator = g_file_enumerate_children (file,
++ G_FILE_ATTRIBUTE_STANDARD_NAME,
++ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
++ job->cancellable,
++ NULL);
++ if (enumerator)
++ {
++ while ((info = g_file_enumerator_next_file (enumerator, job->cancellable, NULL)) != NULL)
++ {
++ child = g_file_get_child (file,
++ g_file_info_get_name (info));
++ delete_trash_file (job, child, TRUE);
++ g_object_unref (child);
++ g_object_unref (info);
++
++ if (g_cancellable_is_cancelled (job->cancellable))
++ break;
++ }
+
+-static void
+-count_items (gpointer key, gpointer value, gpointer user_data)
+-{
+- VolumeInfo *volinfo;
+- gint *item_count;
++ g_object_unref (enumerator);
++ }
+
+- volinfo = value;
+- item_count = user_data;
+- *item_count += volinfo->item_count;
++ if (!g_cancellable_is_cancelled (job->cancellable) && del_dir)
++ g_file_delete (file, job->cancellable, NULL);
+ }
+
+ static gboolean
+-trash_changed_notify (gpointer user_data)
++empty_trash_job_done (gpointer user_data)
+ {
+- TrashMonitor *monitor = user_data;
+- gint item_count;
++ EmptyTrashJob *job = user_data;
+
+- /* reset notification id */
+- monitor->notify_id = 0;
++ /* FIXME finish progress */
+
+- /* count the volumes */
+- item_count = 0;
+- g_hash_table_foreach (monitor->volumes, count_items, &item_count);
+-
+- /* if the item count has changed ... */
+- if (item_count != monitor->total_item_count) {
+- monitor->total_item_count = item_count;
+- /* g_message ("item count is %d", item_count); */
+- g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
+- }
++ empty_trash_job_unref (job);
+
+ return FALSE;
+ }
+
+ static void
+-trash_changed_queue_notify (TrashMonitor *monitor)
++empty_trash_job (GIOSchedulerJob *io_job,
++ GCancellable *cancellable,
++ gpointer user_data)
+ {
+- /* already queued */
+- if (monitor->notify_id != 0)
+- return;
++ EmptyTrashJob *job = user_data;
++ GList *l;
+
+- monitor->notify_id = g_idle_add (trash_changed_notify, monitor);
++ /* FIXME start progress */
++
++ for (l = job->trash_dirs;
++ l && !g_cancellable_is_cancelled (cancellable);
++ l = l->next)
++ delete_trash_file (job, l->data, FALSE);
++
++ empty_trash_job_ref (job);
++ g_io_scheduler_job_send_to_mainloop_async (io_job,
++ empty_trash_job_done,
++ job,
++ (GDestroyNotify)empty_trash_job_unref);
++}
++
++void
++trash_monitor_empty_trash (TrashMonitor *monitor,
++ GCancellable *cancellable,
++ gpointer func,
++ gpointer user_data)
++{
++ EmptyTrashJob *job;
++
++ job = empty_trash_job_new ();
++ job->cancellable = g_object_ref (cancellable);
++ job->trash_dirs = g_list_prepend (job->trash_dirs,
++ g_file_new_for_uri ("trash:"));
++
++ g_io_scheduler_push_job (empty_trash_job, job, (GDestroyNotify)empty_trash_job_unref, 0, cancellable);
+ }
+
+ int
+@@ -433,11 +308,6 @@ main (int argc, char **argv)
+ {
+ TrashMonitor *monitor;
+
+- if (!gnome_vfs_init ()) {
+- g_printerr ("Can not initialise gnome-vfs.\n");
+- return 1;
+- }
+-
+ monitor = trash_monitor_get ();
+
+ g_main_loop_run (g_main_loop_new (NULL, FALSE));
+diff -up gnome-applets-2.21.4/trashapplet/src/Makefile.am.giotrash gnome-applets-2.21.4/trashapplet/src/Makefile.am
+--- gnome-applets-2.21.4/trashapplet/src/Makefile.am.giotrash 2007-11-27 03:48:48.000000000 -0500
++++ gnome-applets-2.21.4/trashapplet/src/Makefile.am 2008-01-22 23:14:52.000000000 -0500
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
+- $(GNOME_VFS_APPLETS_CFLAGS) \
++ $(GIO_CFLAGS) \
+ $(LIBGLADE_CFLAGS)
+
+ libexec_PROGRAMS = trashapplet
+@@ -13,7 +13,7 @@ trashapplet_SOURCES = \
+ xstuff.c \
+ xstuff.h
+
+-trashapplet_LDADD = \
+- $(GNOME_APPLETS_LIBS) \
+- $(GNOME_VFS_APPLETS_LIBS) \
++trashapplet_LDADD = \
++ $(GNOME_APPLETS_LIBS) \
++ $(GIO_LIBS) \
+ $(LIBGLADE_LIBS)
+diff -up gnome-applets-2.21.4/trashapplet/src/trashapplet.c.giotrash gnome-applets-2.21.4/trashapplet/src/trashapplet.c
+--- gnome-applets-2.21.4/trashapplet/src/trashapplet.c.giotrash 2007-11-27 03:48:48.000000000 -0500
++++ gnome-applets-2.21.4/trashapplet/src/trashapplet.c 2008-01-22 23:14:52.000000000 -0500
+@@ -31,6 +31,7 @@
+ #include <gconf/gconf-client.h>
+ #include <libgnome/gnome-help.h>
+ #include <glade/glade.h>
++#include <gio/gio.h>
+
+ #include "trashapplet.h"
+ #include "trash-monitor.h"
+@@ -118,9 +119,6 @@ trash_applet_class_init (TrashAppletClas
+ static void
+ trash_applet_init (TrashApplet *applet)
+ {
+- GnomeVFSResult res;
+- GnomeVFSURI *trash_uri;
+-
+ gtk_window_set_default_icon_name (TRASH_ICON_FULL);
+
+ panel_applet_set_flags (PANEL_APPLET (applet),
+@@ -148,20 +146,6 @@ trash_applet_init (TrashApplet *applet)
+ gtk_widget_show (applet->image);
+ applet->icon_state = TRASH_STATE_UNKNOWN;
+
+- /* create local trash directory if needed */
+- res = gnome_vfs_find_directory (NULL,
+- GNOME_VFS_DIRECTORY_KIND_TRASH,
+- &trash_uri,
+- TRUE,
+- TRUE,
+- 0700);
+- if (trash_uri)
+- gnome_vfs_uri_unref (trash_uri);
+- if (res != GNOME_VFS_OK) {
+- g_warning (_("Unable to find the Trash directory: %s"),
+- gnome_vfs_result_to_string (res));
+- }
+-
+ /* set up trash monitor */
+ applet->monitor = trash_monitor_get ();
+ applet->monitor_signal_id =
+@@ -239,6 +223,7 @@ trash_applet_change_orient (PanelApplet
+ break;
+ case PANEL_APPLET_ORIENT_UP:
+ case PANEL_APPLET_ORIENT_DOWN:
++ default:
+ applet->orient = GTK_ORIENTATION_HORIZONTAL;
+ new_size = GTK_WIDGET (applet)->allocation.height;
+ break;
+@@ -503,6 +488,7 @@ error_dialog (TrashApplet *applet, const
+ g_free (error_string);
+ }
+
++#if 0
+ static gint
+ update_transfer_callback (GnomeVFSAsyncHandle *handle,
+ GnomeVFSXferProgressInfo *progress_info,
+@@ -561,6 +547,7 @@ update_transfer_callback (GnomeVFSAsyncH
+
+ return 1;
+ }
++#endif
+
+ /* this function is based on the one with the same name in
+ libnautilus-private/nautilus-file-operations.c */
+@@ -627,12 +614,9 @@ confirm_empty_trash (GtkWidget *parent_v
+ }
+
+ static void
+-on_empty_trash_cancel (GtkWidget *widget, GnomeVFSAsyncHandle **handle)
++on_empty_trash_cancel (GtkWidget *widget, GCancellable *cancellable)
+ {
+- if (handle != NULL) {
+- gnome_vfs_async_cancel ((GnomeVFSAsyncHandle *) handle);
+- }
+-
++ g_cancellable_cancel (cancellable);
+ gtk_widget_hide (widget);
+ }
+
+@@ -643,7 +627,7 @@ trash_applet_do_empty (BonoboUIComponent
+ {
+ GtkWidget *dialog;
+
+- GnomeVFSAsyncHandle *hnd;
++ GCancellable *cancellable;
+
+ g_return_if_fail (TRASH_IS_APPLET (applet));
+
+@@ -656,16 +640,17 @@ trash_applet_do_empty (BonoboUIComponent
+ if (!applet->xml)
+ applet->xml = glade_xml_new (GNOME_GLADEDIR "/trashapplet.glade", NULL, NULL);
+
+- dialog = glade_xml_get_widget(applet->xml, "empty_trash");
++ dialog = glade_xml_get_widget (applet->xml, "empty_trash");
+
+- g_signal_connect(dialog, "response", G_CALLBACK (on_empty_trash_cancel), &hnd);
++ cancellable = g_cancellable_new ();
++ g_signal_connect (dialog, "response", G_CALLBACK (on_empty_trash_cancel), cancellable);
+
+- gtk_widget_show_all(dialog);
++ gtk_widget_show_all (dialog);
+
+ trash_monitor_empty_trash (applet->monitor,
+- &hnd, update_transfer_callback, applet);
++ cancellable, NULL, applet);
+
+- gtk_widget_hide(dialog);
++ gtk_widget_hide (dialog);
+
+ }
+
+@@ -846,80 +831,50 @@ trash_applet_drag_data_received (GtkWidg
+ guint time_)
+ {
+ TrashApplet *applet = TRASH_APPLET (widget);
+- GList *list, *scan;
+- GList *source_uri_list, *target_uri_list, *unmovable_uri_list;
+- GnomeVFSResult result;
+-
+- list = gnome_vfs_uri_list_parse ((gchar *)selectiondata->data);
+-
+- source_uri_list = NULL;
+- target_uri_list = NULL;
+- unmovable_uri_list = NULL;
+- for (scan = g_list_first (list); scan; scan = g_list_next (scan)) {
+- GnomeVFSURI *source_uri = scan->data;
+- GnomeVFSURI *trash_uri, *target_uri;
+- gchar *source_basename;
+-
+- /* find the trash directory for this file */
+- result = gnome_vfs_find_directory (source_uri,
+- GNOME_VFS_DIRECTORY_KIND_TRASH,
+- &trash_uri, TRUE, FALSE, 0);
+- if (result != GNOME_VFS_OK) {
+- unmovable_uri_list = g_list_prepend (unmovable_uri_list,
+- gnome_vfs_uri_ref (source_uri));
+- continue;
++ gchar **list;
++ gint i;
++ GList *trashed = NULL;
++ GList *untrashable = NULL;
++ GList *l;
++ GError *error = NULL;
++
++ list = g_uri_list_extract_uris ((gchar *)selectiondata->data);
++
++ for (i = 0; list[i]; i++) {
++ GFile *file;
++
++ file = g_file_new_for_uri (list[i]);
++ if (!g_file_trash (file, NULL, NULL)) {
++ untrashable = g_list_prepend (untrashable, file);
+ }
+-
+- source_basename = gnome_vfs_uri_extract_short_name
+- (source_uri);
+-
+- target_uri = gnome_vfs_uri_append_file_name(trash_uri,
+- source_basename);
+- g_free (source_basename);
+- gnome_vfs_uri_unref (trash_uri);
+-
+- source_uri_list = g_list_prepend (source_uri_list,
+- gnome_vfs_uri_ref (source_uri));
+- target_uri_list = g_list_prepend (target_uri_list,
+- target_uri);
+- }
+-
+- gnome_vfs_uri_list_free(list);
+-
+- /* we might have added a trash dir, so recheck */
+- trash_monitor_recheck_trash_dirs (applet->monitor);
+-
+- if (source_uri_list) {
+- result = gnome_vfs_xfer_uri_list (source_uri_list, target_uri_list,
+- GNOME_VFS_XFER_REMOVESOURCE |
+- GNOME_VFS_XFER_RECURSIVE,
+- GNOME_VFS_XFER_ERROR_MODE_ABORT,
+- GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+- NULL, NULL);
+- gnome_vfs_uri_list_free (source_uri_list);
+- gnome_vfs_uri_list_free (target_uri_list);
+- if (result != GNOME_VFS_OK) {
+- error_dialog (applet, _("Unable to move to trash:\n%s"),
+- gnome_vfs_result_to_string (result));
++ else {
++ trashed = g_list_prepend (trashed, file);
+ }
+ }
+- if (unmovable_uri_list) {
+- if (confirm_delete_immediately (widget,
+- g_list_length (unmovable_uri_list),
+- source_uri_list == NULL)) {
+- result = gnome_vfs_xfer_delete_list (unmovable_uri_list,
+- GNOME_VFS_XFER_ERROR_MODE_ABORT,
+- GNOME_VFS_XFER_RECURSIVE,
+- NULL, NULL);
+- } else {
+- result = GNOME_VFS_OK;
+- }
+- gnome_vfs_uri_list_free (unmovable_uri_list);
+- if (result != GNOME_VFS_OK) {
+- error_dialog (applet, _("Unable to move to trash:\n%s"),
+- gnome_vfs_result_to_string (result));
++
++ if (untrashable) {
++ if (confirm_delete_immediately (widget,
++ g_list_length (untrashable),
++ trashed == NULL)) {
++ for (l = untrashable; l; l = l->next) {
++ if (!g_file_delete (l->data, NULL, &error)) {
++ error_dialog (applet,
++ _("Unable to delete '%s': %s"),
++ g_file_get_uri (l->data),
++ error->message);
++ g_clear_error (&error);
++ }
++ }
+ }
+ }
++
++ g_list_foreach (untrashable, (GFunc)g_object_unref, NULL);
++ g_list_free (untrashable);
++ g_list_foreach (trashed, (GFunc)g_object_unref, NULL);
++ g_list_free (trashed);
++
++ g_strfreev (list);
++
+ gtk_drag_finish (context, TRUE, FALSE, time_);
+ }
+
+@@ -951,6 +906,8 @@ trash_applet_factory (PanelApplet *apple
+ int
+ main (int argc, char *argv [])
+ {
++ g_thread_init (NULL);
++
+ /* gettext stuff */
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+diff -up gnome-applets-2.21.4/trashapplet/src/trash-monitor.h.giotrash gnome-applets-2.21.4/trashapplet/src/trash-monitor.h
+--- gnome-applets-2.21.4/trashapplet/src/trash-monitor.h.giotrash 2007-11-27 03:48:48.000000000 -0500
++++ gnome-applets-2.21.4/trashapplet/src/trash-monitor.h 2008-01-22 23:14:52.000000000 -0500
+@@ -23,7 +23,7 @@
+ #ifndef __TRASH_MONITOR_H__
+ #define __TRASH_MONITOR_H__
+
+-#include <libgnomevfs/gnome-vfs.h>
++#include <gio/gio.h>
+
+ typedef struct _TrashMonitor TrashMonitor;
+ typedef struct _TrashMonitorClass TrashMonitorClass;
+@@ -41,9 +41,9 @@ TrashMonitor *trash_monitor_get (v
+ /* check if new trash dirs have been created */
+ void trash_monitor_recheck_trash_dirs (TrashMonitor *monitor);
+ void trash_monitor_empty_trash (TrashMonitor *monitor,
+- GnomeVFSAsyncHandle **handle,
+- GnomeVFSAsyncXferProgressCallback func,
+- gpointer user_data);
++ GCancellable *cancellable,
++ gpointer func,
++ gpointer user_data);
+ int trash_monitor_get_item_count (TrashMonitor *monitor);
+
+ #endif
+diff -up gnome-applets-2.21.4/Makefile.am.giotrash gnome-applets-2.21.4/Makefile.am
+--- gnome-applets-2.21.4/Makefile.am.giotrash 2008-01-12 19:32:14.000000000 -0500
++++ gnome-applets-2.21.4/Makefile.am 2008-01-22 23:14:52.000000000 -0500
+@@ -7,8 +7,7 @@ endif
+
+ vfs_applets = \
+ drivemount \
+- gweather \
+- trashapplet
++ gweather
+ if BUILD_GNOME_VFS_APPLETS
+ vfs_SUBDIRS = $(vfs_applets)
+ endif
+@@ -45,12 +44,13 @@ if BUILD_INVEST_APPLET
+ invest_applet_SUBDIR = invest-applet
+ endif
+
+-always_built_SUBDIRS = \
++always_built_SUBDIRS = \
+ charpick \
+ geyes \
+ mini-commander \
+ gkb-new \
+ stickynotes \
++ trashapplet \
+ null_applet
+
+ SUBDIRS = \
+diff -up gnome-applets-2.21.4/configure.in.giotrash gnome-applets-2.21.4/configure.in
+--- gnome-applets-2.21.4/configure.in.giotrash 2008-01-22 23:14:52.000000000 -0500
++++ gnome-applets-2.21.4/configure.in 2008-01-22 23:17:06.000000000 -0500
+@@ -13,6 +13,7 @@ dnl *** Minimum library versions for GNO
+ dnl ***************************************************************************
+ GTK_REQUIRED=2.11.0
+ GLIB_REQUIRED=2.13.0
++GIO_REQUIRED=2.15.3
+ LIBGNOME_REQUIRED=2.8.0
+ LIBGNOMEUI_REQUIRED=2.8.0
+ GNOME_VFS_REQUIRED=2.15.4
+@@ -110,6 +111,11 @@ PKG_CHECK_MODULES(GAILUTIL, gail >= $LIB
+ AC_SUBST(GAILUTIL_CFLAGS)
+ AC_SUBST(GAILUTIL_LIBS)
+
++dnl -- check for gio (required) ------------------------------------------
++PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
++AC_SUBST(GIO_CFLAGS)
++AC_SUBST(GIO_LIBS)
++
+ dnl -- Check for GTK+ 2.0 (required) ------------------------------------------
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+ AC_SUBST(GTK_FLAGS)
commit bf71ec38907e622f669bf4bf0a116576297b8066
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 22 04:29:30 2008 +0000
Fix invest applet on vertical panels
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b681fea..1de7d0d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.21.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -74,6 +74,9 @@ Patch40: gnome-applets-null-battstat.patch
# fixed in upstream svn
Patch41: locations.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=382100
+Patch42: vertical-invest.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -164,6 +167,7 @@ small utilities for the GNOME panel.
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
%patch41 -p1 -b .locations
+%patch42 -p1 -b .vertical-invest
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -335,6 +339,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Mon Jan 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-3
+- Fix the invest applet on vertical panels
+
* Sun Jan 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-2
- Make the weather applet find locations.xml again
diff --git a/vertical-invest.patch b/vertical-invest.patch
new file mode 100644
index 0000000..5f11794
--- /dev/null
+++ b/vertical-invest.patch
@@ -0,0 +1,73 @@
+diff -up gnome-applets-2.21.4/invest-applet/invest/applet.py.vertical gnome-applets-2.21.4/invest-applet/invest/applet.py
+--- gnome-applets-2.21.4/invest-applet/invest/applet.py.vertical 2008-01-21 23:24:51.000000000 -0500
++++ gnome-applets-2.21.4/invest-applet/invest/applet.py 2008-01-21 23:24:55.000000000 -0500
+@@ -45,8 +45,15 @@ class InvestApplet:
+
+ self.investwidget.connect('row-activated', lambda treeview, path, view_column: self.tb.set_active(False))
+ get_quotes_updater().connect('quotes-updated', self._on_quotes_updated)
+-
+- box = gtk.HBox()
++
++ applet.connect('change-orient', self._on_orient_changed)
++
++ orient = applet.get_orient()
++ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
++ box = gtk.VBox()
++ else:
++ box = gtk.HBox()
++
+ box.add(self.tb)
+ box.add(self.investticker)
+
+@@ -68,6 +75,22 @@ class InvestApplet:
+ def on_refresh(self, component, verb):
+ get_quotes_updater().refresh()
+
++ def _on_orient_changed(self, applet, orient):
++ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
++ box = gtk.VBox()
++ else:
++ box = gtk.HBox()
++
++ oldbox = self.investticker.parent
++ self.investticker.reparent(box)
++ self.tb = ToggleButton(applet, self.pw)
++ box.add(self.tb)
++
++ box.show_all()
++ self.applet.remove(oldbox)
++ self.applet.add(box)
++
++
+ def _on_quotes_updated(self, updater):
+ pass
+ #invest.dbusnotification.notify(
+@@ -93,10 +116,13 @@ class ToggleButton(gtk.ToggleButton):
+ except Exception, msg:
+ image.set_from_icon_name("stock_chart", gtk.ICON_SIZE_BUTTON)
+
+- hbox = gtk.HBox()
+- hbox.pack_start(image)
+-
+ orient = applet.get_orient()
++ if orient == gnomeapplet.ORIENT_RIGHT or orient == gnomeapplet.ORIENT_LEFT:
++ box = gtk.VBox()
++ else:
++ box = gtk.HBox()
++
++ box.pack_start(image)
+ arrow_dir = gtk.ARROW_DOWN
+ if orient == gnomeapplet.ORIENT_RIGHT:
+ arrow_dir = gtk.ARROW_RIGHT
+@@ -107,9 +133,9 @@ class ToggleButton(gtk.ToggleButton):
+ elif orient == gnomeapplet.ORIENT_UP:
+ arrow_dir = gtk.ARROW_UP
+
+- hbox.pack_start(gtk.Arrow(arrow_dir, gtk.SHADOW_NONE))
++ box.pack_start(gtk.Arrow(arrow_dir, gtk.SHADOW_NONE))
+
+- self.add(hbox)
++ self.add(box)
+
+ def toggled(self, togglebutton):
+ if togglebutton.get_active():
commit 65bea230194ce2226fd3bf98b6eef3bc82c022a7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 20 19:55:22 2008 +0000
fix weather applet to find locations.xml again
diff --git a/gnome-applets-2.17.1-cpufreq.patch b/gnome-applets-2.17.1-cpufreq.patch
deleted file mode 100644
index 22cc41f..0000000
--- a/gnome-applets-2.17.1-cpufreq.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c.cpufreq 2006-12-30 21:07:55.000000000 -0500
-+++ gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c 2007-01-10 22:06:27.000000000 -0500
-@@ -176,19 +176,13 @@
- cpufreq_popup_run_selector (CPUFreqPopup *popup,
- const gchar *params)
- {
-- gchar *path;
- guint cpu;
- gchar *command;
- GError *error = NULL;
-
-- path = g_find_program_in_path ("cpufreq-selector");
--
-- if (!path)
-- return;
--
- cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
-
-- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
-+ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
-
- g_spawn_command_line_async (command, &error);
- g_free (command);
---- gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c.cpufreq 2006-12-30 21:07:55.000000000 -0500
-+++ gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c 2007-01-10 22:00:22.000000000 -0500
-@@ -109,6 +109,8 @@
- if (!path)
- return FALSE;
-
-+ return TRUE;
-+
- if (geteuid () == 0)
- return TRUE;
-
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 475d8a1..b681fea 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.21.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -71,6 +71,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# fixed in upstream svn
+Patch41: locations.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -160,6 +163,7 @@ small utilities for the GNOME panel.
%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .locations
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -331,6 +335,9 @@ fi
%{_sysconfdir}/security/console.apps/*
%changelog
+* Sun Jan 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-2
+- Make the weather applet find locations.xml again
+
* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-1
- Update to 2.21.4
diff --git a/locations.patch b/locations.patch
new file mode 100644
index 0000000..f95de85
--- /dev/null
+++ b/locations.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.21.4/gweather/gweather-xml.c.locations gnome-applets-2.21.4/gweather/gweather-xml.c
+--- gnome-applets-2.21.4/gweather/gweather-xml.c.locations 2008-01-20 14:52:49.000000000 -0500
++++ gnome-applets-2.21.4/gweather/gweather-xml.c 2008-01-20 14:53:00.000000000 -0500
+@@ -368,7 +368,7 @@ gweather_xml_load_locations( GtkTreeView
+ int ret = -1;
+
+ /* Open the xml file containing the different locations */
+- xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
++ xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION);
+ if( xml == NULL )
+ goto error_out;
+
commit 2fa941d0f04a8bfc132fc209f7a15446186b55f2
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 07:04:39 2008 +0000
fix file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6505ffe..475d8a1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -148,19 +148,6 @@ applications and desktop tools to be used in conjunction with a window
manager for the X Window System. The gnome-applets package provides
small utilities for the GNOME panel.
-%package devel
-Summary: Development files for applications using gnome-applets
-Group: Development/Libraries
-Requires: gnome-applets = %{epoch}:%{version}-%{release}
-Requires: pkgconfig
-Requires: gtk2-devel
-Requires: gnome-vfs2-devel
-
-%description devel
-
-This package contains files needed for compiling programs using
-libraries contained in the gnome-applets package.
-
%prep
%setup -q
%patch0 -p1 -b .use-old-modemlights
@@ -318,7 +305,6 @@ fi
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
-%{_libdir}/libgweather.so.*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/charpick_applet2
%{_libexecdir}/cpufreq-applet
@@ -344,12 +330,6 @@ fi
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%files devel
-%defattr(-,root,root)
-%{_includedir}/libgweather
-%{_libdir}/pkgconfig/gweather.pc
-%{_libdir}/libgweather.so
-
%changelog
* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-1
- Update to 2.21.4
commit c13792cf3701a9b279aadf4d90dc102007f3e750
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 06:51:57 2008 +0000
remove Locations.xml munging
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b089f31..6505ffe 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -41,7 +41,6 @@ License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
-Source1: copy.xsl
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -203,10 +202,6 @@ make
%install
rm -rf $RPM_BUILD_ROOT
-# waste less space
-xsltproc %{SOURCE1} gweather/Locations.xml > loc.xml
-sed -e "s/^\s*//" -e "/^$/d" loc.xml > gweather/Locations.xml
-
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
commit d34121a595d4d0f97928f709aadb13dfe318a120
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 06:34:05 2008 +0000
fix patch
diff --git a/gnome-applets-2.16.0.1-fix-null-applet.patch b/gnome-applets-2.16.0.1-fix-null-applet.patch
deleted file mode 100644
index 48b3393..0000000
--- a/gnome-applets-2.16.0.1-fix-null-applet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-applets-2.16.0.1/null_applet/null_applet.c.fix-null-applet 2006-12-15 17:09:57.000000000 -0500
-+++ gnome-applets-2.16.0.1/null_applet/null_applet.c 2006-12-15 17:10:55.000000000 -0500
-@@ -83,7 +83,7 @@
-
- for (l = list; l; l = l->next)
- {
-- key = g_strdup_printf ("%p/bonobo_iid", l->data);
-+ key = g_strdup_printf ("%s/bonobo_iid", l->data);
- oafiid = gconf_client_get_string (client, key, &error);
- if (error)
- {
diff --git a/gnome-applets-2.21.4-cpufreq.patch b/gnome-applets-2.21.4-cpufreq.patch
new file mode 100644
index 0000000..fadbdbc
--- /dev/null
+++ b/gnome-applets-2.21.4-cpufreq.patch
@@ -0,0 +1,38 @@
+diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c
+--- gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq 2008-01-03 15:36:29.000000000 -0500
++++ gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c 2008-01-16 01:28:07.000000000 -0500
+@@ -109,6 +109,9 @@ cpufreq_utils_selector_is_available (voi
+ if (!path)
+ return FALSE;
+
++ g_free (path);
++ return TRUE;
++
+ if (geteuid () == 0) {
+ g_free (path);
+ return TRUE;
+diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c
+--- gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq 2008-01-03 15:36:29.000000000 -0500
++++ gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c 2008-01-16 01:27:14.000000000 -0500
+@@ -176,20 +176,13 @@ static void
+ cpufreq_popup_run_selector (CPUFreqPopup *popup,
+ const gchar *params)
+ {
+- gchar *path;
+ guint cpu;
+ gchar *command;
+ GError *error = NULL;
+
+- path = g_find_program_in_path ("cpufreq-selector");
+-
+- if (!path)
+- return;
+-
+ cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
+
+- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
+- g_free (path);
++ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
+
+ g_spawn_command_line_async (command, &error);
+ g_free (command);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ee56aea..b089f31 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -49,12 +49,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.17.1-cpufreq.patch
+Patch4: gnome-applets-2.21.4-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=395035
-Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
Patch31: gnome-applets-2.18.0-fix-find.patch
@@ -172,7 +169,6 @@ libraries contained in the gnome-applets package.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
-%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
%patch35 -p1 -b .mixer-sync
commit c94b567b63537fc4f22576b0363077d053c7f075
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 05:48:15 2008 +0000
2.21.4
diff --git a/.cvsignore b/.cvsignore
index 84fc298..6697a86 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.21.2.tar.bz2
+gnome-applets-2.21.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b57fd2f..ee56aea 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.2
-Release: 2%{?dist}
+Version: 2.21.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -114,6 +114,7 @@ BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
+BuildRequires: libgweather-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -175,7 +176,7 @@ libraries contained in the gnome-applets package.
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
%patch35 -p1 -b .mixer-sync
-%patch39 -p1 -b .geweather-network
+%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -359,6 +360,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.4-1
+- Update to 2.21.4
+
* Sun Dec 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-2
- Silence the %%post script
diff --git a/gweather-network.patch b/gweather-network.patch
index 554cd93..feb574d 100644
--- a/gweather-network.patch
+++ b/gweather-network.patch
@@ -1,6 +1,6 @@
-diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2.20.0/gweather/gweather-applet.c
---- gnome-applets-2.20.0/gweather/gweather-applet.c.network 2007-10-21 00:12:36.000000000 -0400
-+++ gnome-applets-2.20.0/gweather/gweather-applet.c 2007-10-21 00:12:41.000000000 -0400
+diff -up gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network gnome-applets-2.21.2/gweather/gweather-applet.c
+--- gnome-applets-2.21.2/gweather/gweather-applet.c.gweather-network 2007-11-27 03:59:41.000000000 -0500
++++ gnome-applets-2.21.2/gweather/gweather-applet.c 2008-01-05 23:05:00.000000000 -0500
@@ -29,6 +29,10 @@
#include <libnotify/notification.h>
#endif
@@ -12,7 +12,7 @@ diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2
#include "gweather.h"
#include "gweather-about.h"
#include "gweather-pref.h"
-@@ -291,6 +295,8 @@ applet_destroy (GtkWidget *widget, GWeat
+@@ -288,6 +292,8 @@ applet_destroy (GtkWidget *widget, GWeat
weather_info_abort (gw_applet->gweather_info);
}
@@ -21,7 +21,7 @@ diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2
void gweather_applet_create (GWeatherApplet *gw_applet)
{
AtkObject *atk_obj;
-@@ -326,7 +332,7 @@ void gweather_applet_create (GWeatherApp
+@@ -323,7 +329,7 @@ void gweather_applet_create (GWeatherApp
g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",
@@ -30,7 +30,7 @@ diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2
gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
-@@ -356,9 +362,9 @@ void gweather_applet_create (GWeatherApp
+@@ -353,9 +359,9 @@ void gweather_applet_create (GWeatherApp
NULL);
}
@@ -43,25 +43,61 @@ diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2
}
gint timeout_cb (gpointer data)
-@@ -525,3 +531,52 @@ void gweather_update (GWeatherApplet *gw
+@@ -520,3 +526,88 @@ void gweather_update (GWeatherApplet *gw
update_finish, gw_applet);
}
}
+
++static void
++state_notify (DBusPendingCall *pending, gpointer data)
++{
++ GWeatherApplet *gw_applet = data;
++
++ DBusMessage *msg = dbus_pending_call_steal_reply (pending);
++
++ if (!msg)
++ return;
++
++ if (dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
++ dbus_uint32_t result;
++
++ if (dbus_message_get_args (msg, NULL,
++ DBUS_TYPE_UINT32, &result,
++ DBUS_TYPE_INVALID)) {
++ if (result == NM_STATE_CONNECTED) {
++ gweather_update (gw_applet);
++ }
++ }
++ }
++
++ dbus_message_unref (msg);
++}
++
++static void
++check_network (DBusConnection *connection, gpointer user_data)
++{
++ DBusMessage *message;
++ DBusPendingCall *reply;
++
++ message = dbus_message_new_method_call (NM_DBUS_SERVICE,
++ NM_DBUS_PATH,
++ NM_DBUS_INTERFACE,
++ "state");
++ if (dbus_connection_send_with_reply (connection, message, &reply, -1)) {
++ dbus_pending_call_set_notify (reply, state_notify, user_data, NULL);
++ dbus_pending_call_unref (reply);
++ }
++
++ dbus_message_unref (message);
++}
++
+static DBusHandlerResult
+filter_func (DBusConnection *connection, DBusMessage *message, void *user_data)
+{
-+ GWeatherApplet *gw_applet = user_data;
-+ guint32 state = NM_DEVICE_STATE_UNKNOWN;
-+
-+ if (dbus_message_is_signal (message,
-+ NM_DBUS_INTERFACE_DEVICE, "StateChanged")) {
-+ dbus_message_get_args (message, NULL,
-+ DBUS_TYPE_UINT32, &state,
-+ DBUS_TYPE_INVALID);
-+ if (state == NM_DEVICE_STATE_ACTIVATED) {
-+ gweather_update (gw_applet);
-+ }
++ if (dbus_message_is_signal (message,
++ NM_DBUS_INTERFACE,
++ "StateChanged")) {
++ check_network (connection, user_data);
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
diff --git a/sources b/sources
index 43b248f..969a690 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2a511432e38b222dffc0909f81419503 gnome-applets-2.21.2.tar.bz2
+dba81fa85a3b238b1a3b600865c2201d gnome-applets-2.21.4.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 83cc073c1172bf6e03de55fd527127716379f14a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 6 03:45:53 2008 +0000
remove unused patches
diff --git a/gnome-applets-2.20.0-mixer-out-of-sync.patch b/gnome-applets-2.20.0-mixer-out-of-sync.patch
deleted file mode 100644
index 5b6fed7..0000000
--- a/gnome-applets-2.20.0-mixer-out-of-sync.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-Index: applet.c
-===================================================================
---- applet.c (revision 10461)
-+++ applet.c (working copy)
-@@ -79,7 +79,12 @@
- PanelAppletOrient orient);
-
- static void gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-- gboolean force_refresh);
-+ gboolean force_refresh,
-+ gdouble volume,
-+ gint mute);
-+
-+static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
-+
- static gboolean cb_check (gpointer data);
-
- static void cb_volume (GtkAdjustment *adj,
-@@ -242,6 +247,12 @@
- /* i18n */
- ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
- atk_object_set_name (ao, _("Volume Control"));
-+
-+ /* Bus for notifications */
-+ applet->bus = gst_bus_new ();
-+ gst_bus_add_signal_watch (applet->bus);
-+ g_signal_connect (G_OBJECT (applet->bus), "message::element",
-+ (GCallback) cb_notify_message, applet);
- }
-
- /* Parse the list of tracks that are stored in GConf */
-@@ -368,12 +379,33 @@
- return FALSE;
-
- applet->mixer = g_object_ref (active_element);
-+ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
- applet->tracks = active_tracks;
- g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
-
- return TRUE;
- }
-
-+static void
-+gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
-+{
-+ gboolean need_timeout = TRUE;
-+ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
-+ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
-+
-+ if (need_timeout) {
-+ if (applet->timeout == 0) {
-+ applet->timeout = g_timeout_add (100, cb_check, applet);
-+ }
-+ }
-+ else {
-+ if (applet->timeout != 0) {
-+ g_source_remove (applet->timeout);
-+ applet->timeout = 0;
-+ }
-+ }
-+}
-+
- gboolean
- gnome_volume_applet_setup (GnomeVolumeApplet *applet,
- GList *elements)
-@@ -435,10 +467,9 @@
- component = panel_applet_get_popup_component (PANEL_APPLET (applet));
- g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
-
-- gnome_volume_applet_refresh (applet, TRUE);
-- if (res) {
-- applet->timeout = g_timeout_add (100, cb_check, applet);
-- }
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
-+ if (res)
-+ gnome_volume_applet_setup_timeout (applet);
-
- if (res) {
- /* gconf */
-@@ -479,6 +510,11 @@
- g_list_free (applet->elements);
- applet->elements = NULL;
- }
-+ gst_bus_remove_signal_watch (applet->bus);
-+ if (applet->bus) {
-+ gst_object_unref (applet->bus);
-+ applet->bus = NULL;
-+ }
-
- if (applet->tracks) {
- g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
-@@ -673,11 +709,11 @@
- component = panel_applet_get_popup_component (PANEL_APPLET (applet));
- bonobo_ui_component_set_prop (component,
- "/commands/Mute",
-- "state", mute ? "1" : "0", NULL);
-+ "state", !mute ? "1" : "0", NULL);
-
- /* update graphic - this should happen automagically after the next
- * idle call, but apparently doesn't for some people... */
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, !mute);
- }
-
- /*
-@@ -940,7 +976,7 @@
- }
-
- init_pixbufs (applet);
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
- }
-
- static void
-@@ -990,15 +1026,23 @@
- {
- int range = track->max_volume - track->min_volume;
- gdouble scale = ((gdouble) range) / 100;
-- int *volumes, n;
-+ int *volumes, n, volint;
-
-- volume *= scale;
-- volume += track->min_volume;
-+ if (volume == 1.0) {
-+ volint = track->max_volume;
-+ } else if (volume == 0.0) {
-+ volint = track->min_volume;
-+ } else {
-+ volume *= scale;
-+ volume += track->min_volume;
-+ volint = lrint (volume);
-+ }
-
- volumes = g_new (gint, track->num_channels);
- for (n = 0; n < track->num_channels; n++)
-- volumes[n] = lrint (volume);
-+ volumes[n] = volint;
- gst_mixer_set_volume (mixer, track, volumes);
-+
- g_free (volumes);
- }
-
-@@ -1049,6 +1093,8 @@
-
- applet->lock = FALSE;
- applet->force_next_update = TRUE;
-+
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
- }
-
- /*
-@@ -1059,31 +1105,40 @@
-
- static void
- gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
-- gboolean force_refresh)
-+ gboolean force_refresh,
-+ gdouble volume,
-+ gint mute)
- {
- BonoboUIComponent *component;
- GdkPixbuf *pixbuf;
- gint n;
-- gdouble volume;
-- gboolean mute, did_change;
-+ gboolean show_mute, did_change;
- gchar *tooltip_str;
- GstMixerTrack *first_track;
- GString *track_names;
- GList *iter;
-
-+ show_mute = 0;
-+
- if (!applet->mixer) {
- n = 0;
-- mute = FALSE;
-+ show_mute = 1;
-+ mute = 0;
- } else if (!applet->tracks) {
- return;
- } else {
-- /* only first track */
- first_track = g_list_first (applet->tracks)->data;
-- volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-- mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-- GST_MIXER_TRACK_MUTE);
-- if (volume <= 0) {
-- mute = TRUE;
-+
-+ if (volume == -1) {
-+ /* only first track */
-+ volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
-+ }
-+ if (mute == -1) {
-+ mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
-+ GST_MIXER_TRACK_MUTE) ? 1 : 0;
-+ }
-+ if (volume <= 0 || mute) {
-+ show_mute = 1;
- n = 0;
- }
- else {
-@@ -1101,7 +1156,7 @@
- applet->force_next_update = FALSE;
-
- if (did_change) {
-- if (mute) {
-+ if (show_mute) {
- pixbuf = applet->pix[0];
- } else {
- pixbuf = applet->pix[n];
-@@ -1125,7 +1180,7 @@
- track_names = g_string_append (track_names, track->label);
- }
-
-- if (mute) {
-+ if (show_mute) {
- tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
- } else {
- /* Translator comment: I'm not all too sure if this makes sense
-@@ -1152,10 +1207,56 @@
- "state", mute ? "1" : "0", NULL);
- }
-
-+static void
-+cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
-+{
-+ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
-+ GstMixerMessageType type;
-+ GstMixerTrack *first_track;
-+ GstMixerTrack *track = NULL;
-+ gint mute;
-+ gdouble volume;
-+
-+ if (applet->tracks == NULL ||
-+ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
-+ /* No tracks, or not from our mixer - can't update anything anyway */
-+ return;
-+ }
-+
-+ volume = mute = -1;
-+
-+ first_track = g_list_first (applet->tracks)->data;
-+
-+ /* This code only calls refresh if the first_track changes, because the
-+ * refresh code only retrieves the current value from that track anyway */
-+ type = gst_mixer_message_get_type (message);
-+ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
-+ gboolean muted;
-+ gst_mixer_message_parse_mute_toggled (message, &track, &muted);
-+ mute = muted ? 1 : 0;
-+ }
-+ else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
-+ gint n, num_channels, *vols;
-+ volume = 0.0;
-+
-+ gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
-+ for (n = 0; n < num_channels; n++)
-+ volume += vols[n];
-+ volume /= track->num_channels;
-+ volume = 100 * volume / (track->max_volume - track->min_volume);
-+ } else
-+ {
-+ return;
-+ }
-+
-+ if (first_track == track)
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
-+}
-+
- static gboolean
- cb_check (gpointer data)
- {
-- gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
-+ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, -1, -1);
-
- return TRUE;
- }
-@@ -1214,6 +1315,8 @@
- /* save */
- gst_object_replace ((GstObject **) &applet->mixer, item->data);
- gst_element_set_state (old_element, GST_STATE_NULL);
-+
-+ gnome_volume_applet_setup_timeout (applet);
- newdevice = TRUE;
- }
- break;
-@@ -1374,7 +1477,7 @@
- GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
-
- init_pixbufs (applet);
-- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
- }
-
- /*
-Index: applet.h
-===================================================================
---- applet.h (revision 10461)
-+++ applet.h (working copy)
-@@ -71,6 +71,7 @@
-
- /* element */
- GstMixer *mixer;
-+ GstBus *bus;
- gboolean lock;
- gint state;
- GList *tracks;
diff --git a/gweather-pc.patch b/gweather-pc.patch
deleted file mode 100644
index 0f35277..0000000
--- a/gweather-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc gnome-applets-2.20.0/libgweather/gweather.pc.in
---- gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc 2007-09-22 01:32:03.000000000 -0400
-+++ gnome-applets-2.20.0/libgweather/gweather.pc.in 2007-09-22 01:32:14.000000000 -0400
-@@ -7,5 +7,5 @@ Name: GWeather
- Description: GWeather shared library
- Version: @VERSION@
- Requires: gtk+-2.0, gnome-vfs-2.0
--Libs: -L${libdir}
-+Libs: -L${libdir} -lgweather
- Cflags: -I${includedir}
diff --git a/mixer-preferences-leak.patch b/mixer-preferences-leak.patch
deleted file mode 100644
index 319c277..0000000
--- a/mixer-preferences-leak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.20.0/mixer/preferences.c.leak gnome-applets-2.20.0/mixer/preferences.c
---- gnome-applets-2.20.0/mixer/preferences.c.leak 2007-09-27 00:49:39.000000000 -0400
-+++ gnome-applets-2.20.0/mixer/preferences.c 2007-09-27 00:50:50.000000000 -0400
-@@ -445,6 +445,8 @@ cb_track_select (GtkTreeSelection *selec
- }
- }
- }
-+ g_list_foreach (lst, (GFunc)gtk_tree_path_free, NULL);
-+ g_list_free (lst);
- }
-
- /* add the one just selected and adjust its volume if it's not the only one
diff --git a/nl_langinfo.patch b/nl_langinfo.patch
deleted file mode 100644
index 0610211..0000000
--- a/nl_langinfo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo gnome-applets-2.20.0/libgweather/gweather-prefs.c
---- gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo 2007-10-29 12:06:59.000000000 -0400
-+++ gnome-applets-2.20.0/libgweather/gweather-prefs.c 2007-10-29 12:07:42.000000000 -0400
-@@ -12,6 +12,8 @@
- # include <config.h>
- #endif
-
-+#include <langinfo.h>
-+
- #include <glib/gi18n-lib.h>
- #include <gconf/gconf-client.h>
- #include <libgweather/gweather-prefs.h>
-@@ -57,7 +59,7 @@ static GConfEnumStringPair distance_unit
- static void parse_temp_string (const gchar *gconf_str, GWeatherPrefs *prefs)
- {
- gint value = 0;
--#ifdef _NL_MEASUREMENT_MEASUREMENT
-+#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
- char *imperial = NULL;
- #endif
-
-@@ -81,7 +83,7 @@ static void parse_temp_string (const gch
- }
- }
- if (!prefs->temperature_unit || prefs->temperature_unit == TEMP_UNIT_DEFAULT ) {
--#ifdef _NL_MEASUREMENT_MEASUREMENT
-+#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
- imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
- if ( imperial && imperial[0] == 2 ) {
- /* imperial */
-@@ -95,7 +97,7 @@ static void parse_temp_string (const gch
- static void parse_speed_string (const gchar *gconf_str, GWeatherPrefs *prefs)
- {
- gint value = 0;
--#ifdef _NL_MEASUREMENT_MEASUREMENT
-+#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
- char *imperial = NULL;
- #endif
-
-@@ -119,7 +121,7 @@ static void parse_speed_string (const gc
- }
- }
- if ( (!prefs->speed_unit) || prefs->speed_unit == SPEED_UNIT_DEFAULT ) {
--#ifdef _NL_MEASUREMENT_MEASUREMENT
-+#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
- imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
- if ( imperial && imperial[0] == 2 ) {
- /* imperial */
-diff -up gnome-applets-2.20.0/configure.in.nl_langinfo gnome-applets-2.20.0/configure.in
---- gnome-applets-2.20.0/configure.in.nl_langinfo 2007-10-29 12:08:28.000000000 -0400
-+++ gnome-applets-2.20.0/configure.in 2007-10-29 12:09:28.000000000 -0400
-@@ -647,6 +647,20 @@ case $struct_tm_tm_gmtoff in
- esac
-
- dnl ***************************************************************************
-+dnl *** _NL_MEASUREMENT_MEASUREMENT is an enum and not a define ***
-+dnl ***************************************************************************
-+AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
-+AC_TRY_LINK([#include <langinfo.h>], [
-+char c;
-+c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
-+], gtk_ok=yes, gtk_ok=no)
-+AC_MSG_RESULT($gtk_ok)
-+if test "$gtk_ok" = "yes"; then
-+ AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
-+ [Define if _NL_MEASUREMENT_MEASUREMENT is available])
-+fi
-+
-+dnl ***************************************************************************
- dnl *** Honour aclocal flags ***
- dnl ***************************************************************************
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
diff --git a/weather-abort.patch b/weather-abort.patch
deleted file mode 100644
index 1982af0..0000000
--- a/weather-abort.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.20.0/libgweather/weather.c.weather-abort gnome-applets-2.20.0/libgweather/weather.c
---- gnome-applets-2.20.0/libgweather/weather.c.weather-abort 2007-10-29 12:05:50.000000000 -0400
-+++ gnome-applets-2.20.0/libgweather/weather.c 2007-10-29 12:06:09.000000000 -0400
-@@ -560,6 +560,8 @@ void weather_info_abort (WeatherInfo *in
- gnome_vfs_async_cancel(info->bom_handle);
- info->bom_handle = NULL;
- }
-+
-+ info->requests_pending = FALSE;
- }
-
- WeatherInfo *weather_info_clone (const WeatherInfo *info)
diff --git a/weather-update.patch b/weather-update.patch
deleted file mode 100644
index 4b22b39..0000000
--- a/weather-update.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-2.20.0/libgweather/weather.h.weather-update gnome-applets-2.20.0/libgweather/weather.h
---- gnome-applets-2.20.0/libgweather/weather.h.weather-update 2007-10-29 12:04:33.000000000 -0400
-+++ gnome-applets-2.20.0/libgweather/weather.h 2007-10-29 12:04:41.000000000 -0400
-@@ -121,7 +121,7 @@ WeatherInfo * _weather_info_fill (Weat
- WeatherInfoFunc cb,
- gpointer data);
- #define weather_info_new(location, prefs, cb, data) _weather_info_fill(NULL, (location), (prefs), (cb), (data))
--#define weather_info_update(info, prefs, cb, data) _weather_info_fill((info), NULL, (prefs), (cb), (data));
-+#define weather_info_update(info, prefs, cb, data) _weather_info_fill((info), NULL, (prefs), (cb), (data))
-
- void weather_info_abort (WeatherInfo *info);
- WeatherInfo * weather_info_clone (const WeatherInfo *info);
commit f22b474739d813189b8500690ecb851242f1768f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Dec 9 05:32:14 2007 +0000
Silence %post
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d2ebde5..b57fd2f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.21.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -280,7 +280,7 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas
+ %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
fi
fi
@@ -359,6 +359,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Dec 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-2
+- Silence the %%post script
+
* Wed Dec 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-1
- Update to 2.21.2
- Drop the battstat applet
commit 87fcef69cd3fb918447b15e0e5d73a6b40071543
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Dec 7 04:11:01 2007 +0000
2.21.2
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
new file mode 100644
index 0000000..95e4573
--- /dev/null
+++ b/gnome-applets-null-battstat.patch
@@ -0,0 +1,55 @@
+diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
+--- gnome-applets-2.21.2/null_applet/Makefile.am.battstat 2007-12-06 22:43:35.000000000 -0500
++++ gnome-applets-2.21.2/null_applet/Makefile.am 2007-12-06 22:43:43.000000000 -0500
+@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
+
+ null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+
++if !BUILD_BATTSTAT_APPLET
++battstat_applet=GNOME_BattstatApplet.server.in
++endif
++
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files = \
+ GNOME_NullApplet_Factory.server.in \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+- GNOME_Panel_WirelessApplet.server.in
++ GNOME_Panel_WirelessApplet.server.in \
++ $(battstat_applet)
+ server_DATA = $(server_in_files:.server.in=.server)
+
+ @INTLTOOL_SERVER_RULE@
+@@ -28,4 +33,5 @@ EXTRA_DIST = \
+ GNOME_NullApplet_Factory.server.in.in \
+ GNOME_CDPlayerApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+- GNOME_Panel_WirelessApplet.server.in
++ GNOME_Panel_WirelessApplet.server.in \
++ GNOME_BattstatApplet.server.in
+diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
+--- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat 2007-12-06 22:44:07.000000000 -0500
++++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in 2007-12-06 22:43:54.000000000 -0500
+@@ -0,0 +1,22 @@
++<oaf_info>
++
++<oaf_server iid="OAFIID:GNOME_BattstatApplet"
++ type="factory"
++ location="OAFIID:GNOME_NullApplet_Factory">
++
++ <oaf_attribute name="repo_ids" type="stringv">
++ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++ <item value="IDL:Bonobo/Control:1.0"/>
++ <item value="IDL:Bonobo/Unknown:1.0"/>
++ </oaf_attribute>
++ <oaf_attribute name="name" type="string" _value="Battery Charge Monitor"/>
++ <oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
++ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="battery"/>
++ <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
++
++
++</oaf_server>
++
++</oaf_info>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0f35e13..d2ebde5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -72,6 +72,9 @@ Patch35: gnome-applets-2.21.1-mixer-sync.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
+# do the nullapplet dance for battstat
+Patch40: gnome-applets-null-battstat.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -173,6 +176,7 @@ libraries contained in the gnome-applets package.
%patch33 -p1 -b .node-leak
%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .geweather-network
+%patch40 -p1 -b .battstat-null
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -194,6 +198,7 @@ autoreconf
%if %{build_stickynotes}
--enable-stickynotes \
%endif
+ --disable-battstat \
--disable-scrollkeeper \
--enable-mini-commander
make
@@ -213,13 +218,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
-
-desktop-file-install --vendor gnome --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-only-show-in GNOME \
- $RPM_BUILD_ROOT%{_datadir}/applications/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
# usermode-ify cpufreq-selector
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -246,7 +246,6 @@ fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas \
%{_sysconfdir}/gconf/schemas/charpick.schemas \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
@@ -279,13 +278,16 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
%{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+ if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas
+ fi
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/battstat.schemas \
%{_sysconfdir}/gconf/schemas/charpick.schemas \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
@@ -326,7 +328,6 @@ fi
%{python_sitelib}/invest/
%{_libdir}/libgweather.so.*
%{_libexecdir}/accessx-status-applet
-%{_libexecdir}/battstat-applet-2
%{_libexecdir}/charpick_applet2
%{_libexecdir}/cpufreq-applet
%{_libexecdir}/drivemount_applet2
@@ -350,7 +351,6 @@ fi
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/sound/events/*
%files devel
%defattr(-,root,root)
@@ -361,6 +361,7 @@ fi
%changelog
* Wed Dec 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-1
- Update to 2.21.2
+- Drop the battstat applet
* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-10
- Fix a number of problems in the weather applet
commit 9eab047b45f45578a09f4cad21a178dcd55681f3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 6 04:15:54 2007 +0000
2.21.2
diff --git a/.cvsignore b/.cvsignore
index 697ca94..84fc298 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-gnome-applets-2.21.1.tar.bz2
-gnome-applets-2.9.3.1-modemlights.tar.bz2
+gnome-applets-2.21.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8fc0ac8..0f35e13 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.1
+Version: 2.21.2
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
@@ -359,6 +359,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Wed Dec 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.21.2-1
+- Update to 2.21.2
+
* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-10
- Fix a number of problems in the weather applet
diff --git a/sources b/sources
index cfdc464..43b248f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3abfa92d933ed2eda39008c60141aa55 gnome-applets-2.21.1.tar.bz2
+2a511432e38b222dffc0909f81419503 gnome-applets-2.21.2.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit c5ef8169f753ed12096bf4a06f013e535071a52c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 18:21:03 2007 +0000
bump panel req
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 116b7f5..8fc0ac8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -5,7 +5,7 @@
%define libgnomeui_version 2.8.0
%define gnome_vfs_version 2.15.4
%define libglade_version 2.4.0
-%define gnome_panel_version 2.13.4
+%define gnome_panel_version 2.20.1-5
%define libgtop2_version 2.12.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
commit 60f948a55b507a1c318cebba97df0cb17d6c019e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 14:55:21 2007 +0000
2.21.1
diff --git a/.cvsignore b/.cvsignore
index 9f3c392..697ca94 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.21.1.tar.bz2
gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/gnome-applets-2.21.1-mixer-sync.patch b/gnome-applets-2.21.1-mixer-sync.patch
new file mode 100644
index 0000000..0d64130
--- /dev/null
+++ b/gnome-applets-2.21.1-mixer-sync.patch
@@ -0,0 +1,309 @@
+diff -up gnome-applets-2.21.1/mixer/applet.h.mixer-sync gnome-applets-2.21.1/mixer/applet.h
+--- gnome-applets-2.21.1/mixer/applet.h.mixer-sync 2007-07-27 22:02:35.000000000 -0400
++++ gnome-applets-2.21.1/mixer/applet.h 2007-11-13 09:39:37.000000000 -0500
+@@ -71,6 +71,7 @@ typedef struct _GnomeVolumeApplet {
+
+ /* element */
+ GstMixer *mixer;
++ GstBus *bus;
+ gboolean lock;
+ gint state;
+ GList *tracks;
+diff -up gnome-applets-2.21.1/mixer/applet.c.mixer-sync gnome-applets-2.21.1/mixer/applet.c
+--- gnome-applets-2.21.1/mixer/applet.c.mixer-sync 2007-11-03 20:12:18.000000000 -0400
++++ gnome-applets-2.21.1/mixer/applet.c 2007-11-13 09:47:09.000000000 -0500
+@@ -79,7 +79,12 @@ static void gnome_volume_applet_orientat
+ PanelAppletOrient orient);
+
+ static gboolean gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
+- gboolean force_refresh);
++ gboolean force_refresh,
++ gdouble volume,
++ gint mute);
++
++static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
++
+ static gboolean cb_check (gpointer data);
+
+ static void cb_volume (GtkAdjustment *adj,
+@@ -218,6 +223,12 @@ gnome_volume_applet_init (GnomeVolumeApp
+ /* i18n */
+ ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
+ atk_object_set_name (ao, _("Volume Control"));
++
++ /* Bus for notifications */
++ applet->bus = gst_bus_new ();
++ gst_bus_add_signal_watch (applet->bus);
++ g_signal_connect (G_OBJECT (applet->bus), "message::element",
++ (GCallback) cb_notify_message, applet);
+ }
+
+ /* Parse the list of tracks that are stored in GConf */
+@@ -344,12 +355,33 @@ select_element_and_track (GnomeVolumeApp
+ return FALSE;
+
+ applet->mixer = g_object_ref (active_element);
++ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
+ applet->tracks = active_tracks;
+ g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
+
+ return TRUE;
+ }
+
++static void
++gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
++{
++ gboolean need_timeout = TRUE;
++ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
++ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
++
++ if (need_timeout) {
++ if (applet->timeout == 0) {
++ applet->timeout = g_timeout_add (100, cb_check, applet);
++ }
++ }
++ else {
++ if (applet->timeout != 0) {
++ g_source_remove (applet->timeout);
++ applet->timeout = 0;
++ }
++ }
++}
++
+ gboolean
+ gnome_volume_applet_setup (GnomeVolumeApplet *applet,
+ GList *elements)
+@@ -411,10 +443,9 @@ gnome_volume_applet_setup (GnomeVolumeAp
+ component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+ g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
+
+- gnome_volume_applet_refresh (applet, TRUE);
+- if (res) {
+- applet->timeout = g_timeout_add (100, cb_check, applet);
+- }
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
++ if (res)
++ gnome_volume_applet_setup_timeout (applet);
+
+ if (res) {
+ /* gconf */
+@@ -455,6 +486,11 @@ gnome_volume_applet_dispose (GObject *ob
+ g_list_free (applet->elements);
+ applet->elements = NULL;
+ }
++ gst_bus_remove_signal_watch (applet->bus);
++ if (applet->bus) {
++ gst_object_unref (applet->bus);
++ applet->bus = NULL;
++ }
+
+ if (applet->tracks) {
+ g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
+@@ -649,11 +685,11 @@ gnome_volume_applet_toggle_mute (GnomeVo
+ component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+ bonobo_ui_component_set_prop (component,
+ "/commands/Mute",
+- "state", mute ? "1" : "0", NULL);
++ "state", !mute ? "1" : "0", NULL);
+
+ /* update graphic - this should happen automagically after the next
+ * idle call, but apparently doesn't for some people... */
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, !mute);
+ }
+
+ /*
+@@ -916,7 +952,7 @@ void gnome_volume_applet_size_allocate (
+ }
+
+ init_pixbufs (applet);
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+ }
+
+ static void
+@@ -966,15 +1002,23 @@ gnome_volume_applet_adjust_volume (GstMi
+ {
+ int range = track->max_volume - track->min_volume;
+ gdouble scale = ((gdouble) range) / 100;
+- int *volumes, n;
++ int *volumes, n, volint;
+
+- volume *= scale;
+- volume += track->min_volume;
++ if (volume == 1.0) {
++ volint = track->max_volume;
++ } else if (volume == 0.0) {
++ volint = track->min_volume;
++ } else {
++ volume *= scale;
++ volume += track->min_volume;
++ volint = lrint (volume);
++ }
+
+ volumes = g_new (gint, track->num_channels);
+ for (n = 0; n < track->num_channels; n++)
+- volumes[n] = lrint (volume);
++ volumes[n] = volint;
+ gst_mixer_set_volume (mixer, track, volumes);
++
+ g_free (volumes);
+ }
+
+@@ -1025,6 +1069,8 @@ cb_volume (GtkAdjustment *adj,
+
+ applet->lock = FALSE;
+ applet->force_next_update = TRUE;
++
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
+ }
+
+ /*
+@@ -1035,31 +1081,39 @@ cb_volume (GtkAdjustment *adj,
+
+ static gboolean
+ gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
+- gboolean force_refresh)
++ gboolean force_refresh,
++ gdouble volume,
++ gint mute)
+ {
+ BonoboUIComponent *component;
+ GdkPixbuf *pixbuf;
+ gint n;
+- gdouble volume;
+- gboolean mute, did_change;
++ gboolean show_mute, did_change;
+ gchar *tooltip_str;
+ GstMixerTrack *first_track;
+ GString *track_names;
+ GList *iter;
+
++ show_mute = 0;
++
+ if (!applet->mixer) {
+ n = 0;
+- mute = FALSE;
++ show_mute = 1;
++ mute = 0;
+ } else if (!applet->tracks) {
+ return FALSE;
+ } else {
+- /* only first track */
+ first_track = g_list_first (applet->tracks)->data;
+- volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
+- mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
+- GST_MIXER_TRACK_MUTE);
+- if (volume <= 0) {
+- mute = TRUE;
++ if (volume == -1) {
++ /* only first track */
++ volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
++ }
++ if (mute == -1) {
++ mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
++ GST_MIXER_TRACK_MUTE) ? 1 : 0;
++ }
++ if (volume <= 0 || mute) {
++ show_mute = 1;
+ n = 0;
+ }
+ else {
+@@ -1077,7 +1131,7 @@ gnome_volume_applet_refresh (GnomeVolume
+ applet->force_next_update = FALSE;
+
+ if (did_change) {
+- if (mute) {
++ if (show_mute) {
+ pixbuf = applet->pix[0];
+ } else {
+ pixbuf = applet->pix[n];
+@@ -1101,7 +1155,7 @@ gnome_volume_applet_refresh (GnomeVolume
+ track_names = g_string_append (track_names, track->label);
+ }
+
+- if (mute) {
++ if (show_mute) {
+ tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
+ } else {
+ /* Translator comment: I'm not all too sure if this makes sense
+@@ -1129,6 +1183,52 @@ gnome_volume_applet_refresh (GnomeVolume
+ return did_change;
+ }
+
++static void
++cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
++{
++ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
++ GstMixerMessageType type;
++ GstMixerTrack *first_track;
++ GstMixerTrack *track = NULL;
++ gint mute;
++ gdouble volume;
++
++ if (applet->tracks == NULL ||
++ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
++ /* No tracks, or not from our mixer - can't update anything anyway */
++ return;
++ }
++
++ volume = mute = -1;
++
++ first_track = g_list_first (applet->tracks)->data;
++
++ /* This code only calls refresh if the first_track changes, because the
++ * refresh code only retrieves the current value from that track anyway */
++ type = gst_mixer_message_get_type (message);
++ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
++ gboolean muted;
++ gst_mixer_message_parse_mute_toggled (message, &track, &muted);
++ mute = muted ? 1 : 0;
++ }
++ else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
++ gint n, num_channels, *vols;
++ volume = 0.0;
++
++ gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
++ for (n = 0; n < num_channels; n++)
++ volume += vols[n];
++ volume /= track->num_channels;
++ volume = 100 * volume / (track->max_volume - track->min_volume);
++ } else
++ {
++ return;
++ }
++
++ if (first_track == track)
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
++}
++
+ static gboolean
+ cb_check (gpointer data)
+ {
+@@ -1146,7 +1246,7 @@ cb_check (gpointer data)
+ */
+ if (time_counter % timeout == 0 || recent_change) {
+ did_change = gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data),
+- FALSE);
++ FALSE, -1, -1);
+
+ /*
+ * If a change was done, set recent_change so that the update is
+@@ -1227,6 +1327,8 @@ cb_gconf (GConfClient *client,
+ /* save */
+ gst_object_replace ((GstObject **) &applet->mixer, item->data);
+ gst_element_set_state (old_element, GST_STATE_NULL);
++
++ gnome_volume_applet_setup_timeout (applet);
+ newdevice = TRUE;
+ }
+ break;
+@@ -1387,7 +1489,7 @@ cb_theme_change (GtkIconTheme *icon_them
+ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
+
+ init_pixbufs (applet);
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+ }
+
+ /*
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 68a46b9..116b7f5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,13 +34,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.21.2
-Release: 10%{?dist}
+Version: 2.21.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
Source1: copy.xsl
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -67,24 +67,11 @@ Patch33: gnome-applets-2.18.0-node-leak.patch
Patch34: ppp-includes.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
-Patch35: gnome-applets-2.20.0-mixer-out-of-sync.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=479172
-Patch36: gweather-pc.patch
-
-# fixed in upstream svn
-Patch38: mixer-preferences-leak.patch
+Patch35: gnome-applets-2.21.1-mixer-sync.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=491435
-Patch40: weather-update.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=491437
-Patch41: weather-abort.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=491438
-Patch42: nl_langinfo.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -184,15 +171,8 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
-pushd mixer/
-%patch35 -p0 -b .mixer-sync
-popd
-%patch36 -p1 -b .gweather-pc
-%patch38 -p1 -b .mixer-preferences-leak
+%patch35 -p1 -b .mixer-sync
%patch39 -p1 -b .geweather-network
-%patch40 -p1 -b .weather-update
-%patch41 -p1 -b .weather-abort
-%patch42 -p1 -b .nl_langinfo
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -205,10 +185,10 @@ tar xjf %{SOURCE2}
%patch34 -p1 -b .ppp-includes
intltoolize --force
-autoconf
+autoreconf
+
%build
-autoreconf
%configure \
--enable-suid=no \
%if %{build_stickynotes}
diff --git a/sources b/sources
index e7c7830..cfdc464 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-985cfc3c58a72e1a92201bf4a4873b87 gnome-applets-2.20.0.tar.bz2
+3abfa92d933ed2eda39008c60141aa55 gnome-applets-2.21.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 9ede4b3a34255d0cde927d1118f46edc3de55af2
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 14:36:59 2007 +0000
2.21.1
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 54e40ef..68a46b9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -24,6 +24,7 @@
%define pygtk_version 2.6
%define gnome_python_version 2.10
%define gconf_version 2.14.0
+%define libgnomekbd_version 2.21
%define po_package gnome-applets-2.0
@@ -33,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.20.0
+Version: 2.21.2
Release: 10%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
@@ -119,7 +120,7 @@ BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: perl(XML::Parser)
-BuildRequires: libgnomekbd-devel
+BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
commit 57b63375f6512d996c44f9107d1f620c9ecac16e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Oct 29 16:31:45 2007 +0000
Fix a number of problems in the weather applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b4dbf8d..54e40ef 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -77,6 +77,13 @@ Patch38: mixer-preferences-leak.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=491435
+Patch40: weather-update.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=491437
+Patch41: weather-abort.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=491438
+Patch42: nl_langinfo.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -182,6 +189,9 @@ popd
%patch36 -p1 -b .gweather-pc
%patch38 -p1 -b .mixer-preferences-leak
%patch39 -p1 -b .geweather-network
+%patch40 -p1 -b .weather-update
+%patch41 -p1 -b .weather-abort
+%patch42 -p1 -b .nl_langinfo
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -368,6 +378,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-10
+- Fix a number of problems in the weather applet
+
* Tue Oct 23 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-9
- Rebuild against new dbus-glib
diff --git a/nl_langinfo.patch b/nl_langinfo.patch
new file mode 100644
index 0000000..0610211
--- /dev/null
+++ b/nl_langinfo.patch
@@ -0,0 +1,72 @@
+diff -up gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo gnome-applets-2.20.0/libgweather/gweather-prefs.c
+--- gnome-applets-2.20.0/libgweather/gweather-prefs.c.nl_langinfo 2007-10-29 12:06:59.000000000 -0400
++++ gnome-applets-2.20.0/libgweather/gweather-prefs.c 2007-10-29 12:07:42.000000000 -0400
+@@ -12,6 +12,8 @@
+ # include <config.h>
+ #endif
+
++#include <langinfo.h>
++
+ #include <glib/gi18n-lib.h>
+ #include <gconf/gconf-client.h>
+ #include <libgweather/gweather-prefs.h>
+@@ -57,7 +59,7 @@ static GConfEnumStringPair distance_unit
+ static void parse_temp_string (const gchar *gconf_str, GWeatherPrefs *prefs)
+ {
+ gint value = 0;
+-#ifdef _NL_MEASUREMENT_MEASUREMENT
++#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+ char *imperial = NULL;
+ #endif
+
+@@ -81,7 +83,7 @@ static void parse_temp_string (const gch
+ }
+ }
+ if (!prefs->temperature_unit || prefs->temperature_unit == TEMP_UNIT_DEFAULT ) {
+-#ifdef _NL_MEASUREMENT_MEASUREMENT
++#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+ imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
+ if ( imperial && imperial[0] == 2 ) {
+ /* imperial */
+@@ -95,7 +97,7 @@ static void parse_temp_string (const gch
+ static void parse_speed_string (const gchar *gconf_str, GWeatherPrefs *prefs)
+ {
+ gint value = 0;
+-#ifdef _NL_MEASUREMENT_MEASUREMENT
++#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+ char *imperial = NULL;
+ #endif
+
+@@ -119,7 +121,7 @@ static void parse_speed_string (const gc
+ }
+ }
+ if ( (!prefs->speed_unit) || prefs->speed_unit == SPEED_UNIT_DEFAULT ) {
+-#ifdef _NL_MEASUREMENT_MEASUREMENT
++#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
+ imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
+ if ( imperial && imperial[0] == 2 ) {
+ /* imperial */
+diff -up gnome-applets-2.20.0/configure.in.nl_langinfo gnome-applets-2.20.0/configure.in
+--- gnome-applets-2.20.0/configure.in.nl_langinfo 2007-10-29 12:08:28.000000000 -0400
++++ gnome-applets-2.20.0/configure.in 2007-10-29 12:09:28.000000000 -0400
+@@ -647,6 +647,20 @@ case $struct_tm_tm_gmtoff in
+ esac
+
+ dnl ***************************************************************************
++dnl *** _NL_MEASUREMENT_MEASUREMENT is an enum and not a define ***
++dnl ***************************************************************************
++AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
++AC_TRY_LINK([#include <langinfo.h>], [
++char c;
++c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
++], gtk_ok=yes, gtk_ok=no)
++AC_MSG_RESULT($gtk_ok)
++if test "$gtk_ok" = "yes"; then
++ AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
++ [Define if _NL_MEASUREMENT_MEASUREMENT is available])
++fi
++
++dnl ***************************************************************************
+ dnl *** Honour aclocal flags ***
+ dnl ***************************************************************************
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
diff --git a/weather-abort.patch b/weather-abort.patch
new file mode 100644
index 0000000..1982af0
--- /dev/null
+++ b/weather-abort.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.20.0/libgweather/weather.c.weather-abort gnome-applets-2.20.0/libgweather/weather.c
+--- gnome-applets-2.20.0/libgweather/weather.c.weather-abort 2007-10-29 12:05:50.000000000 -0400
++++ gnome-applets-2.20.0/libgweather/weather.c 2007-10-29 12:06:09.000000000 -0400
+@@ -560,6 +560,8 @@ void weather_info_abort (WeatherInfo *in
+ gnome_vfs_async_cancel(info->bom_handle);
+ info->bom_handle = NULL;
+ }
++
++ info->requests_pending = FALSE;
+ }
+
+ WeatherInfo *weather_info_clone (const WeatherInfo *info)
diff --git a/weather-update.patch b/weather-update.patch
new file mode 100644
index 0000000..4b22b39
--- /dev/null
+++ b/weather-update.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.20.0/libgweather/weather.h.weather-update gnome-applets-2.20.0/libgweather/weather.h
+--- gnome-applets-2.20.0/libgweather/weather.h.weather-update 2007-10-29 12:04:33.000000000 -0400
++++ gnome-applets-2.20.0/libgweather/weather.h 2007-10-29 12:04:41.000000000 -0400
+@@ -121,7 +121,7 @@ WeatherInfo * _weather_info_fill (Weat
+ WeatherInfoFunc cb,
+ gpointer data);
+ #define weather_info_new(location, prefs, cb, data) _weather_info_fill(NULL, (location), (prefs), (cb), (data))
+-#define weather_info_update(info, prefs, cb, data) _weather_info_fill((info), NULL, (prefs), (cb), (data));
++#define weather_info_update(info, prefs, cb, data) _weather_info_fill((info), NULL, (prefs), (cb), (data))
+
+ void weather_info_abort (WeatherInfo *info);
+ WeatherInfo * weather_info_clone (const WeatherInfo *info);
commit 7df93f30ebe17a22ea20d52ad48b29a44c456be3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Oct 23 05:04:00 2007 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d6a5200..b4dbf8d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -368,6 +368,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Tue Oct 23 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-9
+- Rebuild against new dbus-glib
+
* Sun Oct 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-8
- Update weather info when going online
commit 04a063b31eff55679fc9e49461b2438e816aae91
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 15:35:31 2007 +0000
add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9861141..d6a5200 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -74,7 +74,7 @@ Patch36: gweather-pc.patch
# fixed in upstream svn
Patch38: mixer-preferences-leak.patch
-#
+# http://bugzilla.gnome.org/show_bug.cgi?id=488824
Patch39: gweather-network.patch
BuildRequires: glib2-devel >= %{glib2_version}
commit 842f03afa6f36718aa062e1476b6bdd13e82f51e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 04:29:14 2007 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b3b8952..9861141 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -114,6 +114,8 @@ BuildRequires: gnome-icon-theme
BuildRequires: perl(XML::Parser)
BuildRequires: libgnomekbd-devel
BuildRequires: libxslt
+# for patch 39
+BuildRequires: NetworkManager-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit 211c3040d604b58cec5f4355a36a6b816aa5a1c7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 04:18:14 2007 +0000
Update weather info when going online
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9004d2a..b3b8952 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -62,17 +62,21 @@ Patch33: gnome-applets-2.18.0-node-leak.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=370937
# Patch34: mixer-wakeups.patch
+
+Patch34: ppp-includes.patch
+
# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
Patch35: gnome-applets-2.20.0-mixer-out-of-sync.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=479172
Patch36: gweather-pc.patch
-Patch34: ppp-includes.patch
-
# fixed in upstream svn
Patch38: mixer-preferences-leak.patch
+#
+Patch39: gweather-network.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -175,6 +179,7 @@ pushd mixer/
popd
%patch36 -p1 -b .gweather-pc
%patch38 -p1 -b .mixer-preferences-leak
+%patch39 -p1 -b .geweather-network
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -361,6 +366,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Oct 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-8
+- Update weather info when going online
+
* Fri Oct 12 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-7
- Update out-of-sync patch to handle mute properly (#320451)
diff --git a/gweather-network.patch b/gweather-network.patch
new file mode 100644
index 0000000..554cd93
--- /dev/null
+++ b/gweather-network.patch
@@ -0,0 +1,98 @@
+diff -up gnome-applets-2.20.0/gweather/gweather-applet.c.network gnome-applets-2.20.0/gweather/gweather-applet.c
+--- gnome-applets-2.20.0/gweather/gweather-applet.c.network 2007-10-21 00:12:36.000000000 -0400
++++ gnome-applets-2.20.0/gweather/gweather-applet.c 2007-10-21 00:12:41.000000000 -0400
+@@ -29,6 +29,10 @@
+ #include <libnotify/notification.h>
+ #endif
+
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
++#include <NetworkManager/NetworkManager.h>
++
+ #include "gweather.h"
+ #include "gweather-about.h"
+ #include "gweather-pref.h"
+@@ -291,6 +295,8 @@ applet_destroy (GtkWidget *widget, GWeat
+ weather_info_abort (gw_applet->gweather_info);
+ }
+
++static void setup_network_monitor (GWeatherApplet *gw_applet);
++
+ void gweather_applet_create (GWeatherApplet *gw_applet)
+ {
+ AtkObject *atk_obj;
+@@ -326,7 +332,7 @@ void gweather_applet_create (GWeatherApp
+ g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
+ GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
+ g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",
+- G_CALLBACK(key_press_cb), gw_applet);
++ G_CALLBACK(key_press_cb), gw_applet);
+
+ gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
+
+@@ -356,9 +362,9 @@ void gweather_applet_create (GWeatherApp
+ NULL);
+ }
+
+- place_widgets(gw_applet);
+-
+- return;
++ place_widgets(gw_applet);
++
++ setup_network_monitor (gw_applet);
+ }
+
+ gint timeout_cb (gpointer data)
+@@ -525,3 +531,52 @@ void gweather_update (GWeatherApplet *gw
+ update_finish, gw_applet);
+ }
+ }
++
++static DBusHandlerResult
++filter_func (DBusConnection *connection, DBusMessage *message, void *user_data)
++{
++ GWeatherApplet *gw_applet = user_data;
++ guint32 state = NM_DEVICE_STATE_UNKNOWN;
++
++ if (dbus_message_is_signal (message,
++ NM_DBUS_INTERFACE_DEVICE, "StateChanged")) {
++ dbus_message_get_args (message, NULL,
++ DBUS_TYPE_UINT32, &state,
++ DBUS_TYPE_INVALID);
++ if (state == NM_DEVICE_STATE_ACTIVATED) {
++ gweather_update (gw_applet);
++ }
++
++ return DBUS_HANDLER_RESULT_HANDLED;
++ }
++
++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++}
++
++static void
++setup_network_monitor (GWeatherApplet *gw_applet)
++{
++ GError *error;
++ static DBusGConnection *bus = NULL;
++ DBusConnection *dbus;
++
++ if (bus == NULL) {
++ error = NULL;
++ bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++ if (bus == NULL) {
++ g_warning ("Couldn't connect to system bus: %s",
++ error->message);
++ g_error_free (error);
++
++ return;
++ }
++
++ dbus = dbus_g_connection_get_connection (bus);
++ dbus_connection_add_filter (dbus, filter_func, gw_applet, NULL);
++ dbus_bus_add_match (dbus,
++ "type='signal',"
++ "interface='" NM_DBUS_INTERFACE_DEVICE "'",
++ NULL);
++ }
++}
++
commit 6be108934d924b2c1a9db6be7567d28f885947d6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Oct 20 03:10:24 2007 +0000
fix source url
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f741819..9004d2a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -39,7 +39,7 @@ Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
Source1: copy.xsl
Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 9cd36a0e82a74bd59518162018ca4d5904e16054
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Mon Oct 15 18:47:54 2007 +0000
makefile update to properly grab makefile.common
diff --git a/Makefile b/Makefile
index cd1ea91..139806a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,21 @@
# Makefile for source rpm: gnome-applets
-# $Id$
+# $Id: Makefile,v 1.1 2004/09/09 05:20:42 cvsdist Exp $
NAME := gnome-applets
SPECFILE = $(firstword $(wildcard *.spec))
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
commit d54f0a6e31a8ad07c33bac81635c00d7c758d8d7
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Fri Oct 12 14:55:35 2007 +0000
- Update out-of-sync patch to handle mute properly (#320451)
diff --git a/gnome-applets-2.20.0-mixer-out-of-sync.patch b/gnome-applets-2.20.0-mixer-out-of-sync.patch
index 1f4f086..5b6fed7 100644
--- a/gnome-applets-2.20.0-mixer-out-of-sync.patch
+++ b/gnome-applets-2.20.0-mixer-out-of-sync.patch
@@ -1,6 +1,6 @@
Index: applet.c
===================================================================
---- applet.c (revision 10436)
+--- applet.c (revision 10461)
+++ applet.c (working copy)
@@ -79,7 +79,12 @@
PanelAppletOrient orient);
@@ -89,12 +89,17 @@ Index: applet.c
if (applet->tracks) {
g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
-@@ -677,7 +713,7 @@
+@@ -673,11 +709,11 @@
+ component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+ bonobo_ui_component_set_prop (component,
+ "/commands/Mute",
+- "state", mute ? "1" : "0", NULL);
++ "state", !mute ? "1" : "0", NULL);
/* update graphic - this should happen automagically after the next
* idle call, but apparently doesn't for some people... */
- gnome_volume_applet_refresh (applet, TRUE);
-+ gnome_volume_applet_refresh (applet, TRUE, -1, mute);
++ gnome_volume_applet_refresh (applet, TRUE, -1, !mute);
}
/*
@@ -179,6 +184,8 @@ Index: applet.c
- volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
- mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
- GST_MIXER_TRACK_MUTE);
+- if (volume <= 0) {
+- mute = TRUE;
+
+ if (volume == -1) {
+ /* only first track */
@@ -188,8 +195,7 @@ Index: applet.c
+ mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
+ GST_MIXER_TRACK_MUTE) ? 1 : 0;
+ }
- if (volume <= 0) {
-- mute = TRUE;
++ if (volume <= 0 || mute) {
+ show_mute = 1;
n = 0;
}
@@ -290,7 +296,7 @@ Index: applet.c
/*
Index: applet.h
===================================================================
---- applet.h (revision 10436)
+--- applet.h (revision 10461)
+++ applet.h (working copy)
@@ -71,6 +71,7 @@
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7897c48..f741819 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -361,6 +361,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Fri Oct 12 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-7
+- Update out-of-sync patch to handle mute properly (#320451)
+
* Thu Sep 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-6
- Fix a memory leak in the mixer preferences
commit 98a7ed9bd1ecf2522618fbeab341f371cc3c2c00
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Oct 4 16:58:32 2007 +0000
drop unused patches
diff --git a/gnome-applets-2.15.1.1-cpufreq.patch b/gnome-applets-2.15.1.1-cpufreq.patch
deleted file mode 100644
index 1b83f5c..0000000
--- a/gnome-applets-2.15.1.1-cpufreq.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c.cpufreq 2006-06-19 08:40:36.000000000 -0400
-+++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c 2006-06-19 08:40:47.000000000 -0400
-@@ -105,6 +105,8 @@
- if (!path)
- return FALSE;
-
-+ return TRUE;
-+
- if (geteuid () == 0)
- return TRUE;
-
---- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c.cpufreq 2006-06-15 01:01:54.000000000 -0400
-+++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c 2006-06-19 08:43:05.000000000 -0400
-@@ -246,19 +246,13 @@
- cpufreq_popup_run_selector (CPUFreqPopup *popup,
- const gchar *params)
- {
-- gchar *path;
- guint cpu;
- gchar *command;
- GError *error = NULL;
-
-- path = g_find_program_in_path ("cpufreq-selector");
--
-- if (!path)
-- return;
--
- cpu = cpufreq_prefs_get_cpu (popup->priv->prefs);
-
-- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
-+ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
-
- g_spawn_command_line_async (command, &error);
- g_free (command);
diff --git a/gnome-applets-2.16.0.1-cpufreq-changes.patch b/gnome-applets-2.16.0.1-cpufreq-changes.patch
deleted file mode 100644
index 14d6b43..0000000
--- a/gnome-applets-2.16.0.1-cpufreq-changes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- gnome-applets-2.16.0.1/cpufreq/src/cpufreq-applet.c.cpufreq-changes 2006-10-23 23:44:40.000000000 -0400
-+++ gnome-applets-2.16.0.1/cpufreq/src/cpufreq-applet.c 2006-10-23 23:45:42.000000000 -0400
-@@ -54,6 +54,7 @@
- gboolean show_perc;
- gboolean show_unit;
- gboolean show_icon;
-+ gboolean do_refresh;
-
- CPUFreqMonitor *monitor;
-
-@@ -222,6 +223,8 @@
- applet->size = panel_applet_get_size (PANEL_APPLET (applet));
- applet->orient = panel_applet_get_orient (PANEL_APPLET (applet));
-
-+ applet->do_refresh = TRUE;
-+
- gtk_widget_show (GTK_WIDGET (applet));
- }
-
-@@ -663,7 +666,6 @@
- gint perc;
- guint cpu;
- gchar *governor;
-- static gboolean do_refresh = TRUE;
-
- cpu = cpufreq_monitor_get_cpu (monitor);
- freq = cpufreq_monitor_get_frequency (monitor);
-@@ -713,9 +715,9 @@
- g_free (text_tip);
-
- /* Call refresh only the first time */
-- if (do_refresh) {
-+ if (applet->do_refresh) {
- cpufreq_applet_refresh (applet);
-- do_refresh = FALSE;
-+ applet->do_refresh = FALSE;
- }
- }
-
-@@ -844,6 +846,18 @@
- }
-
- static void
-+cpufreq_applet_prefs_cpu_changed (CPUFreqPrefs *prefs,
-+ GParamSpec *arg1,
-+ CPUFreqApplet *applet)
-+{
-+ gint cpu;
-+
-+ cpu = cpufreq_prefs_get_cpu (prefs);
-+ cpufreq_monitor_set_cpu (applet->monitor, cpu);
-+ cpufreq_applet_update (applet, applet->monitor);
-+}
-+
-+static void
- cpufreq_applet_setup (CPUFreqApplet *applet)
- {
- BonoboUIComponent *popup_component;
-@@ -873,9 +887,11 @@
- "notify::show-text-mode",
- G_CALLBACK (cpufreq_applet_prefs_show_mode_changed),
- (gpointer) applet);
-+ g_signal_connect (G_OBJECT (applet->prefs),
-+ "notify::cpu",
-+ G_CALLBACK (cpufreq_applet_prefs_cpu_changed),
-+ (gpointer) applet);
-
-- cpufreq_applet_update_visibility (applet);
--
- /* Monitor */
- applet->monitor = cpufreq_monitor_factory_create_monitor (
- cpufreq_prefs_get_cpu (applet->prefs));
-@@ -884,6 +900,8 @@
- G_CALLBACK (cpufreq_applet_update),
- (gpointer) applet);
-
-+ cpufreq_applet_update_visibility (applet);
-+
- /* Setup the menus */
- panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
- DATADIR,
diff --git a/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch b/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
deleted file mode 100644
index 6704320..0000000
--- a/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- gnome-applets-2.16.0.1/mixer/load.c.delay-gstreamer-initialization 2006-12-12 15:20:06.000000000 -0500
-+++ gnome-applets-2.16.0.1/mixer/load.c 2006-12-12 15:29:08.000000000 -0500
-@@ -25,7 +25,7 @@
-
- #include <string.h>
-
--#include <glib/glist.h>
-+#include <glib.h>
- #ifdef HAVE_GST10
- #include <gst/audio/mixerutils.h>
- #else
-@@ -293,21 +293,41 @@
- #endif
-
- static gboolean
--gnome_volume_applet_factory (PanelApplet *applet,
-- const gchar *iid,
-- gpointer data)
-+gnome_volume_applet_toplevel_configure_handler (GtkWidget *widget,
-+ GdkEventConfigure *event,
-+ gpointer data)
- {
- GList *elements;
- static gboolean init = FALSE;
-
-+ g_signal_handlers_disconnect_by_func (widget,
-+ gnome_volume_applet_toplevel_configure_handler,
-+ data);
-+
- if (!init) {
- gst_init (NULL, NULL);
- init = TRUE;
- }
-
- elements = create_mixer_collection ();
-- gnome_volume_applet_setup (GNOME_VOLUME_APPLET (applet), elements);
-+ gnome_volume_applet_setup (GNOME_VOLUME_APPLET (data), elements);
-+
-+ return FALSE;
-+}
-
-+static gboolean
-+gnome_volume_applet_factory (PanelApplet *applet,
-+ const gchar *iid,
-+ gpointer data)
-+{
-+ /* we delay applet specific initialization until the applet
-+ * is fully registered with the panel since gst_init() can block
-+ * for longer than the service activation timeouts
-+ */
-+ g_signal_connect (gtk_widget_get_toplevel (GTK_WIDGET (applet)),
-+ "configure-event",
-+ G_CALLBACK (gnome_volume_applet_toplevel_configure_handler),
-+ applet);
- return TRUE;
- }
-
diff --git a/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch b/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
deleted file mode 100644
index 85b44b0..0000000
--- a/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c.keyboard-indicator-segfault 2006-08-12 21:26:53.000000000 -0400
-+++ gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c 2006-09-18 09:23:54.000000000 -0400
-@@ -410,18 +410,22 @@
- xkl_engine_get_num_groups (globals.engine);
- globals.full_group_names =
- g_new0 (char *, total_groups + 1);
-+ globals.short_group_names =
-+ g_new0 (char *, total_groups + 1);
-
- if (xkl_engine_get_features (globals.engine) &
- XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
- GSList *lst = globals.kbd_cfg.layouts;
-- for (i = 0; lst; lst = lst->next) {
-- globals.full_group_names[i++] =
-- g_strdup ((char *) lst->data);
-+ for (i = 0; lst; lst = lst->next,i++) {
-+ globals.short_group_names[i] =
-+ globals.full_group_names[i] =
-+ g_strdup ((char *) lst->data);
- }
- } else {
- for (i = total_groups; --i >= 0;) {
-- globals.full_group_names[i] =
-- g_strdup_printf ("Group %d", i);
-+ globals.short_group_names[i] =
-+ globals.full_group_names[i] =
-+ g_strdup_printf ("Group %d", i);
- }
- }
- }
diff --git a/gnome-applets-2.16.1-desktop-files.patch b/gnome-applets-2.16.1-desktop-files.patch
deleted file mode 100644
index 0899c7f..0000000
--- a/gnome-applets-2.16.1-desktop-files.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-applets-2.16.1/invest-applet/data/invest-chart.desktop.in.desktop-files 2006-10-24 00:25:14.000000000 -0400
-+++ gnome-applets-2.16.1/invest-applet/data/invest-chart.desktop.in 2006-10-24 00:26:59.000000000 -0400
-@@ -7,4 +7,5 @@
- Type=Application
- Icon=invest-big.png
- StartupNotify=true
--Categories=Application;Office;Spreadsheet;
-+Categories=Office;Spreadsheet;
-+NoDisplay=true
diff --git a/gnome-applets-2.16.1-mixer-mute.patch b/gnome-applets-2.16.1-mixer-mute.patch
deleted file mode 100644
index 3cc8d61..0000000
--- a/gnome-applets-2.16.1-mixer-mute.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-applets-2.16.1/mixer/applet.c.mixer-mute 2006-11-16 09:59:46.000000000 -0500
-+++ gnome-applets-2.16.1/mixer/applet.c 2006-11-16 12:11:22.000000000 -0500
-@@ -1098,7 +1098,11 @@
- applet->force_next_update = FALSE;
-
- if (did_change) {
-- pixbuf = applet->pix[n];
-+ if (mute) {
-+ pixbuf = applet->pix[0];
-+ } else {
-+ pixbuf = applet->pix[n];
-+ }
-
- gtk_image_set_from_pixbuf (applet->image, pixbuf);
- applet->state = STATE (volume, mute);
diff --git a/gnome-applets-2.16.2-trash-screen.patch b/gnome-applets-2.16.2-trash-screen.patch
deleted file mode 100644
index 570ffde..0000000
--- a/gnome-applets-2.16.2-trash-screen.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gnome-applets-2.16.2/trashapplet/src/trashapplet.c.trash-screen 2006-12-05 16:33:56.000000000 -0500
-+++ gnome-applets-2.16.2/trashapplet/src/trashapplet.c 2006-12-05 16:32:41.000000000 -0500
-@@ -669,6 +669,8 @@
- TrashApplet *applet,
- const gchar *cname)
- {
-+ GdkScreen *screen;
-+
- /* Open the "trash:" URI with gnome-open */
- gchar *argv[] = { "gnome-open", "trash:", NULL };
- GError *err = NULL;
-@@ -676,12 +678,13 @@
-
- g_return_if_fail (TRASH_IS_APPLET (applet));
-
-- res = g_spawn_async (NULL,
-- argv, NULL,
-- G_SPAWN_SEARCH_PATH,
-- NULL, NULL,
-- NULL,
-- &err);
-+ screen = gtk_widget_get_screen (GTK_WIDGET (applet));
-+ res = gdk_spawn_on_screen (screen, NULL,
-+ argv, NULL,
-+ G_SPAWN_SEARCH_PATH,
-+ NULL, NULL,
-+ NULL,
-+ &err);
-
- if (! res) {
- error_dialog (applet, _("Error while spawning nautilus:\n%s"),
diff --git a/gnome-applets-2.18.0-bug-buddy.patch b/gnome-applets-2.18.0-bug-buddy.patch
deleted file mode 100644
index 1581b8e..0000000
--- a/gnome-applets-2.18.0-bug-buddy.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in.bug-buddy 2007-03-31 18:34:54.000000000 -0400
-+++ gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in 2007-03-31 18:40:05.000000000 -0400
-@@ -27,7 +27,8 @@
- <oaf_attribute name="panel:icon" type="string" value="ax-applet"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
- <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-- <oaf_attribute name="bugzilla:component" type="string" value="other-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="keyboard-accessibility (accessx-status)"/>
-+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="accessx-status-applet"/>
-
- </oaf_server>
-
---- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy 2007-03-12 09:04:25.000000000 -0400
-+++ gnome-applets-2.18.0/gswitchit/Makefile.in 2007-03-31 18:34:20.000000000 -0400
-@@ -959,7 +959,7 @@
-
-
- $(server_in_files): $(server_in_in_files)
-- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-
- @INTLTOOL_SERVER_RULE@
-
---- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy 2006-12-30 21:07:52.000000000 -0500
-+++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in 2007-03-31 18:34:20.000000000 -0400
-@@ -10,6 +10,11 @@
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
- <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
-+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
-+ <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
-+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
-
- </oaf_server>
-
-@@ -25,6 +30,11 @@
- <oaf_attribute name="name" type="string" _value="Keyboard Indicator"/>
- <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
- <oaf_attribute name="panel:icon" type="string" value="gswitchit-applet.png"/>
-+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+ <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
-+ <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
-+ <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
-
- </oaf_server>
-
---- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy 2006-12-30 21:07:52.000000000 -0500
-+++ gnome-applets-2.18.0/gswitchit/Makefile.am 2007-03-31 18:34:20.000000000 -0400
-@@ -49,7 +49,7 @@
- server_DATA = $(server_in_files:.server.in=.server)
-
- $(server_in_files): $(server_in_in_files)
-- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-
- CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA)
-
diff --git a/gnome-applets-2.18.0-wrong-gconf-keys.patch b/gnome-applets-2.18.0-wrong-gconf-keys.patch
deleted file mode 100644
index 55d4de6..0000000
--- a/gnome-applets-2.18.0-wrong-gconf-keys.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gnome-applets-2.18.0/gswitchit/gswitchit.schemas.in.gkbd-gconf-prefix 2007-04-19 15:53:07.000000000 -0400
-+++ gnome-applets-2.18.0/gswitchit/gswitchit.schemas.in 2007-04-19 15:55:43.000000000 -0400
-@@ -2,8 +2,8 @@
- <gconfschemafile>
- <schemalist>
- <schema>
-- <key>/schemas/apps/gswitchit/Applet/secondary</key>
-- <applyto>/apps/gswitchit/Applet/secondary</applyto>
-+ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/secondary</key>
-+ <applyto>/desktop/gnome/peripherals/keyboard/indicator/secondary</applyto>
- <owner>gnome</owner>
- <type>int</type>
- <default>0</default>
-@@ -14,8 +14,8 @@
- </schema>
-
- <schema>
-- <key>/schemas/apps/gswitchit/Applet/showFlags</key>
-- <applyto>/apps/gswitchit/Applet/showFlags</applyto>
-+ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/showFlags</key>
-+ <applyto>/desktop/gnome/peripherals/keyboard/indicator/showFlags</applyto>
- <owner>gnome</owner>
- <type>bool</type>
- <default>false</default>
-@@ -26,8 +26,8 @@
- </schema>
-
- <schema>
-- <key>/schemas/apps/gswitchit/Applet/enabledPlugins</key>
-- <applyto>/apps/gswitchit/Applet/enabledPlugins</applyto>
-+ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/enabledPlugins</key>
-+ <applyto>/schemas/desktop/gnome/peripherals/keyboard/indicator/enabledPlugins</applyto>
- <owner>gnome</owner>
- <type>list</type>
- <list_type>string</list_type>
diff --git a/keyboard-drawing-corner.patch b/keyboard-drawing-corner.patch
deleted file mode 100644
index c4ededb..0000000
--- a/keyboard-drawing-corner.patch
+++ /dev/null
@@ -1,427 +0,0 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner 2006-08-27 00:37:45.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-27 00:44:04.000000000 -0400
-@@ -76,6 +76,219 @@
- cos (M_PI * angle / 1800.0);
- }
-
-+static gdouble
-+length (gdouble x, gdouble y)
-+{
-+ return sqrt (x*x + y*y);
-+}
-+
-+static gdouble
-+point_line_distance (gdouble ax, gdouble ay,
-+ gdouble nx, gdouble ny)
-+{
-+ return ax * nx + ay * ny;
-+}
-+
-+static void
-+normal_form (gdouble ax, gdouble ay,
-+ gdouble bx, gdouble by,
-+ gdouble *nx, gdouble *ny, gdouble *d)
-+{
-+ gdouble l;
-+
-+ *nx = by - ay;
-+ *ny = ax - bx;
-+
-+ l = length (*nx, *ny);
-+
-+ *nx /= l;
-+ *ny /= l;
-+
-+ *d = point_line_distance (ax, ay, *nx, *ny);
-+}
-+
-+static void
-+inverse (gdouble a, gdouble b, gdouble c, gdouble d,
-+ gdouble *e, gdouble *f, gdouble *g, gdouble *h)
-+{
-+ gdouble det;
-+
-+ det = a*d - b*c;
-+
-+ *e = d / det;
-+ *f = -b / det;
-+ *g = -c / det;
-+ *h = a / det;
-+}
-+
-+static void
-+multiply (gdouble a, gdouble b, gdouble c, gdouble d,
-+ gdouble e, gdouble f,
-+ gdouble *x, gdouble *y)
-+{
-+ *x = a*e + b*f;
-+ *y = c*e + d*f;
-+}
-+
-+static void
-+intersect (gdouble n1x, gdouble n1y, gdouble d1,
-+ gdouble n2x, gdouble n2y, gdouble d2,
-+ gdouble *x, gdouble *y)
-+{
-+ gdouble e, f, g, h;
-+
-+ inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h);
-+ multiply (e, f, g, h, d1, d2, x, y);
-+}
-+
-+
-+/* draw an angle from the current point to b and then to c,
-+ * with a rounded corner of the given radius.
-+ */
-+static void
-+rounded_corner (cairo_t *cr,
-+ gdouble bx, gdouble by,
-+ gdouble cx, gdouble cy,
-+ gdouble radius)
-+{
-+ gdouble ax, ay;
-+ gdouble n1x, n1y, d1;
-+ gdouble n2x, n2y, d2;
-+ gdouble pd1, pd2;
-+ gdouble ix, iy;
-+ gdouble dist1, dist2;
-+ gdouble nx, ny, d;
-+ gdouble a1x, a1y, c1x, c1y;
-+ gdouble phi1, phi2;
-+
-+ cairo_get_current_point (cr, &ax, &ay);
-+
-+ /* make sure radius is not too large */
-+ dist1 = length (bx - ax, by - ay);
-+ dist2 = length (cx - bx, cy - by);
-+
-+ radius = MIN (radius, MIN (dist1, dist2));
-+
-+ /* construct normal forms of the lines */
-+ normal_form (ax, ay, bx, by, &n1x, &n1y, &d1);
-+ normal_form (bx, by, cx, cy, &n2x, &n2y, &d2);
-+
-+ /* find which side of the line a,b the point c is on */
-+ if (point_line_distance (cx, cy, n1x, n1y) < d1)
-+ pd1 = d1 - radius;
-+ else
-+ pd1 = d1 + radius;
-+
-+ /* find which side of the line b,c the point a is on */
-+ if (point_line_distance (ax, ay, n2x, n2y) < d2)
-+ pd2 = d2 - radius;
-+ else
-+ pd2 = d2 + radius;
-+
-+ /* intersect the parallels to find the center of the arc */
-+ intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy);
-+
-+ nx = (bx - ax) / dist1;
-+ ny = (by - ay) / dist1;
-+ d = point_line_distance (ix, iy, nx, ny);
-+
-+ /* a1 is the point on the line a-b where the arc starts */
-+ intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y);
-+
-+ nx = (cx - bx) / dist2;
-+ ny = (cy - by) / dist2;
-+ d = point_line_distance (ix, iy, nx, ny);
-+
-+ /* c1 is the point on the line b-c where the arc ends */
-+ intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y);
-+
-+ /* determine the first angle */
-+ if (a1x - ix == 0)
-+ phi1 = (a1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
-+ else if (a1x - ix > 0)
-+ phi1 = atan ((a1y - iy)/(a1x - ix));
-+ else
-+ phi1 = M_PI + atan ((a1y - iy)/(a1x - ix));
-+
-+ /* determine the second angle */
-+ if (c1x - ix == 0)
-+ phi2 = (c1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
-+ else if (c1x - ix > 0)
-+ phi2 = atan ((c1y - iy)/(c1x - ix));
-+ else
-+ phi2 = M_PI + atan ((c1y - iy)/(c1x - ix));
-+
-+ /* compute the difference between phi2 and phi1 mod 2pi */
-+ d = phi2 - phi1;
-+ while (d < 0)
-+ d += 2*M_PI;
-+ while (d > 2*M_PI)
-+ d -= 2*M_PI;
-+
-+ cairo_line_to (cr, a1x, a1y);
-+
-+ /* pick the short arc from phi1 to phi2 */
-+ if (d < M_PI)
-+ cairo_arc (cr, ix, iy, radius, phi1, phi2);
-+ else
-+ cairo_arc_negative (cr, ix, iy, radius, phi1, phi2);
-+
-+ cairo_line_to (cr, cx, cy);
-+}
-+
-+static void
-+draw (cairo_t *cr,
-+ gint width,
-+ gint height)
-+{
-+ gdouble x0 = 100;
-+ gdouble y0 = 100;
-+ gdouble x1 = 200;
-+ gdouble y1 = 100;
-+ gdouble x2 = 180;
-+ gdouble y2 = 200;
-+ gdouble x3 = 240;
-+ gdouble y3 = 190;
-+
-+ gdouble radius = 20;
-+
-+ cairo_move_to (cr, x0, y0);
-+
-+ rounded_corner (cr, x1, y1, (x1+x2)/2, (y1+y2)/2, radius);
-+ rounded_corner (cr, x2, y2, x3, y3, radius);
-+
-+ cairo_stroke (cr);
-+}
-+
-+static void
-+rounded_polygon (cairo_t *cr,
-+ gboolean filled,
-+ gdouble radius,
-+ GdkPoint *points,
-+ gint num_points)
-+{
-+ gint i, j;
-+
-+ cairo_move_to (cr,
-+ (gdouble)(points[num_points - 1].x + points[0].x)/2,
-+ (gdouble)(points[num_points - 1].y + points[0].y)/2);
-+
-+ for (i = 0; i < num_points; i++)
-+ {
-+ j = (i + 1) % num_points;
-+ rounded_corner (cr, (gdouble)points[i].x, (gdouble)points[i].y,
-+ (gdouble)(points[i].x + points[j].x)/2,
-+ (gdouble)(points[i].y + points[j].y)/2,
-+ radius);
-+ };
-+ cairo_close_path (cr);
-+
-+ if (filled)
-+ cairo_fill (cr);
-+ else
-+ cairo_stroke (cr);
-+}
-+
- static void
- draw_polygon (
- KeyboardDrawing * drawing,
-@@ -83,10 +296,11 @@
- gint xkb_x,
- gint xkb_y,
- XkbPointRec * xkb_points,
-- guint num_points)
-+ guint num_points,
-+ gdouble radius)
- {
- GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
-- GdkGC *gc;
-+ cairo_t *cr;
- GdkPoint *points;
- gboolean filled;
- gint i;
-@@ -95,17 +309,16 @@
- return;
-
- if (fill_color)
-- {
-- gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
-- gdk_gc_set_rgb_fg_color (gc, fill_color);
-- filled = TRUE;
-- }
-+ filled = TRUE;
- else
- {
-- gc = GTK_WIDGET (drawing)->style->dark_gc[state];
-+ fill_color = >K_WIDGET (drawing)->style->dark[state];
- filled = FALSE;
- }
-
-+ cr = gdk_cairo_create (GDK_DRAWABLE (drawing->pixmap));
-+ gdk_cairo_set_source_color (cr, fill_color);
-+
- points = g_new (GdkPoint, num_points);
-
- for (i = 0; i < num_points; i++)
-@@ -114,11 +327,64 @@
- points[i].y = xkb_to_pixmap_coord (drawing, xkb_y + xkb_points[i].y);
- }
-
-- gdk_draw_polygon (drawing->pixmap, gc, filled, points, num_points);
-+ rounded_polygon (cr, filled, radius, points, num_points);
-
- g_free (points);
-- if (fill_color)
-- g_object_unref (gc);
-+}
-+
-+static void
-+curve_rectangle (cairo_t *cr,
-+ gdouble x0,
-+ gdouble y0,
-+ gdouble width,
-+ gdouble height,
-+ gdouble radius)
-+{
-+ gdouble x1, y1;
-+
-+ if (!width || !height)
-+ return;
-+
-+ x1 = x0 + width;
-+ y1 = y0 + height;
-+
-+ radius = MIN(radius, MIN(width / 2, height / 2));
-+
-+ cairo_move_to (cr, x0, y0 + radius);
-+ cairo_arc (cr, x0 + radius, y0 + radius, radius, M_PI, 3*M_PI/2);
-+ cairo_line_to (cr, x1 - radius, y0);
-+ cairo_arc (cr, x1 - radius, y0 + radius, radius, 3*M_PI/2, 2*M_PI);
-+ cairo_line_to (cr, x1, y1 - radius);
-+ cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, M_PI/2);
-+ cairo_line_to (cr, x0 + radius, y1);
-+ cairo_arc (cr, x0 + radius, y1 - radius, radius, M_PI/2, M_PI);
-+
-+ cairo_close_path (cr);
-+}
-+
-+static void
-+draw_curve_rectangle (GdkPixmap *pixmap,
-+ gboolean filled,
-+ GdkColor *fill_color,
-+ gint x,
-+ gint y,
-+ gint width,
-+ gint height,
-+ gint radius)
-+{
-+ cairo_t *cr;
-+
-+ cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
-+ curve_rectangle (cr, x, y, width, height, radius);
-+
-+ gdk_cairo_set_source_color (cr, fill_color);
-+
-+ if (filled)
-+ cairo_fill (cr);
-+ else
-+ cairo_stroke (cr);
-+
-+ cairo_destroy (cr);
- }
-
- /* x, y, width, height are in the xkb coordinate system */
-@@ -130,7 +396,8 @@
- gint xkb_x,
- gint xkb_y,
- gint xkb_width,
-- gint xkb_height)
-+ gint xkb_height,
-+ gint radius)
- {
- if (drawing->pixmap == NULL)
- return;
-@@ -140,17 +407,12 @@
- GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
- gint x, y, width, height;
- gboolean filled;
-- GdkGC *gc;
-
- if (fill_color)
-- {
-- gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
-- gdk_gc_set_rgb_fg_color (gc, fill_color);
-- filled = TRUE;
-- }
-+ filled = TRUE;
- else
- {
-- gc = GTK_WIDGET (drawing)->style->dark_gc[state];
-+ fill_color = >K_WIDGET (drawing)->style->dark[state];
- filled = FALSE;
- }
-
-@@ -159,10 +421,8 @@
- width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
- height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
-
-- gdk_draw_rectangle (drawing->pixmap, gc, filled, x, y, width, height);
--
-- if (fill_color)
-- g_object_unref (gc);
-+ draw_curve_rectangle (drawing->pixmap, filled, fill_color,
-+ x, y, width, height, radius);
- }
- else
- {
-@@ -182,7 +442,7 @@
- points[3].x = x; points[3].y = y;
-
- /* the points we've calculated are relative to 0,0 */
-- draw_polygon (drawing, fill_color, 0, 0, points, 4);
-+ draw_polygon (drawing, fill_color, 0, 0, points, 4, radius);
- }
- }
-
-@@ -203,7 +463,8 @@
- {
- if (color)
- draw_rectangle (drawing, color, angle, origin_x, origin_y,
-- outline->points[0].x, outline->points[0].y);
-+ outline->points[0].x, outline->points[0].y,
-+ outline->corner_radius);
-
- #ifdef KBDRAW_DEBUG
- printf("points:%p\n", outline->points);
-@@ -211,7 +472,8 @@
- #endif
-
- draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
-- outline->points[0].x, outline->points[0].y);
-+ outline->points[0].x, outline->points[0].y,
-+ outline->corner_radius);
- }
- else if (outline->num_points == 2)
- {
-@@ -223,19 +485,23 @@
- angle, &rotated_x0, &rotated_y0);
- if (color)
- draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
-- outline->points[1].x, outline->points[1].y);
-+ outline->points[1].x - outline->points[0].x,
-+ outline->points[1].y - outline->points[0].y,
-+ outline->corner_radius);
-
- draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
-- outline->points[1].x, outline->points[1].y);
-+ outline->points[1].x - outline->points[0].x,
-+ outline->points[1].y - outline->points[0].y,
-+ outline->corner_radius);
- }
- else
- {
- if (color)
- draw_polygon (drawing, color, origin_x, origin_y, outline->points,
-- outline->num_points);
-+ outline->num_points, outline->corner_radius);
-
- draw_polygon (drawing, NULL, origin_x, origin_y, outline->points,
-- outline->num_points);
-+ outline->num_points, outline->corner_radius);
- }
- }
-
diff --git a/keyboard-drawing-label-color.patch b/keyboard-drawing-label-color.patch
deleted file mode 100644
index 0eabfee..0000000
--- a/keyboard-drawing-label-color.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.label-color 2006-08-24 22:01:50.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:02:40.000000000 -0400
-@@ -541,6 +541,9 @@
- PangoLayout * layout)
- {
- GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
-+ GdkColor *color;
-+
-+ color = drawing->colors + (drawing->xkb->geom->label_color - drawing->xkb->geom->colors);
-
- if (drawing->pixmap == NULL)
- return;
-@@ -554,9 +557,9 @@
- drawing->angle = angle;
- }
-
-- gdk_draw_layout (drawing->pixmap,
-- GTK_WIDGET (drawing)->style->text_gc[state], x, y,
-- drawing->layout);
-+ gdk_draw_layout_with_colors (drawing->pixmap,
-+ GTK_WIDGET (drawing)->style->text_gc[state], x, y,
-+ drawing->layout, color, NULL);
- }
-
- static void
diff --git a/keyboard-drawing-primary.patch b/keyboard-drawing-primary.patch
deleted file mode 100644
index ecec1c8..0000000
--- a/keyboard-drawing-primary.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.primary 2006-08-24 22:04:09.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:07:38.000000000 -0400
-@@ -719,9 +719,22 @@
- printf ("outlines: %p(%d)\n", shape->outlines, shape->num_outlines);
- #endif
-
-- for (i = 0; i < 1 /* shape->num_outlines */ ; i++)
-- draw_outline (drawing, shape->outlines + i, color, key->angle,
-- key->origin_x, key->origin_y);
-+ /* draw the primary outline */
-+ draw_outline (drawing, shape->primary ? shape->primary : shape->outlines,
-+ color, key->angle, key->origin_x, key->origin_y);
-+#if 0
-+ /* don't draw other outlines for now, since
-+ * the text placement does not take them into account
-+ */
-+ for (i = 0; i < shape->num_outlines; i++)
-+ {
-+ if (shape->outlines + i == shape->approx ||
-+ shape->outlines + i == shape->primary)
-+ continue;
-+ draw_outline (drawing, shape->outlines + i, NULL,
-+ key->angle, key->origin_x, key->origin_y);
-+ }
-+#endif
-
- draw_key_label (drawing, key->keycode, key->angle, key->origin_x,
- key->origin_y, shape->bounds.x2, shape->bounds.y2);
-@@ -850,10 +863,22 @@
- shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx;
- color = drawing->colors + shape_doodad->color_ndx;
-
-+ /* draw the primary outline filled */
-+ draw_outline (drawing, shape->primary ? shape->primary : shape->outlines,
-+ color, doodad->angle,
-+ doodad->origin_x + shape_doodad->left,
-+ doodad->origin_y + shape_doodad->top);
-+
-+ /* stroke the other outlines */
- for (i = 0; i < shape->num_outlines; i++)
-- draw_outline (drawing, shape->outlines + i, color, doodad->angle,
-- doodad->origin_x + shape_doodad->left,
-- doodad->origin_y + shape_doodad->top);
-+ {
-+ if (shape->outlines + i == shape->approx ||
-+ shape->outlines + i == shape->primary)
-+ continue;
-+ draw_outline (drawing, shape->outlines + i, NULL, doodad->angle,
-+ doodad->origin_x + shape_doodad->left,
-+ doodad->origin_y + shape_doodad->top);
-+ }
- }
-
- static void
diff --git a/keyboard-drawing-redraw.patch b/keyboard-drawing-redraw.patch
deleted file mode 100644
index 4637c29..0000000
--- a/keyboard-drawing-redraw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.redraw 2006-08-27 22:42:37.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-27 22:54:18.000000000 -0400
-@@ -1176,6 +1176,26 @@
- }
-
- static void
-+redraw_overlapping_doodads (
-+ KeyboardDrawing * drawing,
-+ KeyboardDrawingKey * key)
-+{
-+ GList *list;
-+ gboolean do_draw = FALSE;
-+
-+ for (list = drawing->keyboard_items; list; list = list->next)
-+ {
-+ KeyboardDrawingItem * item = list->data;
-+
-+ if (do_draw && item->type == KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
-+ draw_doodad (drawing, (KeyboardDrawingDoodad *) item);
-+
-+ if (list->data == key)
-+ do_draw = TRUE;
-+ }
-+}
-+
-+static void
- draw_keyboard_item (
- KeyboardDrawingItem * item,
- KeyboardDrawing * drawing)
-@@ -1340,7 +1360,7 @@
- key->pressed = (event->type == GDK_KEY_PRESS);
-
- draw_key (drawing, key);
--
-+ redraw_overlapping_doodads (drawing, key);
- invalidate_key_region (drawing, key);
-
- return TRUE;
-@@ -1370,7 +1390,9 @@
- if (drawing->keys[i].pressed)
- {
- drawing->keys[i].pressed = FALSE;
-+
- draw_key (drawing, drawing->keys + i);
-+ redraw_overlapping_doodads (drawing, drawing->keys + i);
- invalidate_key_region (drawing, drawing->keys + i);
- }
-
diff --git a/keyboard-drawing-rotated-text.patch b/keyboard-drawing-rotated-text.patch
deleted file mode 100644
index 0676458..0000000
--- a/keyboard-drawing-rotated-text.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.rotated-text 2006-08-24 21:59:45.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:01:21.000000000 -0400
-@@ -541,9 +541,6 @@
- PangoLayout * layout)
- {
- GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
-- PangoLayoutLine *line;
-- gint x_off, y_off;
-- gint i;
-
- if (drawing->pixmap == NULL)
- return;
-@@ -557,41 +554,6 @@
- drawing->angle = angle;
- }
-
-- i = 0;
-- y_off = 0;
-- for (line = pango_layout_get_line (drawing->layout, i);
-- line != NULL; line = pango_layout_get_line (drawing->layout, ++i))
-- {
-- GSList *runp;
-- PangoRectangle line_extents;
--
-- x_off = 0;
--
-- for (runp = line->runs; runp != NULL; runp = runp->next)
-- {
-- PangoGlyphItem *run = runp->data;
-- gint j;
--
-- for (j = 0; j < run->glyphs->num_glyphs; j++)
-- {
-- PangoGlyphGeometry *geometry;
-- gint xx, yy;
--
-- geometry = &run->glyphs->glyphs[j].geometry;
--
-- rotate_coordinate (0, 0, x_off, y_off, angle, &xx, &yy);
-- geometry->x_offset -= x_off - xx;
-- geometry->y_offset -= y_off - yy;
--
-- x_off += geometry->width;
-- }
-- }
--
-- pango_layout_line_get_extents (line, NULL, &line_extents);
-- y_off +=
-- line_extents.height + pango_layout_get_spacing (drawing->layout);
-- }
--
- gdk_draw_layout (drawing->pixmap,
- GTK_WIDGET (drawing)->style->text_gc[state], x, y,
- drawing->layout);
commit af409fad1dd4ee95151e3fe0612aa0b0a8274b39
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Sep 27 04:54:44 2007 +0000
Fix a memory leak
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 723c670..7897c48 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -70,6 +70,9 @@ Patch36: gweather-pc.patch
Patch34: ppp-includes.patch
+# fixed in upstream svn
+Patch38: mixer-preferences-leak.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -171,6 +174,7 @@ pushd mixer/
%patch35 -p0 -b .mixer-sync
popd
%patch36 -p1 -b .gweather-pc
+%patch38 -p1 -b .mixer-preferences-leak
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -357,6 +361,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Thu Sep 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-6
+- Fix a memory leak in the mixer preferences
+
* Tue Sep 25 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1.2.20.0-5
- Fix possible crasher in the mixer messages when we receive an
unhandled message (#302881)
diff --git a/mixer-preferences-leak.patch b/mixer-preferences-leak.patch
new file mode 100644
index 0000000..319c277
--- /dev/null
+++ b/mixer-preferences-leak.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.20.0/mixer/preferences.c.leak gnome-applets-2.20.0/mixer/preferences.c
+--- gnome-applets-2.20.0/mixer/preferences.c.leak 2007-09-27 00:49:39.000000000 -0400
++++ gnome-applets-2.20.0/mixer/preferences.c 2007-09-27 00:50:50.000000000 -0400
+@@ -445,6 +445,8 @@ cb_track_select (GtkTreeSelection *selec
+ }
+ }
+ }
++ g_list_foreach (lst, (GFunc)gtk_tree_path_free, NULL);
++ g_list_free (lst);
+ }
+
+ /* add the one just selected and adjust its volume if it's not the only one
commit 1a7d652a5c8c875da05c92b83c8bac56b1d274d8
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Tue Sep 25 11:46:16 2007 +0000
- Fix possible crasher in the mixer messages when we receive an unhandled
message (#302881)
diff --git a/gnome-applets-2.20.0-mixer-out-of-sync.patch b/gnome-applets-2.20.0-mixer-out-of-sync.patch
index 7cd4c33..1f4f086 100644
--- a/gnome-applets-2.20.0-mixer-out-of-sync.patch
+++ b/gnome-applets-2.20.0-mixer-out-of-sync.patch
@@ -212,7 +212,7 @@ Index: applet.c
tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
} else {
/* Translator comment: I'm not all too sure if this makes sense
-@@ -1152,10 +1207,53 @@
+@@ -1152,10 +1207,56 @@
"state", mute ? "1" : "0", NULL);
}
@@ -244,7 +244,7 @@ Index: applet.c
+ gst_mixer_message_parse_mute_toggled (message, &track, &muted);
+ mute = muted ? 1 : 0;
+ }
-+ else {
++ else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
+ gint n, num_channels, *vols;
+ volume = 0.0;
+
@@ -253,6 +253,9 @@ Index: applet.c
+ volume += vols[n];
+ volume /= track->num_channels;
+ volume = 100 * volume / (track->max_volume - track->min_volume);
++ } else
++ {
++ return;
+ }
+
+ if (first_track == track)
@@ -267,7 +270,7 @@ Index: applet.c
return TRUE;
}
-@@ -1214,6 +1312,8 @@
+@@ -1214,6 +1315,8 @@
/* save */
gst_object_replace ((GstObject **) &applet->mixer, item->data);
gst_element_set_state (old_element, GST_STATE_NULL);
@@ -276,7 +279,7 @@ Index: applet.c
newdevice = TRUE;
}
break;
-@@ -1374,7 +1474,7 @@
+@@ -1374,7 +1477,7 @@
GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
init_pixbufs (applet);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7e34518..723c670 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -357,6 +357,10 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Tue Sep 25 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1.2.20.0-5
+- Fix possible crasher in the mixer messages when we receive an
+ unhandled message (#302881)
+
* Sat Sep 22 2007 David Woodhouse <dwmw2(a)infradead.org> - 1.2.20.0-4
- Build modemlights applet again (#301601)
commit 4fbab9db375f4ccb049b410f946cbe51cc9014b2
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Sep 23 04:03:01 2007 +0000
bring modemlights back for one more round
diff --git a/.cvsignore b/.cvsignore
index d39229d..9f3c392 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6ca5078..7e34518 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,17 +34,20 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
Source1: copy.xsl
+Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.17.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
@@ -65,6 +68,8 @@ Patch35: gnome-applets-2.20.0-mixer-out-of-sync.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=479172
Patch36: gweather-pc.patch
+Patch34: ppp-includes.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +159,7 @@ libraries contained in the gnome-applets package.
%prep
%setup -q
+%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
@@ -168,6 +174,14 @@ popd
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE2}
+
+%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
intltoolize --force
autoconf
@@ -320,6 +334,7 @@ fi
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
%{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -342,6 +357,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sat Sep 22 2007 David Woodhouse <dwmw2(a)infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
* Sat Sep 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-3
- Make the gweather.pc file less useless
diff --git a/ppp-includes.patch b/ppp-includes.patch
index 75d3dc9..a3056c8 100644
--- a/ppp-includes.patch
+++ b/ppp-includes.patch
@@ -1,10 +1,11 @@
diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
--- gnome-applets-2.19.0/modemlights/modemlights.c.includes 2007-07-30 18:05:02.000000000 -0400
+++ gnome-applets-2.19.0/modemlights/modemlights.c 2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
#endif
#ifdef __linux__
++#define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#include <linux/types.h>
#include <linux/if_ppp.h>
#include <sys/ioctl.h>
diff --git a/sources b/sources
index c42e0ba..e7c7830 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
985cfc3c58a72e1a92201bf4a4873b87 gnome-applets-2.20.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 5dfd1700f871fbf939183724e58674bd6228ba97
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Sep 22 05:57:00 2007 +0000
fix gweather.pc file
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1e0b908..6ca5078 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -62,6 +62,9 @@ Patch33: gnome-applets-2.18.0-node-leak.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
Patch35: gnome-applets-2.20.0-mixer-out-of-sync.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=479172
+Patch36: gweather-pc.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -161,6 +164,7 @@ libraries contained in the gnome-applets package.
pushd mixer/
%patch35 -p0 -b .mixer-sync
popd
+%patch36 -p1 -b .gweather-pc
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -338,6 +342,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sat Sep 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-3
+- Make the gweather.pc file less useless
+
* Thu Sep 20 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-2
- Add patch to avoid the volume scale getting out-of sync with the
real hardware volume
diff --git a/gweather-pc.patch b/gweather-pc.patch
new file mode 100644
index 0000000..0f35277
--- /dev/null
+++ b/gweather-pc.patch
@@ -0,0 +1,10 @@
+diff -up gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc gnome-applets-2.20.0/libgweather/gweather.pc.in
+--- gnome-applets-2.20.0/libgweather/gweather.pc.in.gweather-pc 2007-09-22 01:32:03.000000000 -0400
++++ gnome-applets-2.20.0/libgweather/gweather.pc.in 2007-09-22 01:32:14.000000000 -0400
+@@ -7,5 +7,5 @@ Name: GWeather
+ Description: GWeather shared library
+ Version: @VERSION@
+ Requires: gtk+-2.0, gnome-vfs-2.0
+-Libs: -L${libdir}
++Libs: -L${libdir} -lgweather
+ Cflags: -I${includedir}
commit 6315aa68b52f274df2216bc1a52e97158fe1648b
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 20 00:17:15 2007 +0000
Fix patch application
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 54df025..1e0b908 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -158,7 +158,9 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
-%patch35 -p1 -b .mixer-sync
+pushd mixer/
+%patch35 -p0 -b .mixer-sync
+popd
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
commit 98230d2832b8f05be89fb03f9e6cc7b9d08c42ea
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 20 00:02:46 2007 +0000
- Add patch to avoid the volume scale getting out-of sync with the real
hardware volume
diff --git a/gnome-applets-2.20.0-mixer-out-of-sync.patch b/gnome-applets-2.20.0-mixer-out-of-sync.patch
new file mode 100644
index 0000000..7cd4c33
--- /dev/null
+++ b/gnome-applets-2.20.0-mixer-out-of-sync.patch
@@ -0,0 +1,299 @@
+Index: applet.c
+===================================================================
+--- applet.c (revision 10436)
++++ applet.c (working copy)
+@@ -79,7 +79,12 @@
+ PanelAppletOrient orient);
+
+ static void gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
+- gboolean force_refresh);
++ gboolean force_refresh,
++ gdouble volume,
++ gint mute);
++
++static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
++
+ static gboolean cb_check (gpointer data);
+
+ static void cb_volume (GtkAdjustment *adj,
+@@ -242,6 +247,12 @@
+ /* i18n */
+ ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
+ atk_object_set_name (ao, _("Volume Control"));
++
++ /* Bus for notifications */
++ applet->bus = gst_bus_new ();
++ gst_bus_add_signal_watch (applet->bus);
++ g_signal_connect (G_OBJECT (applet->bus), "message::element",
++ (GCallback) cb_notify_message, applet);
+ }
+
+ /* Parse the list of tracks that are stored in GConf */
+@@ -368,12 +379,33 @@
+ return FALSE;
+
+ applet->mixer = g_object_ref (active_element);
++ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
+ applet->tracks = active_tracks;
+ g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
+
+ return TRUE;
+ }
+
++static void
++gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
++{
++ gboolean need_timeout = TRUE;
++ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
++ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
++
++ if (need_timeout) {
++ if (applet->timeout == 0) {
++ applet->timeout = g_timeout_add (100, cb_check, applet);
++ }
++ }
++ else {
++ if (applet->timeout != 0) {
++ g_source_remove (applet->timeout);
++ applet->timeout = 0;
++ }
++ }
++}
++
+ gboolean
+ gnome_volume_applet_setup (GnomeVolumeApplet *applet,
+ GList *elements)
+@@ -435,10 +467,9 @@
+ component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+ g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
+
+- gnome_volume_applet_refresh (applet, TRUE);
+- if (res) {
+- applet->timeout = g_timeout_add (100, cb_check, applet);
+- }
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
++ if (res)
++ gnome_volume_applet_setup_timeout (applet);
+
+ if (res) {
+ /* gconf */
+@@ -479,6 +510,11 @@
+ g_list_free (applet->elements);
+ applet->elements = NULL;
+ }
++ gst_bus_remove_signal_watch (applet->bus);
++ if (applet->bus) {
++ gst_object_unref (applet->bus);
++ applet->bus = NULL;
++ }
+
+ if (applet->tracks) {
+ g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
+@@ -677,7 +713,7 @@
+
+ /* update graphic - this should happen automagically after the next
+ * idle call, but apparently doesn't for some people... */
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, mute);
+ }
+
+ /*
+@@ -940,7 +976,7 @@
+ }
+
+ init_pixbufs (applet);
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+ }
+
+ static void
+@@ -990,15 +1026,23 @@
+ {
+ int range = track->max_volume - track->min_volume;
+ gdouble scale = ((gdouble) range) / 100;
+- int *volumes, n;
++ int *volumes, n, volint;
+
+- volume *= scale;
+- volume += track->min_volume;
++ if (volume == 1.0) {
++ volint = track->max_volume;
++ } else if (volume == 0.0) {
++ volint = track->min_volume;
++ } else {
++ volume *= scale;
++ volume += track->min_volume;
++ volint = lrint (volume);
++ }
+
+ volumes = g_new (gint, track->num_channels);
+ for (n = 0; n < track->num_channels; n++)
+- volumes[n] = lrint (volume);
++ volumes[n] = volint;
+ gst_mixer_set_volume (mixer, track, volumes);
++
+ g_free (volumes);
+ }
+
+@@ -1049,6 +1093,8 @@
+
+ applet->lock = FALSE;
+ applet->force_next_update = TRUE;
++
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, v, -1);
+ }
+
+ /*
+@@ -1059,31 +1105,40 @@
+
+ static void
+ gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
+- gboolean force_refresh)
++ gboolean force_refresh,
++ gdouble volume,
++ gint mute)
+ {
+ BonoboUIComponent *component;
+ GdkPixbuf *pixbuf;
+ gint n;
+- gdouble volume;
+- gboolean mute, did_change;
++ gboolean show_mute, did_change;
+ gchar *tooltip_str;
+ GstMixerTrack *first_track;
+ GString *track_names;
+ GList *iter;
+
++ show_mute = 0;
++
+ if (!applet->mixer) {
+ n = 0;
+- mute = FALSE;
++ show_mute = 1;
++ mute = 0;
+ } else if (!applet->tracks) {
+ return;
+ } else {
+- /* only first track */
+ first_track = g_list_first (applet->tracks)->data;
+- volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
+- mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
+- GST_MIXER_TRACK_MUTE);
++
++ if (volume == -1) {
++ /* only first track */
++ volume = gnome_volume_applet_get_volume (applet->mixer, first_track);
++ }
++ if (mute == -1) {
++ mute = GST_MIXER_TRACK_HAS_FLAG (first_track,
++ GST_MIXER_TRACK_MUTE) ? 1 : 0;
++ }
+ if (volume <= 0) {
+- mute = TRUE;
++ show_mute = 1;
+ n = 0;
+ }
+ else {
+@@ -1101,7 +1156,7 @@
+ applet->force_next_update = FALSE;
+
+ if (did_change) {
+- if (mute) {
++ if (show_mute) {
+ pixbuf = applet->pix[0];
+ } else {
+ pixbuf = applet->pix[n];
+@@ -1125,7 +1180,7 @@
+ track_names = g_string_append (track_names, track->label);
+ }
+
+- if (mute) {
++ if (show_mute) {
+ tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
+ } else {
+ /* Translator comment: I'm not all too sure if this makes sense
+@@ -1152,10 +1207,53 @@
+ "state", mute ? "1" : "0", NULL);
+ }
+
++static void
++cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
++{
++ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
++ GstMixerMessageType type;
++ GstMixerTrack *first_track;
++ GstMixerTrack *track = NULL;
++ gint mute;
++ gdouble volume;
++
++ if (applet->tracks == NULL ||
++ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
++ /* No tracks, or not from our mixer - can't update anything anyway */
++ return;
++ }
++
++ volume = mute = -1;
++
++ first_track = g_list_first (applet->tracks)->data;
++
++ /* This code only calls refresh if the first_track changes, because the
++ * refresh code only retrieves the current value from that track anyway */
++ type = gst_mixer_message_get_type (message);
++ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
++ gboolean muted;
++ gst_mixer_message_parse_mute_toggled (message, &track, &muted);
++ mute = muted ? 1 : 0;
++ }
++ else {
++ gint n, num_channels, *vols;
++ volume = 0.0;
++
++ gst_mixer_message_parse_volume_changed (message, &track, &vols, &num_channels);
++ for (n = 0; n < num_channels; n++)
++ volume += vols[n];
++ volume /= track->num_channels;
++ volume = 100 * volume / (track->max_volume - track->min_volume);
++ }
++
++ if (first_track == track)
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, volume, mute);
++}
++
+ static gboolean
+ cb_check (gpointer data)
+ {
+- gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE, -1, -1);
+
+ return TRUE;
+ }
+@@ -1214,6 +1312,8 @@
+ /* save */
+ gst_object_replace ((GstObject **) &applet->mixer, item->data);
+ gst_element_set_state (old_element, GST_STATE_NULL);
++
++ gnome_volume_applet_setup_timeout (applet);
+ newdevice = TRUE;
+ }
+ break;
+@@ -1374,7 +1474,7 @@
+ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
+
+ init_pixbufs (applet);
+- gnome_volume_applet_refresh (applet, TRUE);
++ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+ }
+
+ /*
+Index: applet.h
+===================================================================
+--- applet.h (revision 10436)
++++ applet.h (working copy)
+@@ -71,6 +71,7 @@
+
+ /* element */
+ GstMixer *mixer;
++ GstBus *bus;
+ gboolean lock;
+ gint state;
+ GList *tracks;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 236b4b0..54df025 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -58,7 +58,9 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
Patch33: gnome-applets-2.18.0-node-leak.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=370937
-Patch34: mixer-wakeups.patch
+# Patch34: mixer-wakeups.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478485 includes the above
+Patch35: gnome-applets-2.20.0-mixer-out-of-sync.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -156,7 +158,7 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
-%patch34 -p1 -b .mixer-wakeups
+%patch35 -p1 -b .mixer-sync
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -334,6 +336,10 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera(a)redhat.com> - 1:2.20.0-2
+- Add patch to avoid the volume scale getting out-of sync with the
+ real hardware volume
+
* Sun Sep 16 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-1
- Update to 2.20.0
commit 7f3562af74a0445f970183eff1c0d261c4ed8927
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 17 01:34:23 2007 +0000
2.20.0
diff --git a/.cvsignore b/.cvsignore
index 694bdea..d39229d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.19.91.tar.bz2
+gnome-applets-2.20.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c1dc1bb..236b4b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.19.91
+Version: 2.20.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
@@ -334,6 +334,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Sep 16 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.20.0-1
+- Update to 2.20.0
+
* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.91-1
- Update to 2.19.91
diff --git a/sources b/sources
index 575c63d..c42e0ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76f4e9cafe36de383de6ce7da9586d02 gnome-applets-2.19.91.tar.bz2
+985cfc3c58a72e1a92201bf4a4873b87 gnome-applets-2.20.0.tar.bz2
commit 28ef09ff546ef9af7538b41c37d172fd3c062b65
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 4 05:30:53 2007 +0000
2.19.91
diff --git a/.cvsignore b/.cvsignore
index 9bf946a..694bdea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.19.1.tar.bz2
+gnome-applets-2.19.91.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6f4722d..c1dc1bb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,8 +33,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.19.1
-Release: 8%{?dist}
+Version: 2.19.91
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -334,6 +334,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.91-1
+- Update to 2.19.91
+
* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 1:2.19.1-8
- Rebuild for build ID
diff --git a/sources b/sources
index 1123d8f..575c63d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dc982c8df1eaa27fecd4e78675070ba gnome-applets-2.19.1.tar.bz2
+76f4e9cafe36de383de6ce7da9586d02 gnome-applets-2.19.91.tar.bz2
commit 87338048b13116f8129732b170e34c67c1c7e2a2
Author: Adam Jackson <ajax(a)fedoraproject.org>
Date: Thu Aug 23 17:44:21 2007 +0000
- Rebuild for build ID
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c21590e..6f4722d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -334,6 +334,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 1:2.19.1-8
+- Rebuild for build ID
+
* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-7
- Fix Requires
commit 0a78d0bf698a3a42a82e0d29c589dfae46673d03
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 13 03:47:56 2007 +0000
fix Requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ed54af8..c21590e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -101,7 +101,7 @@ BuildRequires: libxslt
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
-Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
+Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version}
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
@@ -334,6 +334,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-7
+- Fix Requires
+
* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-6
- Stop the mixer applet from polling the volume
commit afa315f7093be9f37a49190da5073ae1ecf30463
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 13 03:24:02 2007 +0000
Add a patch to stop the mixer applet from causing frequent wakeups
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fc07e37..ed54af8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -9,8 +9,9 @@
%define libgtop2_version 2.12.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
-%define gstreamer_plugins_version 0.10
-%define gstreamer_version 0.10
+%define gstreamer_version 0.10.14
+%define gstreamer_plugins_version 0.10.14
+%define gstreamer_plugins_good_version 0.10.6
%define libxklavier_version 2.91
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.11.1
@@ -33,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPLv2+ and GFDL+
Group: User Interface/Desktops
@@ -56,6 +57,9 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=370937
+Patch34: mixer-wakeups.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -69,7 +73,7 @@ BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
-BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
@@ -152,6 +156,7 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
+%patch34 -p1 -b .mixer-wakeups
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -329,6 +334,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Aug 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-6
+- Stop the mixer applet from polling the volume
+
* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-5
- Use %%find_lang for help files, too
- Update the license field
diff --git a/mixer-wakeups.patch b/mixer-wakeups.patch
new file mode 100644
index 0000000..51e7b1e
--- /dev/null
+++ b/mixer-wakeups.patch
@@ -0,0 +1,187 @@
+diff -up gnome-applets-2.19.1/mixer/applet.c.wakeups gnome-applets-2.19.1/mixer/applet.c
+--- gnome-applets-2.19.1/mixer/applet.c.wakeups 2007-08-12 23:00:22.000000000 -0400
++++ gnome-applets-2.19.1/mixer/applet.c 2007-08-12 23:00:29.000000000 -0400
+@@ -80,6 +80,11 @@ static void gnome_volume_applet_orientat
+
+ static void gnome_volume_applet_refresh (GnomeVolumeApplet *applet,
+ gboolean force_refresh);
++
++#ifdef HAVE_GST_MIXER_NOTIFIES
++static void cb_notify_message (GstBus *bus, GstMessage *message, gpointer data);
++#endif
++
+ static gboolean cb_check (gpointer data);
+
+ static void cb_volume (GtkAdjustment *adj,
+@@ -242,6 +247,14 @@ gnome_volume_applet_init (GnomeVolumeApp
+ /* i18n */
+ ao = gtk_widget_get_accessible (GTK_WIDGET (applet));
+ atk_object_set_name (ao, _("Volume Control"));
++
++ /* Bus for notifications */
++#ifdef HAVE_GST_MIXER_NOTIFIES
++ applet->bus = gst_bus_new ();
++ gst_bus_add_signal_watch (applet->bus);
++ g_signal_connect (G_OBJECT (applet->bus), "message::element",
++ (GCallback) cb_notify_message, applet);
++#endif
+ }
+
+ /* Parse the list of tracks that are stored in GConf */
+@@ -368,12 +381,37 @@ select_element_and_track (GnomeVolumeApp
+ return FALSE;
+
+ applet->mixer = g_object_ref (active_element);
++#ifdef HAVE_GST_MIXER_NOTIFIES
++ gst_element_set_bus (GST_ELEMENT (applet->mixer), applet->bus);
++#endif
+ applet->tracks = active_tracks;
+ g_list_foreach (applet->tracks, (GFunc) g_object_ref, NULL);
+
+ return TRUE;
+ }
+
++static void
++gnome_volume_applet_setup_timeout (GnomeVolumeApplet *applet)
++{
++ gboolean need_timeout = TRUE;
++#ifdef HAVE_GST_MIXER_NOTIFIES
++ need_timeout = ((gst_mixer_get_mixer_flags (GST_MIXER (applet->mixer)) &
++ GST_MIXER_FLAG_AUTO_NOTIFICATIONS) == 0);
++#endif
++
++ if (need_timeout) {
++ if (applet->timeout == 0) {
++ applet->timeout = g_timeout_add (100, cb_check, applet);
++ }
++ }
++ else {
++ if (applet->timeout != 0) {
++ g_source_remove (applet->timeout);
++ applet->timeout = 0;
++ }
++ }
++}
++
+ gboolean
+ gnome_volume_applet_setup (GnomeVolumeApplet *applet,
+ GList *elements)
+@@ -436,9 +474,8 @@ gnome_volume_applet_setup (GnomeVolumeAp
+ g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
+
+ gnome_volume_applet_refresh (applet, TRUE);
+- if (res) {
+- applet->timeout = g_timeout_add (100, cb_check, applet);
+- }
++ if (res)
++ gnome_volume_applet_setup_timeout (applet);
+
+ if (res) {
+ /* gconf */
+@@ -479,6 +516,13 @@ gnome_volume_applet_dispose (GObject *ob
+ g_list_free (applet->elements);
+ applet->elements = NULL;
+ }
++#ifdef HAVE_GST_MIXER_NOTIFIES
++ gst_bus_remove_signal_watch (applet->bus);
++ if (applet->bus) {
++ gst_object_unref (applet->bus);
++ applet->bus = NULL;
++ }
++#endif
+
+ if (applet->tracks) {
+ g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL);
+@@ -1152,6 +1196,38 @@ gnome_volume_applet_refresh (GnomeVolume
+ "state", mute ? "1" : "0", NULL);
+ }
+
++#ifdef HAVE_GST_MIXER_NOTIFIES
++static void
++cb_notify_message (GstBus *bus, GstMessage *message, gpointer data)
++{
++ GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
++ GstMixerMessageType type;
++ GstMixerTrack *first_track;
++ GstMixerTrack *track = NULL;
++
++ if (applet->tracks == NULL ||
++ GST_MESSAGE_SRC (message) != GST_OBJECT (applet->mixer)) {
++ /* No tracks, or not from our mixer - can't update anything anyway */
++ return;
++ }
++
++ first_track = g_list_first (applet->tracks)->data;
++
++ /* This code only calls refresh if the first_track changes, because the
++ * refresh code only retrieves the current value from that track anyway */
++ type = gst_mixer_message_get_type (message);
++ if (type == GST_MIXER_MESSAGE_MUTE_TOGGLED) {
++ gst_mixer_message_parse_mute_toggled (message, &track, NULL);
++ }
++ else {
++ gst_mixer_message_parse_volume_changed (message, &track, NULL, NULL);
++ }
++
++ if (first_track == track)
++ gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (data), FALSE);
++}
++#endif
++
+ static gboolean
+ cb_check (gpointer data)
+ {
+@@ -1214,6 +1290,8 @@ cb_gconf (GConfClient *client,
+ /* save */
+ gst_object_replace ((GstObject **) &applet->mixer, item->data);
+ gst_element_set_state (old_element, GST_STATE_NULL);
++
++ gnome_volume_applet_setup_timeout (applet);
+ newdevice = TRUE;
+ }
+ break;
+diff -up gnome-applets-2.19.1/mixer/applet.h.wakeups gnome-applets-2.19.1/mixer/applet.h
+--- gnome-applets-2.19.1/mixer/applet.h.wakeups 2007-08-12 23:00:17.000000000 -0400
++++ gnome-applets-2.19.1/mixer/applet.h 2007-08-12 23:00:29.000000000 -0400
+@@ -71,6 +71,7 @@ typedef struct _GnomeVolumeApplet {
+
+ /* element */
+ GstMixer *mixer;
++ GstBus *bus;
+ gboolean lock;
+ gint state;
+ GList *tracks;
+diff -up gnome-applets-2.19.1/configure.in.wakeups gnome-applets-2.19.1/configure.in
+--- gnome-applets-2.19.1/configure.in.wakeups 2007-08-12 23:03:29.000000000 -0400
++++ gnome-applets-2.19.1/configure.in 2007-08-12 23:03:55.000000000 -0400
+@@ -479,11 +479,22 @@ esac
+
+ AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
+ AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
++
++HAVE_GST_MIXER_NOTIFIES=no
+ if test "x$HAVE_GST_VER" = "x0.10" ; then
+ AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
+ # these don't seem to come from any pkg-config file
+ MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
++
++ PKG_CHECK_MODULES(GST_MIXER_NOTIFICATIONS,
++ gstreamer-plugins-base-0.10 >= 0.10.13.1,
++ HAVE_GST_MIXER_NOTIFIES=yes, HAVE_GST_MIXER_NOTIFIES=no)
++ if test "x$HAVE_GST_MIXER_NOTIFIES" = "xyes"; then
++ AC_DEFINE(HAVE_GST_MIXER_NOTIFIES, 1,
++ [Have GStreamer mixer notification API])
++ fi
+ fi
++AM_CONDITIONAL(HAVE_GST_MIXER_NOTIFIES, test "x$HAVE_GST_MIXER_NOTIFIES" = "xyes")
+
+ AC_SUBST(MIXER_CFLAGS)
+ AC_SUBST(MIXER_LIBS)
+@@ -766,6 +777,7 @@ gnome-applets-$VERSION configure summary
+ - invest-applet $BUILD_INVEST_APPLET
+ - mini-commander $enable_mini_commander
+ - mixer $HAVE_GST
++ - mixer notifications $HAVE_GST_MIXER_NOTIFIES
+ - modemlights $BUILD_MODEM_LIGHTS
+ - multiload $build_gtop_applets
+ - stickynotes $enable_stickynotes
commit b045b598d44ab86c3e8404ab9ddc6087b5661d3c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 6 04:14:52 2007 +0000
use find_lang for help texts
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a2f917b..fc07e37 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,9 +33,9 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
-License: GPL
+License: GPLv2+ and GFDL+
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
@@ -180,7 +180,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang %{po_package}
+%find_lang %{po_package} --all-name --with-gnome
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
@@ -281,8 +281,7 @@ fi
%files -f %{po_package}.lang
%defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/22x22/apps/*
@@ -291,7 +290,6 @@ fi
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome/help/*
%{_datadir}/gnome-applets
%{_datadir}/omf/*
%{_bindir}/*
@@ -331,6 +329,10 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-5
+- Use %%find_lang for help files, too
+- Update the license field
+
* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-4
- gswitchit.schemas does not exist anymore
commit d80e70a09a09ae01a1317971c462c646869b33df
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Aug 5 04:35:27 2007 +0000
fix scriptlet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d88621b..a2f917b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -222,7 +222,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
@@ -262,7 +261,6 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
@@ -333,6 +331,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Aug 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-4
+- gswitchit.schemas does not exist anymore
+
* Thu Aug 2 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-3
- Waste less space in Locations.xml
commit 29004027cfac93b401e2526056c1e022d8988775
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Aug 2 05:24:09 2007 +0000
waste less space
diff --git a/copy.xsl b/copy.xsl
new file mode 100644
index 0000000..0e64463
--- /dev/null
+++ b/copy.xsl
@@ -0,0 +1,30 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns="http://www.w3.org/1999/xhtml"
+ version="1.0">
+
+<xsl:output method="xml" doctype-system="location.dtd"/>
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+<xsl:template match="name">
+ <xsl:choose>
+ <xsl:when test="@xml:lang">
+ <xsl:variable name="ctext" select="../name[1]"/>
+ <xsl:variable name="thistext" select="."/>
+ <xsl:if test="$ctext != $thistext">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ff5c8f4..d88621b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,12 +33,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
+Source1: copy.xsl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,6 +92,7 @@ BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: perl(XML::Parser)
BuildRequires: libgnomekbd-devel
+BuildRequires: libxslt
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -170,6 +172,10 @@ make
%install
rm -rf $RPM_BUILD_ROOT
+# waste less space
+xsltproc %{SOURCE1} gweather/Locations.xml > loc.xml
+sed -e "s/^\s*//" -e "/^$/d" loc.xml > gweather/Locations.xml
+
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -197,6 +203,7 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cpufreq-selector
# drop non-XKB support files
rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -326,6 +333,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Thu Aug 2 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-3
+- Waste less space in Locations.xml
+
* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-2
- Fix scriptlets
commit 5e67a817f8da9f5d20d391a93fdd50745615128f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Aug 1 15:16:40 2007 +0000
fix scriptlets
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ba1d73b..ff5c8f4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -220,7 +220,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -241,7 +240,6 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -262,7 +260,6 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
@@ -329,6 +326,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-2
+- Fix scriptlets
+
* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-1
- Update to 2.19.1
commit b87bf1bb7bfabd96c473b197e66592fe490c4167
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Aug 1 14:31:39 2007 +0000
2.19.1
diff --git a/.cvsignore b/.cvsignore
index 2efcdd9..9bf946a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.19.0.tar.bz2
+gnome-applets-2.19.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cc5d685..ba1d73b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.19.0
-Release: 2%{?dist}
+Version: 2.19.1
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -329,6 +329,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Wed Aug 1 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.1-1
+- Update to 2.19.1
+
* Tue Jul 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-2
- Rebuild
diff --git a/sources b/sources
index ad38d70..1123d8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9970fb721bb6858e68f47644c7ceac68 gnome-applets-2.19.0.tar.bz2
+9dc982c8df1eaa27fecd4e78675070ba gnome-applets-2.19.1.tar.bz2
commit 9ee587c28b2a2d2acb5074b171d431d07b88363f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jul 31 20:29:49 2007 +0000
rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fbf0d26..cc5d685 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.19.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -329,6 +329,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Tue Jul 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-2
+- Rebuild
+
* Mon Jul 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-1
- Update to 2.19.0
- Drop modemlights, since it doesn't build anymore
commit 513295bbc830146740e517443b03cc2d91c5e446
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jul 31 14:14:43 2007 +0000
2.19.0
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bb13d9d..fbf0d26 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -39,13 +39,10 @@ License: GPL
Group: User Interface/Desktops
URL: http://www.gnome.org/
Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
-Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
-Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.17.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
@@ -58,8 +55,6 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
-Patch34: ppp-includes.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -148,7 +143,6 @@ libraries contained in the gnome-applets package.
%prep
%setup -q
-%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
@@ -159,14 +153,6 @@ libraries contained in the gnome-applets package.
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
-# We don't ship gnome-system-tools
-rm -rf modemlights
-tar xjf %{SOURCE1}
-
-%patch3 -p1 -b .ppp-command
-
-%patch34 -p1 -b .ppp-includes
-
intltoolize --force
autoconf
@@ -306,7 +292,6 @@ fi
%{_datadir}/gnome/help/*
%{_datadir}/gnome-applets
%{_datadir}/omf/*
-%{_datadir}/applications/gnome-invest-chart.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
@@ -322,7 +307,6 @@ fi
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
%{_libexecdir}/mixer_applet2
-%{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -347,6 +331,7 @@ fi
%changelog
* Mon Jul 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-1
- Update to 2.19.0
+- Drop modemlights, since it doesn't build anymore
* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-13
- Another directory ownership fix
diff --git a/sources b/sources
index d420a23..ad38d70 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
9970fb721bb6858e68f47644c7ceac68 gnome-applets-2.19.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit d27ecee3276a41988c25bfac092193b38a1f3094
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jul 30 22:42:08 2007 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e55779d..bb13d9d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -156,7 +156,6 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
-%patch34 -p1 -b .ppp-includes
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -165,6 +164,9 @@ rm -rf modemlights
tar xjf %{SOURCE1}
%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
intltoolize --force
autoconf
commit 649201f13f88b21ce1f7c369d8944ee573e2b859
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jul 30 22:09:30 2007 +0000
fix modemlights build
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1604d76..e55779d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -58,6 +58,8 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
+Patch34: ppp-includes.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +156,7 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch33 -p1 -b .node-leak
+%patch34 -p1 -b .ppp-includes
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
diff --git a/ppp-includes.patch b/ppp-includes.patch
new file mode 100644
index 0000000..75d3dc9
--- /dev/null
+++ b/ppp-includes.patch
@@ -0,0 +1,11 @@
+diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
+--- gnome-applets-2.19.0/modemlights/modemlights.c.includes 2007-07-30 18:05:02.000000000 -0400
++++ gnome-applets-2.19.0/modemlights/modemlights.c 2007-07-30 18:05:13.000000000 -0400
+@@ -41,6 +41,7 @@
+ #endif
+
+ #ifdef __linux__
++#include <linux/types.h>
+ #include <linux/if_ppp.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
commit 1ed8a16407c4033ebefc0f8852d0940b24eacac0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jul 30 21:38:56 2007 +0000
2.19.0
diff --git a/.cvsignore b/.cvsignore
index e9a187e..2efcdd9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.18.0.tar.bz2
+gnome-applets-2.19.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aeee9b0..1604d76 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.18.0
-Release: 13%{?dist}
+Version: 2.19.0
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -55,15 +55,9 @@ Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
Patch31: gnome-applets-2.18.0-fix-find.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=424989
-Patch32: gnome-applets-2.18.0-bug-buddy.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=431452
-Patch34: gnome-applets-2.18.0-wrong-gconf-keys.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -159,9 +153,7 @@ libraries contained in the gnome-applets package.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
-%patch32 -p1 -b .bug-buddy
%patch33 -p1 -b .node-leak
-%patch34 -p1 -b .wrong-gconf-keys
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -348,6 +340,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Mon Jul 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.19.0-1
+- Update to 2.19.0
+
* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-13
- Another directory ownership fix
diff --git a/sources b/sources
index 7b34d0d..d420a23 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-db3ef99c00335798f30fc0a9162c0257 gnome-applets-2.18.0.tar.bz2
+9970fb721bb6858e68f47644c7ceac68 gnome-applets-2.19.0.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit aa3fcddde901e94cf99b1b91ec915f9b61e590bc
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 7 15:15:41 2007 +0000
directory ownership fix
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 05d4996..aeee9b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -298,7 +298,7 @@ fi
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/pixmaps
+%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/22x22/apps/*
%{_datadir}/icons/hicolor/24x24/apps/*
@@ -339,7 +339,7 @@ fi
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/sound
+%{_sysconfdir}/sound/events/*
%files devel
%defattr(-,root,root)
@@ -348,6 +348,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-13
+- Another directory ownership fix
+
* Fri Jul 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-12
- Fix a directory ownership issue
commit 6fffb7f108c2a725504fb550c8325fcfcb7f3b79
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 7 03:37:20 2007 +0000
fix directory ownership
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fa4fe7d..05d4996 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -306,7 +306,7 @@ fi
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome
+%{_datadir}/gnome/help/*
%{_datadir}/gnome-applets
%{_datadir}/omf/*
%{_datadir}/applications/gnome-invest-chart.desktop
@@ -348,6 +348,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Fri Jul 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-12
+- Fix a directory ownership issue
+
* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-11
- Fix #237058
commit b1f76adf56dbade92b25348ec312634b58008318
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jun 17 06:15:17 2007 +0000
Fix #237058
diff --git a/gnome-applets-2.18.0-wrong-gconf-keys.patch b/gnome-applets-2.18.0-wrong-gconf-keys.patch
new file mode 100644
index 0000000..55d4de6
--- /dev/null
+++ b/gnome-applets-2.18.0-wrong-gconf-keys.patch
@@ -0,0 +1,35 @@
+--- gnome-applets-2.18.0/gswitchit/gswitchit.schemas.in.gkbd-gconf-prefix 2007-04-19 15:53:07.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/gswitchit.schemas.in 2007-04-19 15:55:43.000000000 -0400
+@@ -2,8 +2,8 @@
+ <gconfschemafile>
+ <schemalist>
+ <schema>
+- <key>/schemas/apps/gswitchit/Applet/secondary</key>
+- <applyto>/apps/gswitchit/Applet/secondary</applyto>
++ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/secondary</key>
++ <applyto>/desktop/gnome/peripherals/keyboard/indicator/secondary</applyto>
+ <owner>gnome</owner>
+ <type>int</type>
+ <default>0</default>
+@@ -14,8 +14,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/apps/gswitchit/Applet/showFlags</key>
+- <applyto>/apps/gswitchit/Applet/showFlags</applyto>
++ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/showFlags</key>
++ <applyto>/desktop/gnome/peripherals/keyboard/indicator/showFlags</applyto>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -26,8 +26,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/apps/gswitchit/Applet/enabledPlugins</key>
+- <applyto>/apps/gswitchit/Applet/enabledPlugins</applyto>
++ <key>/schemas/desktop/gnome/peripherals/keyboard/indicator/enabledPlugins</key>
++ <applyto>/schemas/desktop/gnome/peripherals/keyboard/indicator/enabledPlugins</applyto>
+ <owner>gnome</owner>
+ <type>list</type>
+ <list_type>string</list_type>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8ae3d35..fa4fe7d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch32: gnome-applets-2.18.0-bug-buddy.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=428072
Patch33: gnome-applets-2.18.0-node-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=431452
+Patch34: gnome-applets-2.18.0-wrong-gconf-keys.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -158,6 +161,7 @@ libraries contained in the gnome-applets package.
%patch31 -p1 -b .fix-find
%patch32 -p1 -b .bug-buddy
%patch33 -p1 -b .node-leak
+%patch34 -p1 -b .wrong-gconf-keys
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -344,6 +348,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-11
+- Fix #237058
+
* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-10
- Rebuild again
commit 515b2ca3541fe08c3a7ef4ccebba1a985955f8e5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 6 03:32:31 2007 +0000
Rebuild again
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 69a59b9..8ae3d35 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -344,6 +344,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-10
+- Rebuild again
+
* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-9
- Rebuild against new libwnck
commit ee78fedd2977801f79acf3327d7e56a8aaa79a7e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 5 03:46:41 2007 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d7d9afd..69a59b9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -344,6 +344,9 @@ fi
%{_libdir}/libgweather.so
%changelog
+* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-9
+- Rebuild against new libwnck
+
* Mon May 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-8
- Split off a -devel package
commit 8021272fb388a470d4f5a3d3b1f33b7a21252972
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue May 22 02:43:25 2007 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9ce8e15..d7d9afd 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -139,6 +139,8 @@ Summary: Development files for applications using gnome-applets
Group: Development/Libraries
Requires: gnome-applets = %{epoch}:%{version}-%{release}
Requires: pkgconfig
+Requires: gtk2-devel
+Requires: gnome-vfs2-devel
%description devel
commit 87832bbef89dacb4f4b1a99f5cdcd444e586d63c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue May 22 02:40:59 2007 +0000
split off a -devel package
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aff6f23..9ce8e15 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,12 +33,12 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.18/%{name}-%{version}.tar.…
+Source: http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +134,17 @@ applications and desktop tools to be used in conjunction with a window
manager for the X Window System. The gnome-applets package provides
small utilities for the GNOME panel.
+%package devel
+Summary: Development files for applications using gnome-applets
+Group: Development/Libraries
+Requires: gnome-applets = %{epoch}:%{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+
+This package contains files needed for compiling programs using
+libraries contained in the gnome-applets package.
+
%prep
%setup -q
%patch0 -p1 -b .use-old-modemlights
@@ -296,7 +307,7 @@ fi
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
-%{_libdir}/libgweather.so*
+%{_libdir}/libgweather.so.*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/battstat-applet-2
%{_libexecdir}/charpick_applet2
@@ -324,12 +335,16 @@ fi
%{_sysconfdir}/security/console.apps/*
%{_sysconfdir}/sound
-# These are really devel files, but we don't want a devel package
-# for just three files
+%files devel
+%defattr(-,root,root)
%{_includedir}/libgweather
%{_libdir}/pkgconfig/gweather.pc
+%{_libdir}/libgweather.so
%changelog
+* Mon May 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-8
+- Split off a -devel package
+
* Tue Apr 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-7
- Fix a leak in the keyboard indicator applet
commit 627baaea4042321644416e383a73b6fd07ca28b8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 9 23:59:38 2007 +0000
fix a leak in the keyboard indicator applet
diff --git a/gnome-applets-2.18.0-node-leak.patch b/gnome-applets-2.18.0-node-leak.patch
new file mode 100644
index 0000000..b13fd70
--- /dev/null
+++ b/gnome-applets-2.18.0-node-leak.patch
@@ -0,0 +1,10 @@
+--- gnome-applets-2.18.0/gswitchit/gswitchit-applet.c.node-leak 2007-04-10 01:40:23.000000000 +0200
++++ gnome-applets-2.18.0/gswitchit/gswitchit-applet.c 2007-04-10 01:41:27.000000000 +0200
+@@ -502,6 +502,7 @@
+ bonobo_ui_component_add_verb (popup, verb, (BonoboUIVerbFn)
+ GSwitchItAppletCmdSetGroup,
+ sia);
++ bonobo_ui_node_unref (node);
+ xkl_debug (160,
+ "Registered group menu item \'%s\' as \'%s\'\n",
+ verb, *currentName);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b731fee..aff6f23 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch31: gnome-applets-2.18.0-fix-find.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=424989
Patch32: gnome-applets-2.18.0-bug-buddy.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=428072
+Patch33: gnome-applets-2.18.0-node-leak.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -141,6 +144,7 @@ small utilities for the GNOME panel.
%patch30 -p1 -b .fix-null-applet
%patch31 -p1 -b .fix-find
%patch32 -p1 -b .bug-buddy
+%patch33 -p1 -b .node-leak
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -326,6 +330,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-7
+- Fix a leak in the keyboard indicator applet
+
* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-6
- Fix the bug-buddy support of the accessx status applet
commit 5059dcf47df780b0c835a99d6664207c7f48ea91
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Mar 31 22:40:40 2007 +0000
More bug-buddy fixes
diff --git a/gnome-applets-2.18.0-bug-buddy.patch b/gnome-applets-2.18.0-bug-buddy.patch
index 38fcdcf..1581b8e 100644
--- a/gnome-applets-2.18.0-bug-buddy.patch
+++ b/gnome-applets-2.18.0-bug-buddy.patch
@@ -1,5 +1,17 @@
---- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy 2007-03-31 17:19:21.000000000 -0400
-+++ gnome-applets-2.18.0/gswitchit/Makefile.in 2007-03-31 17:20:29.000000000 -0400
+--- gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in.bug-buddy 2007-03-31 18:34:54.000000000 -0400
++++ gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in 2007-03-31 18:40:05.000000000 -0400
+@@ -27,7 +27,8 @@
+ <oaf_attribute name="panel:icon" type="string" value="ax-applet"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+- <oaf_attribute name="bugzilla:component" type="string" value="other-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="keyboard-accessibility (accessx-status)"/>
++ <oaf_attribute name="bugzilla:other_binaries" type="string" value="accessx-status-applet"/>
+
+ </oaf_server>
+
+--- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy 2007-03-12 09:04:25.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/Makefile.in 2007-03-31 18:34:20.000000000 -0400
@@ -959,7 +959,7 @@
@@ -9,8 +21,8 @@
@INTLTOOL_SERVER_RULE@
---- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy 2007-03-31 17:15:53.000000000 -0400
-+++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in 2007-03-31 17:17:16.000000000 -0400
+--- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy 2006-12-30 21:07:52.000000000 -0500
++++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in 2007-03-31 18:34:20.000000000 -0400
@@ -10,6 +10,11 @@
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
@@ -35,8 +47,8 @@
</oaf_server>
---- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy 2007-03-31 17:17:36.000000000 -0400
-+++ gnome-applets-2.18.0/gswitchit/Makefile.am 2007-03-31 17:19:13.000000000 -0400
+--- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy 2006-12-30 21:07:52.000000000 -0500
++++ gnome-applets-2.18.0/gswitchit/Makefile.am 2007-03-31 18:34:20.000000000 -0400
@@ -49,7 +49,7 @@
server_DATA = $(server_in_files:.server.in=.server)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 257ebdf..b731fee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -326,6 +326,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-6
+- Fix the bug-buddy support of the accessx status applet
+
* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-5
- Add bug-buddy support to the keyboard indicator applet
commit 1ce484540b975fd85029dcdb052fe09eb724e6e4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Mar 31 21:32:17 2007 +0000
add bug-buddy support to keyboard applet
diff --git a/gnome-applets-2.18.0-bug-buddy.patch b/gnome-applets-2.18.0-bug-buddy.patch
new file mode 100644
index 0000000..38fcdcf
--- /dev/null
+++ b/gnome-applets-2.18.0-bug-buddy.patch
@@ -0,0 +1,48 @@
+--- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy 2007-03-31 17:19:21.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/Makefile.in 2007-03-31 17:20:29.000000000 -0400
+@@ -959,7 +959,7 @@
+
+
+ $(server_in_files): $(server_in_in_files)
+- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+
+ @INTLTOOL_SERVER_RULE@
+
+--- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy 2007-03-31 17:15:53.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in 2007-03-31 17:17:16.000000000 -0400
+@@ -10,6 +10,11 @@
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
+ <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
++ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
++ <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++ <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
+
+ </oaf_server>
+
+@@ -25,6 +30,11 @@
+ <oaf_attribute name="name" type="string" _value="Keyboard Indicator"/>
+ <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
+ <oaf_attribute name="panel:icon" type="string" value="gswitchit-applet.png"/>
++ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++ <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++ <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
++ <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++ <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
+
+ </oaf_server>
+
+--- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy 2007-03-31 17:17:36.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/Makefile.am 2007-03-31 17:19:13.000000000 -0400
+@@ -49,7 +49,7 @@
+ server_DATA = $(server_in_files:.server.in=.server)
+
+ $(server_in_files): $(server_in_in_files)
+- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+
+ CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA)
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 382992c..257ebdf 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -55,6 +55,9 @@ Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=424639
Patch31: gnome-applets-2.18.0-fix-find.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=424989
+Patch32: gnome-applets-2.18.0-bug-buddy.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -136,6 +139,8 @@ small utilities for the GNOME panel.
%patch11 -p1 -b .dont-require-display
%patch30 -p1 -b .fix-null-applet
+%patch31 -p1 -b .fix-find
+%patch32 -p1 -b .bug-buddy
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -321,6 +326,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-5
+- Add bug-buddy support to the keyboard indicator applet
+
* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-4
- make gweather applet preferences find feature work slightly
better (bug 209488)
commit 55398b01baaf6e30ec34a31db205ce0b8b354792
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri Mar 30 21:13:00 2007 +0000
- make gweather applet preferences find feature work slightly better (bug
209488)
diff --git a/gnome-applets-2.18.0-fix-find.patch b/gnome-applets-2.18.0-fix-find.patch
new file mode 100644
index 0000000..0be4ed5
--- /dev/null
+++ b/gnome-applets-2.18.0-fix-find.patch
@@ -0,0 +1,15 @@
+--- gnome-applets-2.18.0/gweather/gweather-pref.c.fix-find 2007-03-30 14:41:33.000000000 -0400
++++ gnome-applets-2.18.0/gweather/gweather-pref.c 2007-03-30 16:59:27.000000000 -0400
+@@ -618,8 +618,10 @@
+
+ if (go_parent) {
+ iter_parent = *iter;
+- if (gtk_tree_model_iter_parent (model, iter, &iter_parent) && gtk_tree_model_iter_next (model, iter)) {
+- return find_location (model, iter, location, TRUE);
++ while (gtk_tree_model_iter_parent (model, iter, &iter_parent)) {
++ if (gtk_tree_model_iter_next (model, iter))
++ return find_location (model, iter, location, TRUE);
++ iter_parent = *iter;
+ }
+ }
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e16ee90..382992c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -52,6 +52,9 @@ Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=395035
Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=424639
+Patch31: gnome-applets-2.18.0-fix-find.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -318,6 +321,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-4
+- make gweather applet preferences find feature work slightly
+ better (bug 209488)
+
* Wed Mar 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-3
- Remove non-XKB support files to save space
commit 80f04e66f2eeacbb968df1e6c7254fc1232f4c1f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 28 15:47:41 2007 +0000
save some space
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 72c666d..e16ee90 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -182,6 +182,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,security/console.apps}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/cpufreq-selector
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cpufreq-selector
+# drop non-XKB support files
+rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -276,7 +279,6 @@ fi
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome
%{_datadir}/gnome-applets
-%{_datadir}/xmodmap
%{_datadir}/omf/*
%{_datadir}/applications/gnome-invest-chart.desktop
%{_bindir}/*
@@ -316,6 +318,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Mar 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-3
+- Remove non-XKB support files to save space
+
* Wed Mar 21 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-2
- rerun intltoolize to get latest version
commit 0bad00bb140b66c97940f765071c51962fb60cde
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 21 17:49:15 2007 +0000
add buildreq on intltool
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0850638..72c666d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -83,7 +83,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
BuildRequires: which
-BuildRequires: libtool autoconf gettext
+BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: perl(XML::Parser)
@@ -141,7 +141,6 @@ rm -rf modemlights
tar xjf %{SOURCE1}
%patch3 -p1 -b .ppp-command
-
intltoolize --force
autoconf
commit 2ae39a19d3bca2fb9d416bd78e98303971909e98
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 21 17:41:13 2007 +0000
- rerun intltoolize to get latest version
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3246cfd..0850638 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -142,6 +142,7 @@ tar xjf %{SOURCE1}
%patch3 -p1 -b .ppp-command
+intltoolize --force
autoconf
%build
@@ -316,6 +317,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Mar 21 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.18.0-2
+- rerun intltoolize to get latest version
+
* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-1
- Update to 2.18.0
- Drop upstreamed patch
commit fa818ea0b47258673f21f1ab91a7258fc99a3788
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 13 16:45:21 2007 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3000512..3246cfd 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -49,8 +49,6 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.17.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-Patch27: gnome-applets-2.16.1-desktop-files.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=395035
Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
@@ -134,8 +132,6 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
-%patch27 -p1 -b .desktop-files
-
%patch30 -p1 -b .fix-null-applet
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -322,6 +318,7 @@ fi
%changelog
* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-1
- Update to 2.18.0
+- Drop upstreamed patch
* Tue Feb 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.90-1
- Update to 2.17.90
commit b88c515bcb74cf8a7bae878d08b2d861316888d5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 13 16:25:41 2007 +0000
readd lost source
diff --git a/sources b/sources
index 2b0c91c..7b34d0d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db3ef99c00335798f30fc0a9162c0257 gnome-applets-2.18.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 3bb29644f1201774efa6ffe776d0a7c7a5ad9729
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 13 16:22:28 2007 +0000
2.18.0
diff --git a/.cvsignore b/.cvsignore
index 7d05b79..e9a187e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,14 +1 @@
-gnome-applets-2.9.3.1-modemlights.tar.bz2
-gnome-applets-2.14.0.tar.bz2
-gnome-applets-2.14.1.tar.bz2
-gnome-applets-2.14.2.tar.bz2
-gnome-applets-2.15.1.1.tar.bz2
-gnome-applets-2.15.2.tar.bz2
-gnome-applets-2.15.3.tar.bz2
-gnome-applets-2.15.90.tar.bz2
-gnome-applets-2.16.0.tar.bz2
-gnome-applets-2.16.0.1.tar.bz2
-gnome-applets-2.16.1.tar.bz2
-gnome-applets-2.16.2.tar.bz2
-gnome-applets-2.17.1.tar.bz2
-gnome-applets-2.17.90.tar.bz2
+gnome-applets-2.18.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 94727a3..3000512 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,13 +32,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.17.90
+Version: 2.18.0
Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.17/%{name}-%{version}.tar.…
+Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.18/%{name}-%{version}.tar.…
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -320,6 +320,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.18.0-1
+- Update to 2.18.0
+
* Tue Feb 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.90-1
- Update to 2.17.90
diff --git a/sources b/sources
index 69a5ed4..2b0c91c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-350d527d2f5391385402f28ad96a99c5 gnome-applets-2.17.90.tar.bz2
+db3ef99c00335798f30fc0a9162c0257 gnome-applets-2.18.0.tar.bz2
commit 9b894ad52fff2d656f0f64b0127f3510b3e59b48
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 27 14:44:30 2007 +0000
2.17.90
diff --git a/.cvsignore b/.cvsignore
index 5b20d80..7d05b79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ gnome-applets-2.16.0.1.tar.bz2
gnome-applets-2.16.1.tar.bz2
gnome-applets-2.16.2.tar.bz2
gnome-applets-2.17.1.tar.bz2
+gnome-applets-2.17.90.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index add410e..94727a3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,7 +3,7 @@
%define gtk2_version 2.6.0
%define libgnome_version 2.8.0
%define libgnomeui_version 2.8.0
-%define gnome_vfs_version 2.8.0
+%define gnome_vfs_version 2.15.4
%define libglade_version 2.4.0
%define gnome_panel_version 2.13.4
%define libgtop2_version 2.12.0
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.17.1
+Version: 2.17.90
Release: 1%{?dist}
Epoch: 1
License: GPL
@@ -49,24 +49,10 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.17.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352777
-#Patch16: keyboard-drawing-rotated-text.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352778
-#Patch17: keyboard-drawing-label-color.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352779
-#Patch18: keyboard-drawing-primary.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352781
-#Patch19: keyboard-drawing-corner.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=353163
-#Patch20: keyboard-drawing-redraw.patch
-
-Patch27: gnome-applets-2.16.1-desktop-files.patch
-
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
-Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
+Patch27: gnome-applets-2.16.1-desktop-files.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=395035
-Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
+Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -102,7 +88,7 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
-BuildRequires: perl-XML-Parser
+BuildRequires: perl(XML::Parser)
BuildRequires: libgnomekbd-devel
Requires: gnome-panel >= %{gnome_panel_version}
@@ -111,14 +97,10 @@ Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
Requires(pre): GConf2 >= %{gconf_version}
-Requires(pre): GConf2 >= %{gconf_version}
-
Requires(preun): GConf2 >= %{gconf_version}
-
-Requires(post): scrollkeeper >= 0.1.4
Requires(post): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
+Requires(post): scrollkeeper
Requires(postun): scrollkeeper
# For wireless-applet backwards compat
@@ -130,14 +112,14 @@ Source10: cpufreq-selector.app
Source11: cpufreq-selector.pam
# For invest-applet
-Requires: gnome-python2-applet
-Requires: gnome-python2-libegg
+Requires: gnome-python2-applet
+Requires: gnome-python2-libegg
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
# since we are installing .pc files
-Requires: pkgconfig
+Requires: pkgconfig
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -152,15 +134,8 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
-#%patch16 -p1 -b .rotated-text
-#%patch17 -p1 -b .label-color
-#%patch18 -p1 -b .primary
-#%patch19 -p1 -b .corner
-#%patch20 -p1 -b .redraw
-
%patch27 -p1 -b .desktop-files
-%patch29 -p1 -b .delay-gstreamer-initialization
%patch30 -p1 -b .fix-null-applet
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -345,6 +320,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Feb 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.90-1
+- Update to 2.17.90
+
* Wed Jan 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.1-1
- Update to 2.17.1
diff --git a/sources b/sources
index 3810962..69a5ed4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-bd7395e3a0e1a21af79c2c7e3ba60f40 gnome-applets-2.17.1.tar.bz2
+350d527d2f5391385402f28ad96a99c5 gnome-applets-2.17.90.tar.bz2
commit c27511bf83024228539af7f421d8d8af825da7bb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jan 11 04:42:44 2007 +0000
fix file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 028e86b..add410e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -341,8 +341,6 @@ fi
# These are really devel files, but we don't want a devel package
# for just three files
-%{_includedir}/libgswitchit
-%{_libdir}/pkgconfig/gswitchit.pc
%{_includedir}/libgweather
%{_libdir}/pkgconfig/gweather.pc
commit b24490a5b7533da5f3f37ce15fbc325b7fea4fbd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jan 11 04:08:00 2007 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bfe0d93..028e86b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -103,7 +103,7 @@ BuildRequires: libtool autoconf gettext
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: perl-XML-Parser
-BuildRequires: libgnomekbd
+BuildRequires: libgnomekbd-devel
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit e390c4d361ebea70809ca0dea23b8d9c0e8b9694
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jan 11 03:20:47 2007 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c51146f..bfe0d93 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -103,6 +103,7 @@ BuildRequires: libtool autoconf gettext
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
BuildRequires: perl-XML-Parser
+BuildRequires: libgnomekbd
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -307,7 +308,6 @@ fi
%{_datadir}/xmodmap
%{_datadir}/omf/*
%{_datadir}/applications/gnome-invest-chart.desktop
-%{_datadir}/applications/gnome-gswitchit-plugins.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
commit a0f419eb7111ea27468dae3e4e68cb483461b5a7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jan 11 03:07:41 2007 +0000
2.17.1
diff --git a/.cvsignore b/.cvsignore
index 7f2a23f..5b20d80 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ gnome-applets-2.16.0.tar.bz2
gnome-applets-2.16.0.1.tar.bz2
gnome-applets-2.16.1.tar.bz2
gnome-applets-2.16.2.tar.bz2
+gnome-applets-2.17.1.tar.bz2
diff --git a/gnome-applets-2.16.1-desktop-files.patch b/gnome-applets-2.16.1-desktop-files.patch
index 97bfd1f..0899c7f 100644
--- a/gnome-applets-2.16.1-desktop-files.patch
+++ b/gnome-applets-2.16.1-desktop-files.patch
@@ -7,17 +7,3 @@
-Categories=Application;Office;Spreadsheet;
+Categories=Office;Spreadsheet;
+NoDisplay=true
---- gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in.desktop-files 2006-10-24 00:22:34.000000000 -0400
-+++ gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in 2006-10-24 00:23:59.000000000 -0400
-@@ -7,9 +7,10 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=Application;System;Settings;AdvancedSettings;
-+Categories=System;Settings;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-applets
- X-GNOME-Bugzilla-Component=keyboard indicator (gswitchit)
- X-GNOME-Bugzilla-Version=@VERSION@
-+NoDisplay=true
diff --git a/gnome-applets-2.17.1-cpufreq.patch b/gnome-applets-2.17.1-cpufreq.patch
new file mode 100644
index 0000000..22cc41f
--- /dev/null
+++ b/gnome-applets-2.17.1-cpufreq.patch
@@ -0,0 +1,34 @@
+--- gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c.cpufreq 2006-12-30 21:07:55.000000000 -0500
++++ gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c 2007-01-10 22:06:27.000000000 -0500
+@@ -176,19 +176,13 @@
+ cpufreq_popup_run_selector (CPUFreqPopup *popup,
+ const gchar *params)
+ {
+- gchar *path;
+ guint cpu;
+ gchar *command;
+ GError *error = NULL;
+
+- path = g_find_program_in_path ("cpufreq-selector");
+-
+- if (!path)
+- return;
+-
+ cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
+
+- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
++ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
+
+ g_spawn_command_line_async (command, &error);
+ g_free (command);
+--- gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c.cpufreq 2006-12-30 21:07:55.000000000 -0500
++++ gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c 2007-01-10 22:00:22.000000000 -0500
+@@ -109,6 +109,8 @@
+ if (!path)
+ return FALSE;
+
++ return TRUE;
++
+ if (geteuid () == 0)
+ return TRUE;
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a30ffa0..c51146f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,13 +32,13 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.16.2
-Release: 6%{?dist}
+Version: 2.17.1
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
URL: http://www.gnome.org/
-Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.…
+Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.17/%{name}-%{version}.tar.…
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,25 +46,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.15.1.1-cpufreq.patch
+Patch4: gnome-applets-2.17.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352777
-Patch16: keyboard-drawing-rotated-text.patch
+#Patch16: keyboard-drawing-rotated-text.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352778
-Patch17: keyboard-drawing-label-color.patch
+#Patch17: keyboard-drawing-label-color.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352779
-Patch18: keyboard-drawing-primary.patch
+#Patch18: keyboard-drawing-primary.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352781
-Patch19: keyboard-drawing-corner.patch
+#Patch19: keyboard-drawing-corner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=353163
-Patch20: keyboard-drawing-redraw.patch
+#Patch20: keyboard-drawing-redraw.patch
Patch27: gnome-applets-2.16.1-desktop-files.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=382774
-Patch28: gnome-applets-2.16.2-trash-screen.patch
-
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
@@ -154,15 +151,14 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
-%patch16 -p1 -b .rotated-text
-%patch17 -p1 -b .label-color
-%patch18 -p1 -b .primary
-%patch19 -p1 -b .corner
-%patch20 -p1 -b .redraw
+#%patch16 -p1 -b .rotated-text
+#%patch17 -p1 -b .label-color
+#%patch18 -p1 -b .primary
+#%patch19 -p1 -b .corner
+#%patch20 -p1 -b .redraw
%patch27 -p1 -b .desktop-files
-%patch28 -p1 -b .trash-screen
%patch29 -p1 -b .delay-gstreamer-initialization
%patch30 -p1 -b .fix-null-applet
@@ -351,6 +347,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jan 10 2007 Matthias Clasen <mclasen(a)redhat.com> - 1:2.17.1-1
+- Update to 2.17.1
+
* Wed Jan 10 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-6
- fix null applet error on login for new users (bug 222104)
diff --git a/sources b/sources
index ec19c76..3810962 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-1a46b8557ff05ca75e7db6adb4dd6707 gnome-applets-2.16.2.tar.bz2
+bd7395e3a0e1a21af79c2c7e3ba60f40 gnome-applets-2.17.1.tar.bz2
commit 00335f87647eb57b3aa5b237a7934fce6826b95e
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Jan 10 15:33:03 2007 +0000
- fix null applet error on login for new users (bug 222104)
diff --git a/gnome-applets-2.16.0.1-fix-null-applet.patch b/gnome-applets-2.16.0.1-fix-null-applet.patch
new file mode 100644
index 0000000..48b3393
--- /dev/null
+++ b/gnome-applets-2.16.0.1-fix-null-applet.patch
@@ -0,0 +1,11 @@
+--- gnome-applets-2.16.0.1/null_applet/null_applet.c.fix-null-applet 2006-12-15 17:09:57.000000000 -0500
++++ gnome-applets-2.16.0.1/null_applet/null_applet.c 2006-12-15 17:10:55.000000000 -0500
+@@ -83,7 +83,7 @@
+
+ for (l = list; l; l = l->next)
+ {
+- key = g_strdup_printf ("%p/bonobo_iid", l->data);
++ key = g_strdup_printf ("%s/bonobo_iid", l->data);
+ oafiid = gconf_client_get_string (client, key, &error);
+ if (error)
+ {
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e97e1f..a30ffa0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -68,6 +68,9 @@ Patch28: gnome-applets-2.16.2-trash-screen.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=395035
+Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -161,6 +164,7 @@ small utilities for the GNOME panel.
%patch28 -p1 -b .trash-screen
%patch29 -p1 -b .delay-gstreamer-initialization
+%patch30 -p1 -b .fix-null-applet
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -347,6 +351,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jan 10 2007 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-6
+- fix null applet error on login for new users (bug 222104)
+
* Tue Dec 12 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-5
- fix mixer applet error on login for new users (bug 217919)
commit 80e604c56b09c7fd00d0f2c548b7d7020460d8d5
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Dec 12 20:37:57 2006 +0000
- fix mixer applet error on login for new users (bug 217919)
diff --git a/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch b/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
new file mode 100644
index 0000000..6704320
--- /dev/null
+++ b/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
@@ -0,0 +1,57 @@
+--- gnome-applets-2.16.0.1/mixer/load.c.delay-gstreamer-initialization 2006-12-12 15:20:06.000000000 -0500
++++ gnome-applets-2.16.0.1/mixer/load.c 2006-12-12 15:29:08.000000000 -0500
+@@ -25,7 +25,7 @@
+
+ #include <string.h>
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #ifdef HAVE_GST10
+ #include <gst/audio/mixerutils.h>
+ #else
+@@ -293,21 +293,41 @@
+ #endif
+
+ static gboolean
+-gnome_volume_applet_factory (PanelApplet *applet,
+- const gchar *iid,
+- gpointer data)
++gnome_volume_applet_toplevel_configure_handler (GtkWidget *widget,
++ GdkEventConfigure *event,
++ gpointer data)
+ {
+ GList *elements;
+ static gboolean init = FALSE;
+
++ g_signal_handlers_disconnect_by_func (widget,
++ gnome_volume_applet_toplevel_configure_handler,
++ data);
++
+ if (!init) {
+ gst_init (NULL, NULL);
+ init = TRUE;
+ }
+
+ elements = create_mixer_collection ();
+- gnome_volume_applet_setup (GNOME_VOLUME_APPLET (applet), elements);
++ gnome_volume_applet_setup (GNOME_VOLUME_APPLET (data), elements);
++
++ return FALSE;
++}
+
++static gboolean
++gnome_volume_applet_factory (PanelApplet *applet,
++ const gchar *iid,
++ gpointer data)
++{
++ /* we delay applet specific initialization until the applet
++ * is fully registered with the panel since gst_init() can block
++ * for longer than the service activation timeouts
++ */
++ g_signal_connect (gtk_widget_get_toplevel (GTK_WIDGET (applet)),
++ "configure-event",
++ G_CALLBACK (gnome_volume_applet_toplevel_configure_handler),
++ applet);
+ return TRUE;
+ }
+
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f0dfcb4..3e97e1f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -65,6 +65,8 @@ Patch27: gnome-applets-2.16.1-desktop-files.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=382774
Patch28: gnome-applets-2.16.2-trash-screen.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
+Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -158,6 +160,7 @@ small utilities for the GNOME panel.
%patch27 -p1 -b .desktop-files
%patch28 -p1 -b .trash-screen
+%patch29 -p1 -b .delay-gstreamer-initialization
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -344,6 +347,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Dec 12 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.2-5
+- fix mixer applet error on login for new users (bug 217919)
+
* Sat Dec 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-4
- Small spec file cleanups
commit 7d410b2b957e2488a4329ddc4498df01eca78eac
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Dec 9 05:57:54 2006 +0000
spec file cleanup
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d9c28cd..f0dfcb4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -31,14 +31,18 @@
%define build_stickynotes 1
Summary: Small applications for the GNOME panel
-Name: gnome-applets
-Version: 2.16.2
-Release: 3%{?dist}
+Name: gnome-applets
+Version: 2.16.2
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+URL: http://www.gnome.org/
+Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.…
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
@@ -61,12 +65,7 @@ Patch27: gnome-applets-2.16.1-desktop-files.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=382774
Patch28: gnome-applets-2.16.2-trash-screen.patch
-URL: http://www.gnome.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Prereq: scrollkeeper >= 0.1.4
-Prereq: gtk2 >= %{gtk2_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -93,7 +92,6 @@ BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: gnome-python2-devel >= %{gnome_python_version}
BuildRequires: gnome-python2-applet
BuildRequires: gucharmap-devel
-
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
@@ -108,11 +106,18 @@ Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
-Requires(post): GConf2 >= %{gconf_version}
+
+Requires(pre): GConf2 >= %{gconf_version}
Requires(pre): GConf2 >= %{gconf_version}
+
Requires(preun): GConf2 >= %{gconf_version}
+
+Requires(post): scrollkeeper >= 0.1.4
+Requires(post): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
@@ -207,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
-scrollkeeper-update
+scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -276,6 +281,7 @@ fi
%postun
/sbin/ldconfig
+scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -338,6 +344,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Dec 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-4
+- Small spec file cleanups
+
* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.16.2-3
- rebuild for python 2.5
@@ -643,8 +652,8 @@ fi
- actually build the old modemlights that were added in 2.10.0-4
* Tue Apr 5 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-5
-- Don't use %postun -p optimization now that we do more than
- just /sbin/ldconfig in %postun (bug 152236)
+- Don't use %%postun -p optimization now that we do more than
+ just /sbin/ldconfig in %%postun (bug 152236)
* Mon Apr 4 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-4
- use old modemlights applet that doesn't depend on gnome-system-tools
@@ -703,7 +712,7 @@ fi
- Update to 2.7.3
* Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
-- Run mc-install-default-macros in %post
+- Run mc-install-default-macros in %%post
- Fixed small-volume patch from Nathan Fredrickson <nathan(a)silverorange.com>
* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
commit 8287b5c9bd451fa44258f223258ef677e2b05f72
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Dec 7 19:26:51 2006 +0000
- rebuild for python 2.5
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 06affc4..d9c28cd 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -338,6 +338,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.16.2-3
+- rebuild for python 2.5
+
* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-2
- Fix the trashapplet opening a window on the wrong screen (#218447)
commit bbc94a4fe3c51713a189232533e787296799632c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 5 21:36:20 2006 +0000
fix a trashapplet problem
diff --git a/gnome-applets-2.16.2-trash-screen.patch b/gnome-applets-2.16.2-trash-screen.patch
new file mode 100644
index 0000000..570ffde
--- /dev/null
+++ b/gnome-applets-2.16.2-trash-screen.patch
@@ -0,0 +1,31 @@
+--- gnome-applets-2.16.2/trashapplet/src/trashapplet.c.trash-screen 2006-12-05 16:33:56.000000000 -0500
++++ gnome-applets-2.16.2/trashapplet/src/trashapplet.c 2006-12-05 16:32:41.000000000 -0500
+@@ -669,6 +669,8 @@
+ TrashApplet *applet,
+ const gchar *cname)
+ {
++ GdkScreen *screen;
++
+ /* Open the "trash:" URI with gnome-open */
+ gchar *argv[] = { "gnome-open", "trash:", NULL };
+ GError *err = NULL;
+@@ -676,12 +678,13 @@
+
+ g_return_if_fail (TRASH_IS_APPLET (applet));
+
+- res = g_spawn_async (NULL,
+- argv, NULL,
+- G_SPAWN_SEARCH_PATH,
+- NULL, NULL,
+- NULL,
+- &err);
++ screen = gtk_widget_get_screen (GTK_WIDGET (applet));
++ res = gdk_spawn_on_screen (screen, NULL,
++ argv, NULL,
++ G_SPAWN_SEARCH_PATH,
++ NULL, NULL,
++ NULL,
++ &err);
+
+ if (! res) {
+ error_dialog (applet, _("Error while spawning nautilus:\n%s"),
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0e90725..06affc4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch20: keyboard-drawing-redraw.patch
Patch27: gnome-applets-2.16.1-desktop-files.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=382774
+Patch28: gnome-applets-2.16.2-trash-screen.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -149,6 +152,8 @@ small utilities for the GNOME panel.
%patch27 -p1 -b .desktop-files
+%patch28 -p1 -b .trash-screen
+
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
# We don't ship gnome-system-tools
@@ -333,6 +338,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-2
+- Fix the trashapplet opening a window on the wrong screen (#218447)
+
* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-1
- Update to 2.16.2
- Drop obsolete patches
commit b8383ed183f0bf5dc15b28ac8628f99da09cc743
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Dec 5 19:06:30 2006 +0000
2.16.2
diff --git a/.cvsignore b/.cvsignore
index 10f4e00..7f2a23f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ gnome-applets-2.15.90.tar.bz2
gnome-applets-2.16.0.tar.bz2
gnome-applets-2.16.0.1.tar.bz2
gnome-applets-2.16.1.tar.bz2
+gnome-applets-2.16.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9d5ff16..0e90725 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.16.1
-Release: 5%{?dist}
+Version: 2.16.2
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -56,13 +56,6 @@ Patch19: keyboard-drawing-corner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=353163
Patch20: keyboard-drawing-redraw.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=354986
-Patch22: gnome-applets-2.16.1-mixer-mute.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=356536
-Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
-
-Patch26: gnome-applets-2.16.0.1-cpufreq-changes.patch
Patch27: gnome-applets-2.16.1-desktop-files.patch
URL: http://www.gnome.org/
@@ -154,10 +147,6 @@ small utilities for the GNOME panel.
%patch19 -p1 -b .corner
%patch20 -p1 -b .redraw
-%patch22 -p1 -b .mixer-mute
-
-%patch25 -p1 -b .keyboard-indicator-segfault
-%patch26 -p1 -b .cpufreq-changes
%patch27 -p1 -b .desktop-files
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -344,6 +333,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.2-1
+- Update to 2.16.2
+- Drop obsolete patches
+
* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-5
- Fix muted icon in mixer again
diff --git a/sources b/sources
index cf2a7fb..ec19c76 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-af7ed5ad25e355ba422936f1395ce01b gnome-applets-2.16.0.tar.bz2
-ff31b5b0a4bf5d0a9f8d0039133f2333 gnome-applets-2.16.0.1.tar.bz2
-0ceb0411c86304be2661bd4072662ecb gnome-applets-2.16.1.tar.bz2
+1a46b8557ff05ca75e7db6adb4dd6707 gnome-applets-2.16.2.tar.bz2
commit f2ccebea28ea2b3b219987ff1a440c9706737c1d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Nov 16 17:56:36 2006 +0000
fix BRs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 336aa68..9d5ff16 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -94,7 +94,7 @@ BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtk2-devel >= %{pygtk_version}
-BuildRequires: gnome-python2 >= %{gnome_python_version}
+BuildRequires: gnome-python2-devel >= %{gnome_python_version}
BuildRequires: gnome-python2-applet
BuildRequires: gucharmap-devel
commit 6f48c81134a21ce1af4f924e19f1dea79a1aff4a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Nov 16 17:13:09 2006 +0000
fix muting
diff --git a/gnome-applets-2.16.1-mixer-mute.patch b/gnome-applets-2.16.1-mixer-mute.patch
new file mode 100644
index 0000000..3cc8d61
--- /dev/null
+++ b/gnome-applets-2.16.1-mixer-mute.patch
@@ -0,0 +1,15 @@
+--- gnome-applets-2.16.1/mixer/applet.c.mixer-mute 2006-11-16 09:59:46.000000000 -0500
++++ gnome-applets-2.16.1/mixer/applet.c 2006-11-16 12:11:22.000000000 -0500
+@@ -1098,7 +1098,11 @@
+ applet->force_next_update = FALSE;
+
+ if (did_change) {
+- pixbuf = applet->pix[n];
++ if (mute) {
++ pixbuf = applet->pix[0];
++ } else {
++ pixbuf = applet->pix[n];
++ }
+
+ gtk_image_set_from_pixbuf (applet->image, pixbuf);
+ applet->state = STATE (volume, mute);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4831621..336aa68 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -56,6 +56,9 @@ Patch19: keyboard-drawing-corner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=353163
Patch20: keyboard-drawing-redraw.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=354986
+Patch22: gnome-applets-2.16.1-mixer-mute.patch
+
# http://bugzilla.gnome.org/show_bug.cgi?id=356536
Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
@@ -151,6 +154,8 @@ small utilities for the GNOME panel.
%patch19 -p1 -b .corner
%patch20 -p1 -b .redraw
+%patch22 -p1 -b .mixer-mute
+
%patch25 -p1 -b .keyboard-indicator-segfault
%patch26 -p1 -b .cpufreq-changes
%patch27 -p1 -b .desktop-files
@@ -339,6 +344,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-5
+- Fix muted icon in mixer again
+
* Mon Nov 6 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.1-4
- s/verion/version/ in dbus glib build requires
commit 23e23385930acc8ca26b17b4d8a40ad5040053c7
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Nov 6 21:08:12 2006 +0000
- s/verion/version/ in dbus glib build requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dc421d9..4831621 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -16,7 +16,7 @@
%define libgnome_desktop_version 2.11.1
%define gnome_utils_version 2.8.1
%define dbus_version 0.90
-%define dbus_glib_verion 0.70
+%define dbus_glib_version 0.70
%define hal_version 0.5.3
%define libnotify_version 0.3.2
%define pygobject_version 2.6
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -339,6 +339,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Nov 6 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.1-4
+- s/verion/version/ in dbus glib build requires
+
* Fri Nov 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-3
- Silence %%pre
commit 177e387390cdeb5c4039ceb162d8adee9c7d0481
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Nov 3 14:25:11 2006 +0000
silence %%pre
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4ace576..dc421d9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -231,7 +231,7 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
%{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null || :
+%{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || :
%pre
if [ "$1" -gt 1 ]; then
@@ -251,7 +251,7 @@ if [ "$1" -gt 1 ]; then
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
+ %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
fi
%preun
@@ -272,7 +272,7 @@ if [ "$1" -eq 0 ]; then
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
+ %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
fi
%postun
@@ -339,6 +339,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Nov 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-3
+- Silence %%pre
+
* Mon Oct 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-2
- Make the cpufreq applet pick up preference changes (#209168)
commit 2c9effa1f40d9f5d72da11a4dbcb7ae224eae798
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Oct 24 04:25:37 2006 +0000
fix desktop files to be valid
diff --git a/gnome-applets-2.16.1-desktop-files.patch b/gnome-applets-2.16.1-desktop-files.patch
new file mode 100644
index 0000000..97bfd1f
--- /dev/null
+++ b/gnome-applets-2.16.1-desktop-files.patch
@@ -0,0 +1,23 @@
+--- gnome-applets-2.16.1/invest-applet/data/invest-chart.desktop.in.desktop-files 2006-10-24 00:25:14.000000000 -0400
++++ gnome-applets-2.16.1/invest-applet/data/invest-chart.desktop.in 2006-10-24 00:26:59.000000000 -0400
+@@ -7,4 +7,5 @@
+ Type=Application
+ Icon=invest-big.png
+ StartupNotify=true
+-Categories=Application;Office;Spreadsheet;
++Categories=Office;Spreadsheet;
++NoDisplay=true
+--- gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in.desktop-files 2006-10-24 00:22:34.000000000 -0400
++++ gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in 2006-10-24 00:23:59.000000000 -0400
+@@ -7,9 +7,10 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=Application;System;Settings;AdvancedSettings;
++Categories=System;Settings;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-applets
+ X-GNOME-Bugzilla-Component=keyboard indicator (gswitchit)
+ X-GNOME-Bugzilla-Version=@VERSION@
++NoDisplay=true
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 802a4b4..4ace576 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -60,6 +60,7 @@ Patch20: keyboard-drawing-redraw.patch
Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
Patch26: gnome-applets-2.16.0.1-cpufreq-changes.patch
+Patch27: gnome-applets-2.16.1-desktop-files.patch
URL: http://www.gnome.org/
@@ -152,6 +153,7 @@ small utilities for the GNOME panel.
%patch25 -p1 -b .keyboard-indicator-segfault
%patch26 -p1 -b .cpufreq-changes
+%patch27 -p1 -b .desktop-files
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -174,9 +176,6 @@ autoreconf
--enable-mini-commander
make
-echo "NoDisplay=true" >> libgswitchit/gswitchit-plugins.desktop
-echo "NoDisplay=true" >> invest-applet/data/invest-chart.desktop
-
%install
rm -rf $RPM_BUILD_ROOT
commit 63ca78e5a4ae321b9e2ce6693be1da7092f2a2e3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Oct 24 03:58:50 2006 +0000
fix cpufreq applet a bit
diff --git a/gnome-applets-2.16.0.1-cpufreq-changes.patch b/gnome-applets-2.16.0.1-cpufreq-changes.patch
new file mode 100644
index 0000000..14d6b43
--- /dev/null
+++ b/gnome-applets-2.16.0.1-cpufreq-changes.patch
@@ -0,0 +1,81 @@
+--- gnome-applets-2.16.0.1/cpufreq/src/cpufreq-applet.c.cpufreq-changes 2006-10-23 23:44:40.000000000 -0400
++++ gnome-applets-2.16.0.1/cpufreq/src/cpufreq-applet.c 2006-10-23 23:45:42.000000000 -0400
+@@ -54,6 +54,7 @@
+ gboolean show_perc;
+ gboolean show_unit;
+ gboolean show_icon;
++ gboolean do_refresh;
+
+ CPUFreqMonitor *monitor;
+
+@@ -222,6 +223,8 @@
+ applet->size = panel_applet_get_size (PANEL_APPLET (applet));
+ applet->orient = panel_applet_get_orient (PANEL_APPLET (applet));
+
++ applet->do_refresh = TRUE;
++
+ gtk_widget_show (GTK_WIDGET (applet));
+ }
+
+@@ -663,7 +666,6 @@
+ gint perc;
+ guint cpu;
+ gchar *governor;
+- static gboolean do_refresh = TRUE;
+
+ cpu = cpufreq_monitor_get_cpu (monitor);
+ freq = cpufreq_monitor_get_frequency (monitor);
+@@ -713,9 +715,9 @@
+ g_free (text_tip);
+
+ /* Call refresh only the first time */
+- if (do_refresh) {
++ if (applet->do_refresh) {
+ cpufreq_applet_refresh (applet);
+- do_refresh = FALSE;
++ applet->do_refresh = FALSE;
+ }
+ }
+
+@@ -844,6 +846,18 @@
+ }
+
+ static void
++cpufreq_applet_prefs_cpu_changed (CPUFreqPrefs *prefs,
++ GParamSpec *arg1,
++ CPUFreqApplet *applet)
++{
++ gint cpu;
++
++ cpu = cpufreq_prefs_get_cpu (prefs);
++ cpufreq_monitor_set_cpu (applet->monitor, cpu);
++ cpufreq_applet_update (applet, applet->monitor);
++}
++
++static void
+ cpufreq_applet_setup (CPUFreqApplet *applet)
+ {
+ BonoboUIComponent *popup_component;
+@@ -873,9 +887,11 @@
+ "notify::show-text-mode",
+ G_CALLBACK (cpufreq_applet_prefs_show_mode_changed),
+ (gpointer) applet);
++ g_signal_connect (G_OBJECT (applet->prefs),
++ "notify::cpu",
++ G_CALLBACK (cpufreq_applet_prefs_cpu_changed),
++ (gpointer) applet);
+
+- cpufreq_applet_update_visibility (applet);
+-
+ /* Monitor */
+ applet->monitor = cpufreq_monitor_factory_create_monitor (
+ cpufreq_prefs_get_cpu (applet->prefs));
+@@ -884,6 +900,8 @@
+ G_CALLBACK (cpufreq_applet_update),
+ (gpointer) applet);
+
++ cpufreq_applet_update_visibility (applet);
++
+ /* Setup the menus */
+ panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
+ DATADIR,
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 632f0c3..802a4b4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -59,6 +59,8 @@ Patch20: keyboard-drawing-redraw.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=356536
Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
+Patch26: gnome-applets-2.16.0.1-cpufreq-changes.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -149,6 +151,7 @@ small utilities for the GNOME panel.
%patch20 -p1 -b .redraw
%patch25 -p1 -b .keyboard-indicator-segfault
+%patch26 -p1 -b .cpufreq-changes
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -337,6 +340,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Oct 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-2
+- Make the cpufreq applet pick up preference changes (#209168)
+
* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-1
- Update to 2.16.1
- Drop upstreamed patches
commit 7bf49141a91b4cc576edb1a79cd479e258c91276
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 22 00:06:22 2006 +0000
drop upstreamed patches
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b36e3d8..632f0c3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -56,18 +56,6 @@ Patch19: keyboard-drawing-corner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=353163
Patch20: keyboard-drawing-redraw.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=204858
-Patch21: gnome-applets-2.15.90-poll-less.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=354986
-Patch22: gnome-applets-2.16.0.1-mixer-icon-size.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=355223
-Patch23: gnome-applets-2.16.0.1-desktop-clicks.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=356138
-Patch24: gnome-applets-2.16.0.1-trash-icon-size.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=356536
Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
@@ -160,10 +148,6 @@ small utilities for the GNOME panel.
%patch19 -p1 -b .corner
%patch20 -p1 -b .redraw
-%patch21 -p1 -b .poll-less
-%patch22 -p1 -b .mixer-icon-size
-%patch23 -p1 -b .desktop-clicks
-%patch24 -p1 -b .trash-icon-size
%patch25 -p1 -b .keyboard-indicator-segfault
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -355,6 +339,7 @@ fi
%changelog
* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-1
- Update to 2.16.1
+- Drop upstreamed patches
* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-11
- Fix scripts according to packaging guidelines
commit 4ab08a7613f68ee3b7f4635d7761ad6bf290bacb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Oct 21 23:38:33 2006 +0000
2.16.1
diff --git a/.cvsignore b/.cvsignore
index 5616ac0..10f4e00 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ gnome-applets-2.15.3.tar.bz2
gnome-applets-2.15.90.tar.bz2
gnome-applets-2.16.0.tar.bz2
gnome-applets-2.16.0.1.tar.bz2
+gnome-applets-2.16.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1a7aa65..b36e3d8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,8 +32,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.16.0.1
-Release: 11%{?dist}
+Version: 2.16.1
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -353,6 +353,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.1-1
+- Update to 2.16.1
+
* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-11
- Fix scripts according to packaging guidelines
diff --git a/sources b/sources
index c95a509..cf2a7fb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
af7ed5ad25e355ba422936f1395ce01b gnome-applets-2.16.0.tar.bz2
ff31b5b0a4bf5d0a9f8d0039133f2333 gnome-applets-2.16.0.1.tar.bz2
+0ceb0411c86304be2661bd4072662ecb gnome-applets-2.16.1.tar.bz2
commit 27e97edf3d34fedbf1464153f35b5cc95223d5ba
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Oct 18 17:39:07 2006 +0000
bump rev
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a43a3ce..1a7aa65 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -353,13 +353,13 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
-* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
+* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-11
- Fix scripts according to packaging guidelines
-* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
+* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
- Fix up requirements (#202549)
-* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-8
+* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
- Fix muting in the mixer applet (#208660)
* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
commit 02f5b427d3ca8fc68d49b2d464a999e5f19498de
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Oct 18 17:36:43 2006 +0000
fix scripts
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 55b6b71..a43a3ce 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -22,7 +22,7 @@
%define pygobject_version 2.6
%define pygtk_version 2.6
%define gnome_python_version 2.10
-%define gconf_version 2.14
+%define gconf_version 2.14.0
%define po_package gnome-applets-2.0
@@ -118,6 +118,10 @@ Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
+Requires(post): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): scrollkeeper
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
@@ -137,10 +141,6 @@ Obsoletes: gnome-cpufreq-applet
# since we are installing .pc files
Requires: pkgconfig
-Requires(post): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
-
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -245,7 +245,28 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
%{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
+%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
+fi
%preun
if [ "$1" -eq 0 ]; then
@@ -265,7 +286,7 @@ if [ "$1" -eq 0 ]; then
%if %{build_stickynotes}
%{_sysconfdir}/gconf/schemas/stickynotes.schemas \
%endif
- %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
fi
%postun
@@ -332,10 +353,13 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
-* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
+* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
+- Fix scripts according to packaging guidelines
+
+* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
- Fix up requirements (#202549)
-* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
+* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-8
- Fix muting in the mixer applet (#208660)
* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
commit 89a1a12772861700b9a7f75611f2ec138e92470b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Oct 17 17:20:03 2006 +0000
fix up requirements
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7b2c165..55b6b71 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -22,6 +22,7 @@
%define pygobject_version 2.6
%define pygtk_version 2.6
%define gnome_python_version 2.10
+%define gconf_version 2.14
%define po_package gnome-applets-2.0
@@ -32,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -136,6 +137,10 @@ Obsoletes: gnome-cpufreq-applet
# since we are installing .pc files
Requires: pkgconfig
+Requires(post): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): scrollkeeper
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -327,6 +332,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Oct 17 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-10
+- Fix up requirements (#202549)
+
* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
- Fix muting in the mixer applet (#208660)
commit bfc15ac0e1e68eca667b3420b2bc6adaaa5e295d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Oct 14 05:20:18 2006 +0000
fix muting
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 37f37de..7b2c165 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 7%{?dist}
+Release: 9%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -327,6 +327,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Oct 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-9
+- Fix muting in the mixer applet (#208660)
+
* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
commit e7c157163d3d8135c553e8fce924b740ff91d783
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sun Oct 1 21:16:40 2006 +0000
bump for gcc bug
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 121f157..37f37de 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -327,6 +327,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.16.0.1-7
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
* Thu Sep 21 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.0.1-6
- Don't ask for password when changing CPU frequency
commit c01780a5ee8fae24121be0f671fa3f5db4703085
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Sep 21 14:00:56 2006 +0000
- Don't ask for password when changing CPU frequency
diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam
index 5b578cc..34bb38a 100644
--- a/cpufreq-selector.pam
+++ b/cpufreq-selector.pam
@@ -1,4 +1,4 @@
#%PAM-1.0
-auth include config-util
-account include config-util
-session include config-util
+auth sufficient pam_rootok.so
+auth required pam_console.so
+account required pam_permit.so
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 579977d..121f157 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -327,6 +327,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Sep 21 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.16.0.1-6
+- Don't ask for password when changing CPU frequency
+
* Mon Sep 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-5
- Fix a segfault in the keyboard indicator applet
commit 7ceb3da6e0085812023a0df8a311ee901f0bd8d5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 18 13:59:15 2006 +0000
fix a keyboard indicator segfault
diff --git a/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch b/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
new file mode 100644
index 0000000..85b44b0
--- /dev/null
+++ b/gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
@@ -0,0 +1,30 @@
+--- gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c.keyboard-indicator-segfault 2006-08-12 21:26:53.000000000 -0400
++++ gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c 2006-09-18 09:23:54.000000000 -0400
+@@ -410,18 +410,22 @@
+ xkl_engine_get_num_groups (globals.engine);
+ globals.full_group_names =
+ g_new0 (char *, total_groups + 1);
++ globals.short_group_names =
++ g_new0 (char *, total_groups + 1);
+
+ if (xkl_engine_get_features (globals.engine) &
+ XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
+ GSList *lst = globals.kbd_cfg.layouts;
+- for (i = 0; lst; lst = lst->next) {
+- globals.full_group_names[i++] =
+- g_strdup ((char *) lst->data);
++ for (i = 0; lst; lst = lst->next,i++) {
++ globals.short_group_names[i] =
++ globals.full_group_names[i] =
++ g_strdup ((char *) lst->data);
+ }
+ } else {
+ for (i = total_groups; --i >= 0;) {
+- globals.full_group_names[i] =
+- g_strdup_printf ("Group %d", i);
++ globals.short_group_names[i] =
++ globals.full_group_names[i] =
++ g_strdup_printf ("Group %d", i);
+ }
+ }
+ }
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5db600b..579977d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -67,6 +67,9 @@ Patch23: gnome-applets-2.16.0.1-desktop-clicks.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=356138
Patch24: gnome-applets-2.16.0.1-trash-icon-size.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=356536
+Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -156,6 +159,7 @@ small utilities for the GNOME panel.
%patch22 -p1 -b .mixer-icon-size
%patch23 -p1 -b .desktop-clicks
%patch24 -p1 -b .trash-icon-size
+%patch25 -p1 -b .keyboard-indicator-segfault
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -323,6 +327,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Sep 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-5
+- Fix a segfault in the keyboard indicator applet
+
* Fri Sep 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-4
- Fix some icon size issues in the trash applet
commit 1c905c66e50aa6953f7088effe04d7c7b64c617f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Sep 15 15:08:05 2006 +0000
fix trash applet icon size issues
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f65af34..5db600b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch22: gnome-applets-2.16.0.1-mixer-icon-size.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=355223
Patch23: gnome-applets-2.16.0.1-desktop-clicks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=356138
+Patch24: gnome-applets-2.16.0.1-trash-icon-size.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -152,6 +155,7 @@ small utilities for the GNOME panel.
%patch21 -p1 -b .poll-less
%patch22 -p1 -b .mixer-icon-size
%patch23 -p1 -b .desktop-clicks
+%patch24 -p1 -b .trash-icon-size
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -319,6 +323,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Sep 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-4
+- Fix some icon size issues in the trash applet
+
* Sun Sep 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-3
- Make stickynotes not wake up 10 times per second (#205909)
commit f48a2f11364e81b4d5771a1653e0ae5093a72190
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Sep 10 04:46:09 2006 +0000
fix stickynotes
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 33ed928..f65af34 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -320,7 +320,7 @@ fi
%changelog
* Sun Sep 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-3
-- Make stickynotes not wake up 10 times per second
+- Make stickynotes not wake up 10 times per second (#205909)
* Fri Sep 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-2
- Fix the resizing behaviour of the mixer applet
commit b6c68069ce965a42d6e22023544e8fbb29d65d4e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Sep 10 04:43:53 2006 +0000
fix frequent wakeups in stickynotes
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0a9a1bb..33ed928 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch21: gnome-applets-2.15.90-poll-less.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=354986
Patch22: gnome-applets-2.16.0.1-mixer-icon-size.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=355223
+Patch23: gnome-applets-2.16.0.1-desktop-clicks.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -148,6 +151,7 @@ small utilities for the GNOME panel.
%patch21 -p1 -b .poll-less
%patch22 -p1 -b .mixer-icon-size
+%patch23 -p1 -b .desktop-clicks
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -315,6 +319,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Sep 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-3
+- Make stickynotes not wake up 10 times per second
+
* Fri Sep 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-2
- Fix the resizing behaviour of the mixer applet
commit 4533485f8be608c8d56595141b3439046ecb9bae
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Sep 8 15:50:55 2006 +0000
fix mixer resizing
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2febea0..0a9a1bb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.16.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch20: keyboard-drawing-redraw.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=204858
Patch21: gnome-applets-2.15.90-poll-less.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=354986
+Patch22: gnome-applets-2.16.0.1-mixer-icon-size.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -144,6 +147,7 @@ small utilities for the GNOME panel.
%patch20 -p1 -b .redraw
%patch21 -p1 -b .poll-less
+%patch22 -p1 -b .mixer-icon-size
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -311,6 +315,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Sep 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-2
+- Fix the resizing behaviour of the mixer applet
+
* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-1.fc6
- Update to 2.16.0.1
commit 95ba28b5ad2c40344034387e0f2450a0a352d887
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 5 04:04:16 2006 +0000
2.16.0.1
diff --git a/.cvsignore b/.cvsignore
index cc5dc12..5616ac0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ gnome-applets-2.15.2.tar.bz2
gnome-applets-2.15.3.tar.bz2
gnome-applets-2.15.90.tar.bz2
gnome-applets-2.16.0.tar.bz2
+gnome-applets-2.16.0.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 38f74e8..2febea0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -31,7 +31,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.16.0
+Version: 2.16.0.1
Release: 1%{?dist}
Epoch: 1
License: GPL
@@ -311,6 +311,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0.1-1.fc6
+- Update to 2.16.0.1
+
* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0-1.fc6
- Update to 2.16.0
diff --git a/sources b/sources
index 3d0cb0c..c95a509 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
af7ed5ad25e355ba422936f1395ce01b gnome-applets-2.16.0.tar.bz2
+ff31b5b0a4bf5d0a9f8d0039133f2333 gnome-applets-2.16.0.1.tar.bz2
commit 01f44b254139c5e9c7abbb0b8ebf3900b5eab7be
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 4 23:55:33 2006 +0000
drop obsolete patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 54c728c..38f74e8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -44,8 +44,6 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=352776
-Patch15: keyboard-drawing-focus.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352777
Patch16: keyboard-drawing-rotated-text.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352778
@@ -139,7 +137,6 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
-%patch15 -p1 -b .focus
%patch16 -p1 -b .rotated-text
%patch17 -p1 -b .label-color
%patch18 -p1 -b .primary
commit af93923393edfdd3797326f0d652a8fca4933f1a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Sep 4 23:47:17 2006 +0000
2.16.0
diff --git a/.cvsignore b/.cvsignore
index 2c7013f..cc5dc12 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ gnome-applets-2.15.1.1.tar.bz2
gnome-applets-2.15.2.tar.bz2
gnome-applets-2.15.3.tar.bz2
gnome-applets-2.15.90.tar.bz2
+gnome-applets-2.16.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ed196e7..54c728c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -31,8 +31,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.15.90
-Release: 6%{?dist}
+Version: 2.16.0
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -314,6 +314,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.16.0-1.fc6
+- Update to 2.16.0
+
* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-6.fc6
- Make the battstat applet poll less often (204858)
diff --git a/sources b/sources
index e4072e1..3d0cb0c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-421eda161541b42d42ea04c59b9ee4f1 gnome-applets-2.15.90.tar.bz2
+af7ed5ad25e355ba422936f1395ce01b gnome-applets-2.16.0.tar.bz2
commit 8db4112e067c7aaf15df290e8290395e8969c7bf
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Sep 1 17:43:46 2006 +0000
poll less often
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3105c61..ed196e7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.90
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -57,6 +57,9 @@ Patch19: keyboard-drawing-corner.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=353163
Patch20: keyboard-drawing-redraw.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=204858
+Patch21: gnome-applets-2.15.90-poll-less.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -143,6 +146,8 @@ small utilities for the GNOME panel.
%patch19 -p1 -b .corner
%patch20 -p1 -b .redraw
+%patch21 -p1 -b .poll-less
+
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
# We don't ship gnome-system-tools
@@ -309,6 +314,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-6.fc6
+- Make the battstat applet poll less often (204858)
+
* Mon Aug 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-5.fc6
- Make cpufreq-selector use the config-utils pam policy
commit 1ad37642ef55a7664b12b9571f035e0e43206e9d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 28 16:51:17 2006 +0000
fix cpufreq-selector to use config-utils pam policy
diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam
index 321c2ee..5b578cc 100644
--- a/cpufreq-selector.pam
+++ b/cpufreq-selector.pam
@@ -1,4 +1,4 @@
#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_console.so
-account required pam_permit.so
+auth include config-util
+account include config-util
+session include config-util
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ca4a2b9..3105c61 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.90
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -309,6 +309,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Aug 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-5.fc6
+- Make cpufreq-selector use the config-utils pam policy
+
* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-4.fc6
- Fix some redraw issues in the keyboard capplet
commit 68ac211222556935b11aec2613e4966388ae53b1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 28 03:38:43 2006 +0000
fix some redraw issues
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d49dc4b..ca4a2b9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.90
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -54,6 +54,8 @@ Patch17: keyboard-drawing-label-color.patch
Patch18: keyboard-drawing-primary.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=352781
Patch19: keyboard-drawing-corner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=353163
+Patch20: keyboard-drawing-redraw.patch
URL: http://www.gnome.org/
@@ -139,7 +141,7 @@ small utilities for the GNOME panel.
%patch17 -p1 -b .label-color
%patch18 -p1 -b .primary
%patch19 -p1 -b .corner
-
+%patch20 -p1 -b .redraw
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -307,6 +309,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-4.fc6
+- Fix some redraw issues in the keyboard capplet
+
* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-3.fc6
- More keyboard drawing improvements
diff --git a/keyboard-drawing-redraw.patch b/keyboard-drawing-redraw.patch
new file mode 100644
index 0000000..4637c29
--- /dev/null
+++ b/keyboard-drawing-redraw.patch
@@ -0,0 +1,48 @@
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.redraw 2006-08-27 22:42:37.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-27 22:54:18.000000000 -0400
+@@ -1176,6 +1176,26 @@
+ }
+
+ static void
++redraw_overlapping_doodads (
++ KeyboardDrawing * drawing,
++ KeyboardDrawingKey * key)
++{
++ GList *list;
++ gboolean do_draw = FALSE;
++
++ for (list = drawing->keyboard_items; list; list = list->next)
++ {
++ KeyboardDrawingItem * item = list->data;
++
++ if (do_draw && item->type == KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
++ draw_doodad (drawing, (KeyboardDrawingDoodad *) item);
++
++ if (list->data == key)
++ do_draw = TRUE;
++ }
++}
++
++static void
+ draw_keyboard_item (
+ KeyboardDrawingItem * item,
+ KeyboardDrawing * drawing)
+@@ -1340,7 +1360,7 @@
+ key->pressed = (event->type == GDK_KEY_PRESS);
+
+ draw_key (drawing, key);
+-
++ redraw_overlapping_doodads (drawing, key);
+ invalidate_key_region (drawing, key);
+
+ return TRUE;
+@@ -1370,7 +1390,9 @@
+ if (drawing->keys[i].pressed)
+ {
+ drawing->keys[i].pressed = FALSE;
++
+ draw_key (drawing, drawing->keys + i);
++ redraw_overlapping_doodads (drawing, drawing->keys + i);
+ invalidate_key_region (drawing, drawing->keys + i);
+ }
+
commit f57e3eefbf282b7a9b3ac8f95009aa3c61280582
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Aug 27 05:06:37 2006 +0000
more keyboard drawing improvements
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a1635b6..d49dc4b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -307,6 +307,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-3.fc6
+- More keyboard drawing improvements
+
* Thu Aug 24 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-2.fc6
- Various improvements for the keyboard applet
diff --git a/keyboard-drawing-corner.patch b/keyboard-drawing-corner.patch
index 9dde14d..c4ededb 100644
--- a/keyboard-drawing-corner.patch
+++ b/keyboard-drawing-corner.patch
@@ -1,9 +1,274 @@
---- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner 2006-08-24 22:08:59.000000000 -0400
-+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:13:07.000000000 -0400
-@@ -121,6 +121,61 @@
- g_object_unref (gc);
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner 2006-08-27 00:37:45.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-27 00:44:04.000000000 -0400
+@@ -76,6 +76,219 @@
+ cos (M_PI * angle / 1800.0);
}
++static gdouble
++length (gdouble x, gdouble y)
++{
++ return sqrt (x*x + y*y);
++}
++
++static gdouble
++point_line_distance (gdouble ax, gdouble ay,
++ gdouble nx, gdouble ny)
++{
++ return ax * nx + ay * ny;
++}
++
++static void
++normal_form (gdouble ax, gdouble ay,
++ gdouble bx, gdouble by,
++ gdouble *nx, gdouble *ny, gdouble *d)
++{
++ gdouble l;
++
++ *nx = by - ay;
++ *ny = ax - bx;
++
++ l = length (*nx, *ny);
++
++ *nx /= l;
++ *ny /= l;
++
++ *d = point_line_distance (ax, ay, *nx, *ny);
++}
++
++static void
++inverse (gdouble a, gdouble b, gdouble c, gdouble d,
++ gdouble *e, gdouble *f, gdouble *g, gdouble *h)
++{
++ gdouble det;
++
++ det = a*d - b*c;
++
++ *e = d / det;
++ *f = -b / det;
++ *g = -c / det;
++ *h = a / det;
++}
++
++static void
++multiply (gdouble a, gdouble b, gdouble c, gdouble d,
++ gdouble e, gdouble f,
++ gdouble *x, gdouble *y)
++{
++ *x = a*e + b*f;
++ *y = c*e + d*f;
++}
++
++static void
++intersect (gdouble n1x, gdouble n1y, gdouble d1,
++ gdouble n2x, gdouble n2y, gdouble d2,
++ gdouble *x, gdouble *y)
++{
++ gdouble e, f, g, h;
++
++ inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h);
++ multiply (e, f, g, h, d1, d2, x, y);
++}
++
++
++/* draw an angle from the current point to b and then to c,
++ * with a rounded corner of the given radius.
++ */
++static void
++rounded_corner (cairo_t *cr,
++ gdouble bx, gdouble by,
++ gdouble cx, gdouble cy,
++ gdouble radius)
++{
++ gdouble ax, ay;
++ gdouble n1x, n1y, d1;
++ gdouble n2x, n2y, d2;
++ gdouble pd1, pd2;
++ gdouble ix, iy;
++ gdouble dist1, dist2;
++ gdouble nx, ny, d;
++ gdouble a1x, a1y, c1x, c1y;
++ gdouble phi1, phi2;
++
++ cairo_get_current_point (cr, &ax, &ay);
++
++ /* make sure radius is not too large */
++ dist1 = length (bx - ax, by - ay);
++ dist2 = length (cx - bx, cy - by);
++
++ radius = MIN (radius, MIN (dist1, dist2));
++
++ /* construct normal forms of the lines */
++ normal_form (ax, ay, bx, by, &n1x, &n1y, &d1);
++ normal_form (bx, by, cx, cy, &n2x, &n2y, &d2);
++
++ /* find which side of the line a,b the point c is on */
++ if (point_line_distance (cx, cy, n1x, n1y) < d1)
++ pd1 = d1 - radius;
++ else
++ pd1 = d1 + radius;
++
++ /* find which side of the line b,c the point a is on */
++ if (point_line_distance (ax, ay, n2x, n2y) < d2)
++ pd2 = d2 - radius;
++ else
++ pd2 = d2 + radius;
++
++ /* intersect the parallels to find the center of the arc */
++ intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy);
++
++ nx = (bx - ax) / dist1;
++ ny = (by - ay) / dist1;
++ d = point_line_distance (ix, iy, nx, ny);
++
++ /* a1 is the point on the line a-b where the arc starts */
++ intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y);
++
++ nx = (cx - bx) / dist2;
++ ny = (cy - by) / dist2;
++ d = point_line_distance (ix, iy, nx, ny);
++
++ /* c1 is the point on the line b-c where the arc ends */
++ intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y);
++
++ /* determine the first angle */
++ if (a1x - ix == 0)
++ phi1 = (a1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++ else if (a1x - ix > 0)
++ phi1 = atan ((a1y - iy)/(a1x - ix));
++ else
++ phi1 = M_PI + atan ((a1y - iy)/(a1x - ix));
++
++ /* determine the second angle */
++ if (c1x - ix == 0)
++ phi2 = (c1y - iy > 0) ? M_PI_2 : 3*M_PI_2;
++ else if (c1x - ix > 0)
++ phi2 = atan ((c1y - iy)/(c1x - ix));
++ else
++ phi2 = M_PI + atan ((c1y - iy)/(c1x - ix));
++
++ /* compute the difference between phi2 and phi1 mod 2pi */
++ d = phi2 - phi1;
++ while (d < 0)
++ d += 2*M_PI;
++ while (d > 2*M_PI)
++ d -= 2*M_PI;
++
++ cairo_line_to (cr, a1x, a1y);
++
++ /* pick the short arc from phi1 to phi2 */
++ if (d < M_PI)
++ cairo_arc (cr, ix, iy, radius, phi1, phi2);
++ else
++ cairo_arc_negative (cr, ix, iy, radius, phi1, phi2);
++
++ cairo_line_to (cr, cx, cy);
++}
++
++static void
++draw (cairo_t *cr,
++ gint width,
++ gint height)
++{
++ gdouble x0 = 100;
++ gdouble y0 = 100;
++ gdouble x1 = 200;
++ gdouble y1 = 100;
++ gdouble x2 = 180;
++ gdouble y2 = 200;
++ gdouble x3 = 240;
++ gdouble y3 = 190;
++
++ gdouble radius = 20;
++
++ cairo_move_to (cr, x0, y0);
++
++ rounded_corner (cr, x1, y1, (x1+x2)/2, (y1+y2)/2, radius);
++ rounded_corner (cr, x2, y2, x3, y3, radius);
++
++ cairo_stroke (cr);
++}
++
++static void
++rounded_polygon (cairo_t *cr,
++ gboolean filled,
++ gdouble radius,
++ GdkPoint *points,
++ gint num_points)
++{
++ gint i, j;
++
++ cairo_move_to (cr,
++ (gdouble)(points[num_points - 1].x + points[0].x)/2,
++ (gdouble)(points[num_points - 1].y + points[0].y)/2);
++
++ for (i = 0; i < num_points; i++)
++ {
++ j = (i + 1) % num_points;
++ rounded_corner (cr, (gdouble)points[i].x, (gdouble)points[i].y,
++ (gdouble)(points[i].x + points[j].x)/2,
++ (gdouble)(points[i].y + points[j].y)/2,
++ radius);
++ };
++ cairo_close_path (cr);
++
++ if (filled)
++ cairo_fill (cr);
++ else
++ cairo_stroke (cr);
++}
++
+ static void
+ draw_polygon (
+ KeyboardDrawing * drawing,
+@@ -83,10 +296,11 @@
+ gint xkb_x,
+ gint xkb_y,
+ XkbPointRec * xkb_points,
+- guint num_points)
++ guint num_points,
++ gdouble radius)
+ {
+ GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+- GdkGC *gc;
++ cairo_t *cr;
+ GdkPoint *points;
+ gboolean filled;
+ gint i;
+@@ -95,17 +309,16 @@
+ return;
+
+ if (fill_color)
+- {
+- gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
+- gdk_gc_set_rgb_fg_color (gc, fill_color);
+- filled = TRUE;
+- }
++ filled = TRUE;
+ else
+ {
+- gc = GTK_WIDGET (drawing)->style->dark_gc[state];
++ fill_color = >K_WIDGET (drawing)->style->dark[state];
+ filled = FALSE;
+ }
+
++ cr = gdk_cairo_create (GDK_DRAWABLE (drawing->pixmap));
++ gdk_cairo_set_source_color (cr, fill_color);
++
+ points = g_new (GdkPoint, num_points);
+
+ for (i = 0; i < num_points; i++)
+@@ -114,11 +327,64 @@
+ points[i].y = xkb_to_pixmap_coord (drawing, xkb_y + xkb_points[i].y);
+ }
+
+- gdk_draw_polygon (drawing->pixmap, gc, filled, points, num_points);
++ rounded_polygon (cr, filled, radius, points, num_points);
+
+ g_free (points);
+- if (fill_color)
+- g_object_unref (gc);
++}
++
+static void
+curve_rectangle (cairo_t *cr,
+ gdouble x0,
@@ -57,12 +322,10 @@
+ cairo_stroke (cr);
+
+ cairo_destroy (cr);
-+}
-+
+ }
+
/* x, y, width, height are in the xkb coordinate system */
- static void
- draw_rectangle (
-@@ -130,7 +185,8 @@
+@@ -130,7 +396,8 @@
gint xkb_x,
gint xkb_y,
gint xkb_width,
@@ -72,7 +335,7 @@
{
if (drawing->pixmap == NULL)
return;
-@@ -140,17 +196,12 @@
+@@ -140,17 +407,12 @@
GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
gint x, y, width, height;
gboolean filled;
@@ -92,7 +355,7 @@
filled = FALSE;
}
-@@ -159,10 +210,8 @@
+@@ -159,10 +421,8 @@
width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
@@ -105,7 +368,16 @@
}
else
{
-@@ -203,7 +252,8 @@
+@@ -182,7 +442,7 @@
+ points[3].x = x; points[3].y = y;
+
+ /* the points we've calculated are relative to 0,0 */
+- draw_polygon (drawing, fill_color, 0, 0, points, 4);
++ draw_polygon (drawing, fill_color, 0, 0, points, 4, radius);
+ }
+ }
+
+@@ -203,7 +463,8 @@
{
if (color)
draw_rectangle (drawing, color, angle, origin_x, origin_y,
@@ -115,7 +387,7 @@
#ifdef KBDRAW_DEBUG
printf("points:%p\n", outline->points);
-@@ -211,7 +261,8 @@
+@@ -211,7 +472,8 @@
#endif
draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
@@ -125,18 +397,31 @@
}
else if (outline->num_points == 2)
{
-@@ -223,10 +274,12 @@
+@@ -223,19 +485,23 @@
angle, &rotated_x0, &rotated_y0);
if (color)
draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
- outline->points[1].x, outline->points[1].y);
-+ outline->points[1].x, outline->points[1].y,
++ outline->points[1].x - outline->points[0].x,
++ outline->points[1].y - outline->points[0].y,
+ outline->corner_radius);
draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
- outline->points[1].x, outline->points[1].y);
-+ outline->points[1].x, outline->points[1].y,
++ outline->points[1].x - outline->points[0].x,
++ outline->points[1].y - outline->points[0].y,
+ outline->corner_radius);
}
else
{
+ if (color)
+ draw_polygon (drawing, color, origin_x, origin_y, outline->points,
+- outline->num_points);
++ outline->num_points, outline->corner_radius);
+
+ draw_polygon (drawing, NULL, origin_x, origin_y, outline->points,
+- outline->num_points);
++ outline->num_points, outline->corner_radius);
+ }
+ }
+
commit f207e289867f14a8e0c997c3dd6a64e8c9e5f6c3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 25 03:20:15 2006 +0000
add bug refs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c15ffe9..a1635b6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -44,10 +44,15 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352776
Patch15: keyboard-drawing-focus.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352777
Patch16: keyboard-drawing-rotated-text.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352778
Patch17: keyboard-drawing-label-color.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352779
Patch18: keyboard-drawing-primary.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=352781
Patch19: keyboard-drawing-corner.patch
URL: http://www.gnome.org/
commit 277a1c33823869856613f31db93a71829d13043a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 25 03:00:18 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a8d9414..c15ffe9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -91,6 +91,7 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
+BuildRequires: perl-XML-Parser
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit fa969513774fbea0d1cc79590084235ac1ed1db7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 25 02:51:35 2006 +0000
improve keyboard drawing
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 86c086e..a8d9414 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,7 +32,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -44,6 +44,12 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
+Patch15: keyboard-drawing-focus.patch
+Patch16: keyboard-drawing-rotated-text.patch
+Patch17: keyboard-drawing-label-color.patch
+Patch18: keyboard-drawing-primary.patch
+Patch19: keyboard-drawing-corner.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -122,6 +128,13 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch11 -p1 -b .dont-require-display
+%patch15 -p1 -b .focus
+%patch16 -p1 -b .rotated-text
+%patch17 -p1 -b .label-color
+%patch18 -p1 -b .primary
+%patch19 -p1 -b .corner
+
+
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
# We don't ship gnome-system-tools
@@ -288,6 +301,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Aug 24 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-2.fc6
+- Various improvements for the keyboard applet
+
* Tue Aug 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-1.fc6
- Update to 2.15.90
- Drop upstreamed patches
diff --git a/keyboard-drawing-corner.patch b/keyboard-drawing-corner.patch
new file mode 100644
index 0000000..9dde14d
--- /dev/null
+++ b/keyboard-drawing-corner.patch
@@ -0,0 +1,142 @@
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.corner 2006-08-24 22:08:59.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:13:07.000000000 -0400
+@@ -121,6 +121,61 @@
+ g_object_unref (gc);
+ }
+
++static void
++curve_rectangle (cairo_t *cr,
++ gdouble x0,
++ gdouble y0,
++ gdouble width,
++ gdouble height,
++ gdouble radius)
++{
++ gdouble x1, y1;
++
++ if (!width || !height)
++ return;
++
++ x1 = x0 + width;
++ y1 = y0 + height;
++
++ radius = MIN(radius, MIN(width / 2, height / 2));
++
++ cairo_move_to (cr, x0, y0 + radius);
++ cairo_arc (cr, x0 + radius, y0 + radius, radius, M_PI, 3*M_PI/2);
++ cairo_line_to (cr, x1 - radius, y0);
++ cairo_arc (cr, x1 - radius, y0 + radius, radius, 3*M_PI/2, 2*M_PI);
++ cairo_line_to (cr, x1, y1 - radius);
++ cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, M_PI/2);
++ cairo_line_to (cr, x0 + radius, y1);
++ cairo_arc (cr, x0 + radius, y1 - radius, radius, M_PI/2, M_PI);
++
++ cairo_close_path (cr);
++}
++
++static void
++draw_curve_rectangle (GdkPixmap *pixmap,
++ gboolean filled,
++ GdkColor *fill_color,
++ gint x,
++ gint y,
++ gint width,
++ gint height,
++ gint radius)
++{
++ cairo_t *cr;
++
++ cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
++ curve_rectangle (cr, x, y, width, height, radius);
++
++ gdk_cairo_set_source_color (cr, fill_color);
++
++ if (filled)
++ cairo_fill (cr);
++ else
++ cairo_stroke (cr);
++
++ cairo_destroy (cr);
++}
++
+ /* x, y, width, height are in the xkb coordinate system */
+ static void
+ draw_rectangle (
+@@ -130,7 +185,8 @@
+ gint xkb_x,
+ gint xkb_y,
+ gint xkb_width,
+- gint xkb_height)
++ gint xkb_height,
++ gint radius)
+ {
+ if (drawing->pixmap == NULL)
+ return;
+@@ -140,17 +196,12 @@
+ GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+ gint x, y, width, height;
+ gboolean filled;
+- GdkGC *gc;
+
+ if (fill_color)
+- {
+- gc = gdk_gc_new (GTK_WIDGET (drawing)->window);
+- gdk_gc_set_rgb_fg_color (gc, fill_color);
+- filled = TRUE;
+- }
++ filled = TRUE;
+ else
+ {
+- gc = GTK_WIDGET (drawing)->style->dark_gc[state];
++ fill_color = >K_WIDGET (drawing)->style->dark[state];
+ filled = FALSE;
+ }
+
+@@ -159,10 +210,8 @@
+ width = xkb_to_pixmap_coord (drawing, xkb_x + xkb_width) - x;
+ height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y;
+
+- gdk_draw_rectangle (drawing->pixmap, gc, filled, x, y, width, height);
+-
+- if (fill_color)
+- g_object_unref (gc);
++ draw_curve_rectangle (drawing->pixmap, filled, fill_color,
++ x, y, width, height, radius);
+ }
+ else
+ {
+@@ -203,7 +252,8 @@
+ {
+ if (color)
+ draw_rectangle (drawing, color, angle, origin_x, origin_y,
+- outline->points[0].x, outline->points[0].y);
++ outline->points[0].x, outline->points[0].y,
++ outline->corner_radius);
+
+ #ifdef KBDRAW_DEBUG
+ printf("points:%p\n", outline->points);
+@@ -211,7 +261,8 @@
+ #endif
+
+ draw_rectangle (drawing, NULL, angle, origin_x, origin_y,
+- outline->points[0].x, outline->points[0].y);
++ outline->points[0].x, outline->points[0].y,
++ outline->corner_radius);
+ }
+ else if (outline->num_points == 2)
+ {
+@@ -223,10 +274,12 @@
+ angle, &rotated_x0, &rotated_y0);
+ if (color)
+ draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0,
+- outline->points[1].x, outline->points[1].y);
++ outline->points[1].x, outline->points[1].y,
++ outline->corner_radius);
+
+ draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0,
+- outline->points[1].x, outline->points[1].y);
++ outline->points[1].x, outline->points[1].y,
++ outline->corner_radius);
+ }
+ else
+ {
diff --git a/keyboard-drawing-label-color.patch b/keyboard-drawing-label-color.patch
new file mode 100644
index 0000000..0eabfee
--- /dev/null
+++ b/keyboard-drawing-label-color.patch
@@ -0,0 +1,25 @@
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.label-color 2006-08-24 22:01:50.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:02:40.000000000 -0400
+@@ -541,6 +541,9 @@
+ PangoLayout * layout)
+ {
+ GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
++ GdkColor *color;
++
++ color = drawing->colors + (drawing->xkb->geom->label_color - drawing->xkb->geom->colors);
+
+ if (drawing->pixmap == NULL)
+ return;
+@@ -554,9 +557,9 @@
+ drawing->angle = angle;
+ }
+
+- gdk_draw_layout (drawing->pixmap,
+- GTK_WIDGET (drawing)->style->text_gc[state], x, y,
+- drawing->layout);
++ gdk_draw_layout_with_colors (drawing->pixmap,
++ GTK_WIDGET (drawing)->style->text_gc[state], x, y,
++ drawing->layout, color, NULL);
+ }
+
+ static void
diff --git a/keyboard-drawing-primary.patch b/keyboard-drawing-primary.patch
new file mode 100644
index 0000000..ecec1c8
--- /dev/null
+++ b/keyboard-drawing-primary.patch
@@ -0,0 +1,54 @@
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.primary 2006-08-24 22:04:09.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:07:38.000000000 -0400
+@@ -719,9 +719,22 @@
+ printf ("outlines: %p(%d)\n", shape->outlines, shape->num_outlines);
+ #endif
+
+- for (i = 0; i < 1 /* shape->num_outlines */ ; i++)
+- draw_outline (drawing, shape->outlines + i, color, key->angle,
+- key->origin_x, key->origin_y);
++ /* draw the primary outline */
++ draw_outline (drawing, shape->primary ? shape->primary : shape->outlines,
++ color, key->angle, key->origin_x, key->origin_y);
++#if 0
++ /* don't draw other outlines for now, since
++ * the text placement does not take them into account
++ */
++ for (i = 0; i < shape->num_outlines; i++)
++ {
++ if (shape->outlines + i == shape->approx ||
++ shape->outlines + i == shape->primary)
++ continue;
++ draw_outline (drawing, shape->outlines + i, NULL,
++ key->angle, key->origin_x, key->origin_y);
++ }
++#endif
+
+ draw_key_label (drawing, key->keycode, key->angle, key->origin_x,
+ key->origin_y, shape->bounds.x2, shape->bounds.y2);
+@@ -850,10 +863,22 @@
+ shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx;
+ color = drawing->colors + shape_doodad->color_ndx;
+
++ /* draw the primary outline filled */
++ draw_outline (drawing, shape->primary ? shape->primary : shape->outlines,
++ color, doodad->angle,
++ doodad->origin_x + shape_doodad->left,
++ doodad->origin_y + shape_doodad->top);
++
++ /* stroke the other outlines */
+ for (i = 0; i < shape->num_outlines; i++)
+- draw_outline (drawing, shape->outlines + i, color, doodad->angle,
+- doodad->origin_x + shape_doodad->left,
+- doodad->origin_y + shape_doodad->top);
++ {
++ if (shape->outlines + i == shape->approx ||
++ shape->outlines + i == shape->primary)
++ continue;
++ draw_outline (drawing, shape->outlines + i, NULL, doodad->angle,
++ doodad->origin_x + shape_doodad->left,
++ doodad->origin_y + shape_doodad->top);
++ }
+ }
+
+ static void
diff --git a/keyboard-drawing-rotated-text.patch b/keyboard-drawing-rotated-text.patch
new file mode 100644
index 0000000..0676458
--- /dev/null
+++ b/keyboard-drawing-rotated-text.patch
@@ -0,0 +1,54 @@
+--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.rotated-text 2006-08-24 21:59:45.000000000 -0400
++++ control-center-2.15.92/libkbdraw/keyboard-drawing.c 2006-08-24 22:01:21.000000000 -0400
+@@ -541,9 +541,6 @@
+ PangoLayout * layout)
+ {
+ GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+- PangoLayoutLine *line;
+- gint x_off, y_off;
+- gint i;
+
+ if (drawing->pixmap == NULL)
+ return;
+@@ -557,41 +554,6 @@
+ drawing->angle = angle;
+ }
+
+- i = 0;
+- y_off = 0;
+- for (line = pango_layout_get_line (drawing->layout, i);
+- line != NULL; line = pango_layout_get_line (drawing->layout, ++i))
+- {
+- GSList *runp;
+- PangoRectangle line_extents;
+-
+- x_off = 0;
+-
+- for (runp = line->runs; runp != NULL; runp = runp->next)
+- {
+- PangoGlyphItem *run = runp->data;
+- gint j;
+-
+- for (j = 0; j < run->glyphs->num_glyphs; j++)
+- {
+- PangoGlyphGeometry *geometry;
+- gint xx, yy;
+-
+- geometry = &run->glyphs->glyphs[j].geometry;
+-
+- rotate_coordinate (0, 0, x_off, y_off, angle, &xx, &yy);
+- geometry->x_offset -= x_off - xx;
+- geometry->y_offset -= y_off - yy;
+-
+- x_off += geometry->width;
+- }
+- }
+-
+- pango_layout_line_get_extents (line, NULL, &line_extents);
+- y_off +=
+- line_extents.height + pango_layout_get_spacing (drawing->layout);
+- }
+-
+ gdk_draw_layout (drawing->pixmap,
+ GTK_WIDGET (drawing)->style->text_gc[state], x, y,
+ drawing->layout);
commit cf6b16d61a18392dbd129b335599277744fccaf8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Aug 23 07:10:02 2006 +0000
fix typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f8cf4b7..86c086e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -137,7 +137,7 @@ autoreconf
%configure \
--enable-suid=no \
%if %{build_stickynotes}
- --enable-sticky-notes \
+ --enable-stickynotes \
%endif
--disable-scrollkeeper \
--enable-mini-commander
commit 3900ce34e1149fb6430dd45cad64452d0f289ebe
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Aug 23 02:07:33 2006 +0000
2.15.90
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 079e595..f8cf4b7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,7 +27,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define build_stickynotes 0
+%define build_stickynotes 1
Summary: Small applications for the GNOME panel
Name: gnome-applets
@@ -136,6 +136,9 @@ autoconf
autoreconf
%configure \
--enable-suid=no \
+%if %{build_stickynotes}
+ --enable-sticky-notes \
+%endif
--disable-scrollkeeper \
--enable-mini-commander
make
@@ -290,11 +293,6 @@ fi
- Drop upstreamed patches
- Add a %%preun script
- Require pkgconfig
-- Drop sticky-notes in favour of tomboy
- *** docs ***: Tomboy supports importing sticky notes. Currently
- that requires a manual step by the user. This should be pointed
- out in the release notes (unless we can convince upstream to make
- this automatic)
* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-2.fc6
- Make the invest applet work
commit bec09f4fc2694b7722f96bce9094a9577cc7f7ea
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 22 15:55:12 2006 +0000
2.15.90
diff --git a/.cvsignore b/.cvsignore
index 0dd7af2..2c7013f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ gnome-applets-2.14.2.tar.bz2
gnome-applets-2.15.1.1.tar.bz2
gnome-applets-2.15.2.tar.bz2
gnome-applets-2.15.3.tar.bz2
+gnome-applets-2.15.90.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f499747..079e595 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,10 +27,12 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define build_stickynotes 0
+
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.15.3
-Release: 2%{?dist}
+Version: 2.15.90
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -40,12 +42,7 @@ Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
-Patch10: gnome-applets-2.15.1.1-invest.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=351956
-Patch14: gnome-applets-2.15.3-invest-gconf.patch
URL: http://www.gnome.org/
@@ -109,6 +106,8 @@ Requires: gnome-python2-libegg
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
+# since we are installing .pc files
+Requires: pkgconfig
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -121,10 +120,7 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
-%patch13 -p1 -b .destroy-on-close
-%patch14 -p1 -b .invest-gconf
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -186,7 +182,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/battstat.schemas \
%{_sysconfdir}/gconf/schemas/charpick.schemas \
@@ -199,10 +194,33 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
%{_sysconfdir}/gconf/schemas/mixer.schemas \
%{_sysconfdir}/gconf/schemas/modemlights.schemas \
- %{_sysconfdir}/gconf/schemas/multiload.schemas \
- %{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
+%if %{build_stickynotes}
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas \
+%endif
+ %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+fi
+
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
@@ -215,7 +233,12 @@ fi
%doc AUTHORS COPYING ChangeLog NEWS README
%{_datadir}/pixmaps
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome
%{_datadir}/gnome-applets
@@ -241,7 +264,11 @@ fi
%{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
+
+%if %{build_stickynotes}
%{_libexecdir}/stickynotes_applet
+%endif
+
%{_libexecdir}/trashapplet
%{_libexecdir}/invest-applet
%{_sbindir}/*
@@ -258,6 +285,17 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Aug 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.90-1.fc6
+- Update to 2.15.90
+- Drop upstreamed patches
+- Add a %%preun script
+- Require pkgconfig
+- Drop sticky-notes in favour of tomboy
+ *** docs ***: Tomboy supports importing sticky notes. Currently
+ that requires a manual step by the user. This should be pointed
+ out in the release notes (unless we can convince upstream to make
+ this automatic)
+
* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-2.fc6
- Make the invest applet work
diff --git a/sources b/sources
index b2aed18..e4072e1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-f7693a0780fe4b288c62c25d410395a9 gnome-applets-2.15.2.tar.bz2
-88814125b056b32d7d34b8ac75cfbf7e gnome-applets-2.15.3.tar.bz2
+421eda161541b42d42ea04c59b9ee4f1 gnome-applets-2.15.90.tar.bz2
commit b4afa677fb5f33871b1d44c281f2e2a8e44dc323
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 18 17:36:57 2006 +0000
add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f01925b..f499747 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -44,7 +44,7 @@ Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch
-#
+# http://bugzilla.gnome.org/show_bug.cgi?id=351956
Patch14: gnome-applets-2.15.3-invest-gconf.patch
URL: http://www.gnome.org/
commit 90e131a196e9bbb048b916fdf91bafb3ca34ed05
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 18 17:34:24 2006 +0000
fix invest applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cc4d5c6..f01925b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -44,6 +44,8 @@ Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch
+#
+Patch14: gnome-applets-2.15.3-invest-gconf.patch
URL: http://www.gnome.org/
@@ -122,6 +124,7 @@ small utilities for the GNOME panel.
%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
%patch13 -p1 -b .destroy-on-close
+%patch14 -p1 -b .invest-gconf
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -255,6 +258,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-2.fc6
+- Make the invest applet work
+
* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-1.fc6
- Update to 2.15.3
commit 1ebbdbcea897f627a92932dc1778b017b9ad75b7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Aug 13 04:41:16 2006 +0000
2.15.3
diff --git a/.cvsignore b/.cvsignore
index 65dd98c..0dd7af2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ gnome-applets-2.14.1.tar.bz2
gnome-applets-2.14.2.tar.bz2
gnome-applets-2.15.1.1.tar.bz2
gnome-applets-2.15.2.tar.bz2
+gnome-applets-2.15.3.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f2f4016..cc4d5c6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,8 +29,8 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.15.2
-Release: 4%{?dist}
+Version: 2.15.3
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -43,7 +43,6 @@ Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
-Patch12: gnome-applets-2.15.2-multiload.patch
Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch
URL: http://www.gnome.org/
@@ -122,7 +121,6 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
-%patch12 -p1 -b .multiload
%patch13 -p1 -b .destroy-on-close
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -257,6 +255,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.3-1.fc6
+- Update to 2.15.3
+
* Tue Aug 8 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.2-4.fc6
- destroy about dialog on close (bug 197975)
diff --git a/sources b/sources
index 419a2d5..b2aed18 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
f7693a0780fe4b288c62c25d410395a9 gnome-applets-2.15.2.tar.bz2
+88814125b056b32d7d34b8ac75cfbf7e gnome-applets-2.15.3.tar.bz2
commit 3c302c0af1e15eec6c9bf22c419afefe61e6b368
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Aug 8 21:24:24 2006 +0000
- destroy about dialog on close (bug 197975)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 34de559..f2f4016 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -44,6 +44,7 @@ Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
Patch12: gnome-applets-2.15.2-multiload.patch
+Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch
URL: http://www.gnome.org/
@@ -122,6 +123,7 @@ small utilities for the GNOME panel.
%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
%patch12 -p1 -b .multiload
+%patch13 -p1 -b .destroy-on-close
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -255,6 +257,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Aug 8 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.2-4.fc6
+- destroy about dialog on close (bug 197975)
+
* Sat Aug 5 2006 Caolan McNamara <caolanm(a)redhat.com> - 1:2.15.2-3.fc6
- rebuild against new gucharmap
commit 85bf4e9c8a91b7975bdd67e743ea0ac6da562894
Author: Caolan McNamara <caolanm(a)fedoraproject.org>
Date: Sat Aug 5 16:49:47 2006 +0000
rebuild against new gucharmap
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0095cac..34de559 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -255,6 +255,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Aug 5 2006 Caolan McNamara <caolanm(a)redhat.com> - 1:2.15.2-3.fc6
+- rebuild against new gucharmap
+
* Fri Aug 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-2.fc6
- Fix the multiload schema
commit 6db76b86abcc286fe2a7a8baf7bf78d53f46a5f6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 4 05:34:54 2006 +0000
fix multiload schema
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dfc6175..0095cac 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -43,6 +43,7 @@ Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
+Patch12: gnome-applets-2.15.2-multiload.patch
URL: http://www.gnome.org/
@@ -120,6 +121,7 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
+%patch12 -p1 -b .multiload
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -253,6 +255,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Aug 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-2.fc6
+- Fix the multiload schema
+
* Thu Aug 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-1.fc6
- Update to 2.15.2
commit e6eab52a1e963688973fb7705dc8e691176242a0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 4 02:41:08 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cb58334..dfc6175 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -84,6 +84,7 @@ BuildRequires: gnome-doc-utils
BuildRequires: which
BuildRequires: libtool autoconf gettext
BuildRequires: pkgconfig
+BuildRequires: gnome-icon-theme
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit c42900cba38c94254a29d36528d668944e0c5f77
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 4 02:17:51 2006 +0000
2.15.90
diff --git a/.cvsignore b/.cvsignore
index d197c20..65dd98c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ gnome-applets-2.14.0.tar.bz2
gnome-applets-2.14.1.tar.bz2
gnome-applets-2.14.2.tar.bz2
gnome-applets-2.15.1.1.tar.bz2
+gnome-applets-2.15.2.tar.bz2
diff --git a/gnome-applets-2.15.2-use-old-modemlights.patch b/gnome-applets-2.15.2-use-old-modemlights.patch
new file mode 100644
index 0000000..5f9bc50
--- /dev/null
+++ b/gnome-applets-2.15.2-use-old-modemlights.patch
@@ -0,0 +1,20 @@
+--- gnome-applets-2.15.2/configure.in.use-old-modemlights 2006-07-26 11:36:14.000000000 -0400
++++ gnome-applets-2.15.2/configure.in 2006-08-03 19:31:07.000000000 -0400
+@@ -575,6 +575,7 @@
+ AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
+ AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
+ AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes)
++AM_CONDITIONAL(APPLET_MODEMLIGHTS, true)
+
+ dnl ***************************************************************************
+ dnl *** invest-applet specific checks ***
+@@ -697,6 +698,9 @@
+ drivemount/Makefile
+ drivemount/help/Makefile
+ modemlights/Makefile
++modemlights/docs/Makefile
++modemlights/docs/C/Makefile
++modemlights/docs/eu/Makefile
+ multiload/Makefile
+ multiload/docs/Makefile
+ gkb-new/Makefile
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ca85e37..cb58334 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,18 +29,17 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.15.1.1
-Release: 7%{?dist}
+Version: 2.15.2
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
-Patch0: gnome-applets-2.15.1.1-use-old-modemlights.patch
+Patch0: gnome-applets-2.15.2-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
-Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
Patch10: gnome-applets-2.15.1.1-invest.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
@@ -118,7 +117,6 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch9 -p1 -b .gswitchit-export-dynamic
%patch10 -p1 -b .invest
%patch11 -p1 -b .dont-require-display
@@ -140,6 +138,9 @@ autoreconf
--enable-mini-commander
make
+echo "NoDisplay=true" >> libgswitchit/gswitchit-plugins.desktop
+echo "NoDisplay=true" >> invest-applet/data/invest-chart.desktop
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -215,6 +216,7 @@ fi
%{_datadir}/xmodmap
%{_datadir}/omf/*
%{_datadir}/applications/gnome-invest-chart.desktop
+%{_datadir}/applications/gnome-gswitchit-plugins.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
@@ -250,6 +252,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Aug 3 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.2-1.fc6
+- Update to 2.15.2
+
* Wed Aug 2 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.1.1-7
- don't require a display to build invest applet (bug 200970).
Problem discovered by Nalin Dahyabhai <nalin(a)redhat.com>
diff --git a/sources b/sources
index 859f449..419a2d5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-d632538ac5a4ed880302be25dbdc0f69 gnome-applets-2.15.1.1.tar.bz2
+f7693a0780fe4b288c62c25d410395a9 gnome-applets-2.15.2.tar.bz2
commit 1843f5d8d8d4b18aa272765da53fd79b259190ba
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Aug 2 15:50:52 2006 +0000
- don't require a display to build invest applet (bug 200970). Problem
discovered by Nalin Dahyabhai <nalin(a)redhat.com>
diff --git a/gnome-applets-2.15.1.1-dont-require-display.patch b/gnome-applets-2.15.1.1-dont-require-display.patch
new file mode 100644
index 0000000..f6fcada
--- /dev/null
+++ b/gnome-applets-2.15.1.1-dont-require-display.patch
@@ -0,0 +1,14 @@
+--- gnome-applets-2.15.1.1/configure.in.dont-require-display 2006-08-02 11:43:36.000000000 -0400
++++ gnome-applets-2.15.1.1/configure.in 2006-08-02 11:44:55.000000000 -0400
+@@ -545,8 +545,9 @@ dnl *** invest-applet specific checks
+ dnl ***************************************************************************
+
+ if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
+- AM_CHECK_PYMOD(gnomeapplet,,
+- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++dnl AM_CHECK_PYMOD(gnomeapplet,,
++dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
++ BUILD_INVEST_APPLET="yes"
+ else
+ BUILD_INVEST_APPLET="no"
+ fi
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4c2a989..ca85e37 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 6
+Release: 7%{?dist}
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -42,6 +42,8 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
Patch10: gnome-applets-2.15.1.1-invest.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970
+Patch11: gnome-applets-2.15.1.1-dont-require-display.patch
URL: http://www.gnome.org/
@@ -118,6 +120,7 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch9 -p1 -b .gswitchit-export-dynamic
%patch10 -p1 -b .invest
+%patch11 -p1 -b .dont-require-display
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -247,6 +250,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Aug 2 2006 Ray Strode <rstrode(a)redhat.com> - 1:2.15.1.1-7
+- don't require a display to build invest applet (bug 200970).
+ Problem discovered by Nalin Dahyabhai <nalin(a)redhat.com>
+
* Sat Jul 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-6
- Require gnome-python2-libegg for invest applet (#200640)
commit 666243e22ba8a7d0d1169887569c8bdcd39e9e9a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 29 18:34:53 2006 +0000
fix requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6f02e38..4c2a989 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -99,6 +99,7 @@ Source11: cpufreq-selector.pam
# For invest-applet
Requires: gnome-python2-applet
+Requires: gnome-python2-libegg
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -246,6 +247,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Jul 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-6
+- Require gnome-python2-libegg for invest applet (#200640)
+
* Wed Jul 19 2006 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.15.1.1-5
- Add BR for dbus-glib-devel
commit 46bcb77c503508ef1deba25996387fa8e9bde028
Author: John (J5) Palmieri <johnp(a)fedoraproject.org>
Date: Wed Jul 19 18:56:04 2006 +0000
- Added BR for dbus-glib-devel
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0288998..6f02e38 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,7 +15,8 @@
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.11.1
%define gnome_utils_version 2.8.1
-%define dbus_version 0.60
+%define dbus_version 0.90
+%define dbus_glib_verion 0.70
%define hal_version 0.5.3
%define libnotify_version 0.3.2
%define pygobject_version 2.6
@@ -29,7 +30,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -76,6 +77,7 @@ BuildRequires: gnome-python2-applet
BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
BuildRequires: which
@@ -244,6 +246,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.15.1.1-5
+- Add BR for dbus-glib-devel
+
* Wed Jul 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-4
- Rebuild against dbus
commit 7f8dbe239eca4e585b8336ef2c0645e4ea866300
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 19 17:33:03 2006 +0000
rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 645cc8c..0288998 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,7 +29,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 3.1
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -244,6 +244,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-4
+- Rebuild against dbus
+
* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.15.1.1-3.1
- rebuild
commit 28f095b2240e2dc1b480277cb315ed722401464a
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Jul 12 05:58:21 2006 +0000
bumped for rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c643e6c..645cc8c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,7 +29,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 3
+Release: 3.1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -244,6 +244,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.15.1.1-3.1
+- rebuild
+
* Fri Jul 7 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-3
- Try to make the invest applet actually work
commit 92b02597b2958292d5d2d1613f89dfb0acaa0e93
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Jul 7 18:17:33 2006 +0000
fix invest
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b333798..c643e6c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -29,7 +29,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -40,6 +40,7 @@ Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
+Patch10: gnome-applets-2.15.1.1-invest.patch
URL: http://www.gnome.org/
@@ -94,6 +95,9 @@ Requires: usermode
Source10: cpufreq-selector.app
Source11: cpufreq-selector.pam
+# For invest-applet
+Requires: gnome-python2-applet
+
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -110,6 +114,7 @@ small utilities for the GNOME panel.
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
%patch9 -p1 -b .gswitchit-export-dynamic
+%patch10 -p1 -b .invest
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -239,6 +244,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Jul 7 2006 Matthias Clasen <mclasen(a)redhat.com> - 1:2.15.1.1-3
+- Try to make the invest applet actually work
+
* Thu Jun 22 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.15.1.1-2
- fix invest applet location
commit c9fb762f39a2e4665c39bd8e9de72039d739229f
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Jun 22 19:15:23 2006 +0000
- fix invest applet location
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e8ed055..b333798 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -24,10 +24,12 @@
%define po_package gnome-applets-2.0
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.15.1.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -204,7 +206,7 @@ fi
%{_datadir}/applications/gnome-invest-chart.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
-%{_libdir}/python2.4/site-packages/invest/
+%{python_sitelib}/invest/
%{_libdir}/libgweather.so*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/battstat-applet-2
@@ -237,6 +239,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Jun 22 2006 Jeremy Katz <katzj(a)redhat.com> - 1:2.15.1.1-2
+- fix invest applet location
+
* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.1.1-1
- Update to 2.15.1.1
commit fe6a41eb0475e3ea2316c413e403a9cc5e83a528
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 22 02:35:13 2006 +0000
blargh
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e2fb6e..e8ed055 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -204,7 +204,7 @@ fi
%{_datadir}/applications/gnome-invest-chart.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
-#%{_libdir}/python2.4/site-packages/invest/
+%{_libdir}/python2.4/site-packages/invest/
%{_libdir}/libgweather.so*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/battstat-applet-2
commit 15efc5c020c22b57770aa9e5dc24c65afd90cf73
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 22 01:59:07 2006 +0000
blargh
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 93d49dd..3e2fb6e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -201,10 +201,10 @@ fi
%{_datadir}/gnome-applets
%{_datadir}/xmodmap
%{_datadir}/omf/*
-%{_datadir}/applications/invest-chart.desktop
+%{_datadir}/applications/gnome-invest-chart.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
-%{_libdir}/python2.4/site-packages/invest/
+#%{_libdir}/python2.4/site-packages/invest/
%{_libdir}/libgweather.so*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/battstat-applet-2
commit 9d991960992b8e5694c8770bcc372f6d4638f630
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 22 00:14:12 2006 +0000
more file list fixing
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0a57450..93d49dd 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -141,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
+desktop-file-install --vendor gnome --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-only-show-in GNOME \
+ $RPM_BUILD_ROOT%{_datadir}/applications/*
# usermode-ify cpufreq-selector
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -170,7 +174,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
%{_sysconfdir}/gconf/schemas/gswitchit.schemas \
- %{_sysconfdir}/gconf/schemas/gtik.schemas \
%{_sysconfdir}/gconf/schemas/gweather.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
%{_sysconfdir}/gconf/schemas/mini-commander.schemas \
@@ -198,8 +201,10 @@ fi
%{_datadir}/gnome-applets
%{_datadir}/xmodmap
%{_datadir}/omf/*
+%{_datadir}/applications/invest-chart.desktop
%{_bindir}/*
%{_libdir}/bonobo/servers/*
+%{_libdir}/python2.4/site-packages/invest/
%{_libdir}/libgweather.so*
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/battstat-applet-2
@@ -207,8 +212,7 @@ fi
%{_libexecdir}/cpufreq-applet
%{_libexecdir}/drivemount_applet2
%{_libexecdir}/geyes_applet2
-%{_libexecdir}/gnome-applets
-%{_libexecdir}/gnome-applets/mc-install-default-macros
+%{_libexecdir}/gnome-applets/
%{_libexecdir}/gnome-keyboard-applet
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
commit 7741ba9556bf847aea7cc3d828202f4b0e62297e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 21 19:03:58 2006 +0000
fix file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0241cdc..0a57450 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -218,7 +218,7 @@ fi
%{_libexecdir}/null_applet
%{_libexecdir}/stickynotes_applet
%{_libexecdir}/trashapplet
-%{_libexecdir}/investapplet
+%{_libexecdir}/invest-applet
%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
commit a934a1dcb916fea31e63ee9daecc8ece1ee4056a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 21 18:44:08 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 956b26f..0241cdc 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -69,7 +69,7 @@ BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
-BuildRequires: gnome-python2-desktop
+BuildRequires: gnome-python2-applet
BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
commit 40cf95d12ed96eaf0440859df62b66f562d60399
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 21 18:41:51 2006 +0000
fix file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 094469f..956b26f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -210,7 +210,6 @@ fi
%{_libexecdir}/gnome-applets
%{_libexecdir}/gnome-applets/mc-install-default-macros
%{_libexecdir}/gnome-keyboard-applet
-%{_libexecdir}/gtik2_applet2
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
%{_libexecdir}/mixer_applet2
@@ -219,6 +218,7 @@ fi
%{_libexecdir}/null_applet
%{_libexecdir}/stickynotes_applet
%{_libexecdir}/trashapplet
+%{_libexecdir}/investapplet
%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
commit d3697911bcdd8771739c68a3dbf9aea7d440c29b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 21 17:18:14 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c2ea4a7..094469f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -69,6 +69,7 @@ BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
+BuildRequires: gnome-python2-desktop
BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
commit 21ae6545926c65583f84e3a19b870593e88dda94
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 21 15:37:20 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e47cefb..c2ea4a7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,6 +19,7 @@
%define hal_version 0.5.3
%define libnotify_version 0.3.2
%define pygobject_version 2.6
+%define pygtk_version 2.6
%define gnome_python_version 2.10
%define po_package gnome-applets-2.0
@@ -66,7 +67,9 @@ BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
+BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
+BuildRequires: gucharmap-devel
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: xorg-x11-proto-devel
commit 3d45eb3674505d267f5657b45ad4f6374464e111
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 20 20:46:31 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ec7bea1..e47cefb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -65,7 +65,7 @@ BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: pygobject >= %{pygobject_version}
+BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: gnome-python2 >= %{gnome_python_version}
BuildRequires: dbus-devel >= %{dbus_version}
commit dbf686714714102eaf3aa2d9c65782e67a02441e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 20 19:49:26 2006 +0000
fix build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9a75da8..ec7bea1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -65,8 +65,8 @@ BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: pygobject-devel >= %{pygobject_version}
-BuildRequires: gnome-python2-devel >= %{gnome_python_version}
+BuildRequires: pygobject >= %{pygobject_version}
+BuildRequires: gnome-python2 >= %{gnome_python_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: xorg-x11-proto-devel
commit 913e7713d82adf237b85fb67c51f2172f9422296
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jun 19 12:47:14 2006 +0000
2.15.1.1
diff --git a/.cvsignore b/.cvsignore
index 6f9e02c..d197c20 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.14.0.tar.bz2
gnome-applets-2.14.1.tar.bz2
gnome-applets-2.14.2.tar.bz2
+gnome-applets-2.15.1.1.tar.bz2
diff --git a/gnome-applets-2.15.1.1-cpufreq.patch b/gnome-applets-2.15.1.1-cpufreq.patch
new file mode 100644
index 0000000..1b83f5c
--- /dev/null
+++ b/gnome-applets-2.15.1.1-cpufreq.patch
@@ -0,0 +1,34 @@
+--- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c.cpufreq 2006-06-19 08:40:36.000000000 -0400
++++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-utils.c 2006-06-19 08:40:47.000000000 -0400
+@@ -105,6 +105,8 @@
+ if (!path)
+ return FALSE;
+
++ return TRUE;
++
+ if (geteuid () == 0)
+ return TRUE;
+
+--- gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c.cpufreq 2006-06-15 01:01:54.000000000 -0400
++++ gnome-applets-2.15.1.1/cpufreq/src/cpufreq-popup.c 2006-06-19 08:43:05.000000000 -0400
+@@ -246,19 +246,13 @@
+ cpufreq_popup_run_selector (CPUFreqPopup *popup,
+ const gchar *params)
+ {
+- gchar *path;
+ guint cpu;
+ gchar *command;
+ GError *error = NULL;
+
+- path = g_find_program_in_path ("cpufreq-selector");
+-
+- if (!path)
+- return;
+-
+ cpu = cpufreq_prefs_get_cpu (popup->priv->prefs);
+
+- command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
++ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
+
+ g_spawn_command_line_async (command, &error);
+ g_free (command);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9da9111..9a75da8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,8 +1,11 @@
-%define glib2_version 2.2.0
+%define glib2_version 2.6.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
-%define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.5.91
+%define libgnome_version 2.8.0
+%define libgnomeui_version 2.8.0
+%define gnome_vfs_version 2.8.0
+%define libglade_version 2.4.0
+%define gnome_panel_version 2.13.4
%define libgtop2_version 2.12.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
@@ -10,29 +13,29 @@
%define gstreamer_version 0.10
%define libxklavier_version 2.91
%define libwnck_version 2.9.3
-%define libgnome_desktop_version 2.10.2
+%define libgnome_desktop_version 2.11.1
%define gnome_utils_version 2.8.1
%define dbus_version 0.60
%define hal_version 0.5.3
%define libnotify_version 0.3.2
+%define pygobject_version 2.6
+%define gnome_python_version 2.10
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.14.2
-Release: 5
+Version: 2.15.1.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
-Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
+Patch0: gnome-applets-2.15.1.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.14.2-cpufreq.patch
-Patch5: gnome-applets-2.13.4-warning.patch
-Patch6: gnome-applets-2.13.90-stock-ticker.patch
+Patch4: gnome-applets-2.15.1.1-cpufreq.patch
Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
URL: http://www.gnome.org/
@@ -44,7 +47,10 @@ Prereq: gtk2 >= %{gtk2_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version}
BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
+BuildRequires: libglade2-devel >= %{libglade_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
@@ -59,6 +65,8 @@ BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
+BuildRequires: pygobject-devel >= %{pygobject_version}
+BuildRequires: gnome-python2-devel >= %{gnome_python_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: xorg-x11-proto-devel
@@ -95,8 +103,6 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .warning
-%patch6 -p1 -b .stock-ticker
%patch9 -p1 -b .gswitchit-export-dynamic
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -223,6 +229,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.1.1-1
+- Update to 2.15.1.1
+
* Thu Jun 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
- Rebuild against new libxklavier
diff --git a/sources b/sources
index e2f8d2a..859f449 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-e6da539e78da1256b9a9bee1301fd44f gnome-applets-2.14.2.tar.bz2
+d632538ac5a4ed880302be25dbdc0f69 gnome-applets-2.15.1.1.tar.bz2
commit 101abe48f5b43bc4820b96ef4fa8b5dac5be6af9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 15 15:48:12 2006 +0000
rebuild against new libxklavier
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dc97477..9da9111 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -8,7 +8,7 @@
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.10
%define gstreamer_version 0.10
-%define libxklavier_version 1.13
+%define libxklavier_version 2.91
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.10.2
%define gnome_utils_version 2.8.1
@@ -18,10 +18,10 @@
%define po_package gnome-applets-2.0
-Summary: Small applications for the GNOME panel.
+Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.14.2
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -223,6 +223,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Jun 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
+- Rebuild against new libxklavier
+
* Thu Jun 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
- Explicitly list the applets to be included
commit 68b57489aaaa6b4b92c77fc64d60395c5699cec2
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 8 17:36:55 2006 +0000
try again
diff --git a/gnome-applets.spec b/gnome-applets.spec
index fbb7ad6..dc97477 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -7,12 +7,12 @@
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.10
+%define gstreamer_version 0.10
%define libxklavier_version 1.13
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.10.2
%define gnome_utils_version 2.8.1
%define dbus_version 0.60
-%define gstreamer_version 0.10
%define hal_version 0.5.3
%define libnotify_version 0.3.2
@@ -49,6 +49,7 @@ BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
+BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
@@ -56,8 +57,6 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
-BuildRequires: gstreamer >= %{gstreamer_version}
-BuildRequires: gstreamer-plugins-base >= %{gstreamer_version}
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
commit f97619629e0071afdda4e4e04aa57ba871bd8200
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 8 16:53:11 2006 +0000
fix spec
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 425e6cb..fbb7ad6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -115,8 +115,7 @@ autoreconf
%configure \
--enable-suid=no \
--disable-scrollkeeper \
- --enable-mini-commander \
- --with
+ --enable-mini-commander
make
%install
commit 83602e943b2631c80516c2197358e09fcbc2ed57
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 8 14:29:57 2006 +0000
More build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e75b512..425e6cb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -12,6 +12,9 @@
%define libgnome_desktop_version 2.10.2
%define gnome_utils_version 2.8.1
%define dbus_version 0.60
+%define gstreamer_version 0.10
+%define hal_version 0.5.3
+%define libnotify_version 0.3.2
%define po_package gnome-applets-2.0
@@ -53,6 +56,11 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
+BuildRequires: gstreamer >= %{gstreamer_version}
+BuildRequires: gstreamer-plugins-base >= %{gstreamer_version}
+BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: libnotify-devel >= %{libnotify_version}
+
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
@@ -107,7 +115,8 @@ autoreconf
%configure \
--enable-suid=no \
--disable-scrollkeeper \
- --enable-mini-commander
+ --enable-mini-commander \
+ --with
make
%install
commit b8edf9b7b79166b0fedc8ca98c1d68079fde8ca4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 8 14:02:38 2006 +0000
Start stocking up on build reqs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5d2ae03..e75b512 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -57,6 +57,8 @@ BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
BuildRequires: which
+BuildRequires: libtool autoconf gettext
+BuildRequires: pkgconfig
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit f54c61077b5a9057f7451837b6f6f11c3ccce7ff
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jun 8 13:33:52 2006 +0000
Try to catch applets gone missing
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c35d849..5d2ae03 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.14.2
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -182,7 +182,24 @@ fi
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libdir}/libgweather.so*
-%{_libexecdir}/*
+%{_libexecdir}/accessx-status-applet
+%{_libexecdir}/battstat-applet-2
+%{_libexecdir}/charpick_applet2
+%{_libexecdir}/cpufreq-applet
+%{_libexecdir}/drivemount_applet2
+%{_libexecdir}/geyes_applet2
+%{_libexecdir}/gnome-applets
+%{_libexecdir}/gnome-applets/mc-install-default-macros
+%{_libexecdir}/gnome-keyboard-applet
+%{_libexecdir}/gtik2_applet2
+%{_libexecdir}/gweather-applet-2
+%{_libexecdir}/mini_commander_applet
+%{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
+%{_libexecdir}/multiload-applet-2
+%{_libexecdir}/null_applet
+%{_libexecdir}/stickynotes_applet
+%{_libexecdir}/trashapplet
%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/pam.d/*
@@ -197,6 +214,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Jun 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
+- Explicitly list the applets to be included
+
* Tue Jun 6 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
- Rebuild
commit 264ddbc6b0cbdad94dcaac145a5ecc19d2d938eb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 6 05:32:45 2006 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ef2c803..c35d849 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.14.2
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -197,6 +197,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Jun 6 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
+- Rebuild
+
* Sun May 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
- Update to 2.14.2
commit 29b657667405b96f0fc91a592a58b21fa98452bb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon May 29 02:37:59 2006 +0000
update patches
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6668277..ef2c803 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,7 +27,7 @@ Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.14.1-cpufreq.patch
+Patch4: gnome-applets-2.14.2-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
commit 111d5761a87c9062fb4113c69d253dc78d4b883e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon May 29 02:03:12 2006 +0000
2.14.2
diff --git a/.cvsignore b/.cvsignore
index 04f4755..6f9e02c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.14.0.tar.bz2
gnome-applets-2.14.1.tar.bz2
+gnome-applets-2.14.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 399a824..6668277 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.14.1
+Version: 2.14.2
Release: 2
Epoch: 1
License: GPL
@@ -197,6 +197,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun May 28 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
+- Update to 2.14.2
+
* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
- Update to 2.14.1
- Update patches
diff --git a/sources b/sources
index a0d34e0..e2f8d2a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-1b5e834450812a6a3e7ab00652587ef4 gnome-applets-2.14.1.tar.bz2
+e6da539e78da1256b9a9bee1301fd44f gnome-applets-2.14.2.tar.bz2
commit dc079a33ce0dd714634a9b049e4aad7c9e4d60e6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 10 20:58:02 2006 +0000
update patches
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bb94827..399a824 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,10 +27,9 @@ Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.11.1-cpufreq.patch
+Patch4: gnome-applets-2.14.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
-Patch8: gnome-applets-2.13.90-mixer-crash.patch
Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
URL: http://www.gnome.org/
@@ -89,7 +88,6 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
-%patch8 -p1 -b .mixer-crash
%patch9 -p1 -b .gswitchit-export-dynamic
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -201,6 +199,7 @@ fi
%changelog
* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
- Update to 2.14.1
+- Update patches
* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-3
- apply patch
commit 8da8aca5c1448df32a9b04b8a9c2ea971c2c5622
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 10 18:04:12 2006 +0000
2.14.1
diff --git a/.cvsignore b/.cvsignore
index e6e0f01..04f4755 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.14.0.tar.bz2
+gnome-applets-2.14.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3c2b267..bb94827 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.14.0
-Release: 3
+Version: 2.14.1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -199,6 +199,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
+- Update to 2.14.1
+
* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-3
- apply patch
diff --git a/sources b/sources
index d77f355..a0d34e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-0c7789d642003f38c86d02a3384d3350 gnome-applets-2.14.0.tar.bz2
+1b5e834450812a6a3e7ab00652587ef4 gnome-applets-2.14.1.tar.bz2
commit e18a15554f462bb748c8888f8581a1cf031febe3
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Mar 28 23:33:57 2006 +0000
- apply patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c2d4b0b..3c2b267 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.14.0
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -90,7 +90,7 @@ small utilities for the GNOME panel.
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
%patch8 -p1 -b .mixer-crash
-#%patch9 -p1 -b .gswitchit-export-dynamic
+%patch9 -p1 -b .gswitchit-export-dynamic
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -199,7 +199,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
-* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-2
+* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-3
+- apply patch
+
+ * Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-2
- export symbols in gswitchit applet so applet plugins
work (bug 187168)
commit cb4b023b640348815e847077fd33db9a0157aad5
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Mar 28 22:45:35 2006 +0000
- export symbols in gswitchit applet so applet plugins work (bug 187168)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 92b793d..c2d4b0b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.14.0
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -31,6 +31,7 @@ Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
Patch8: gnome-applets-2.13.90-mixer-crash.patch
+Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch
URL: http://www.gnome.org/
@@ -89,6 +90,7 @@ small utilities for the GNOME panel.
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
%patch8 -p1 -b .mixer-crash
+#%patch9 -p1 -b .gswitchit-export-dynamic
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -101,6 +103,7 @@ tar xjf %{SOURCE1}
autoconf
%build
+autoreconf
%configure \
--enable-suid=no \
--disable-scrollkeeper \
@@ -196,6 +199,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Mar 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-2
+- export symbols in gswitchit applet so applet plugins
+ work (bug 187168)
+
* Sun Mar 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
- update to 2.14.0
commit daf8288801de68ff05b0ad0088df1d5165a8b2e4
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Sun Mar 12 18:22:19 2006 +0000
add buildreq
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9f934da..92b793d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -54,6 +54,7 @@ BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-doc-utils
BuildRequires: which
commit 9a901c1c069624a08544490188035674f844808b
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Sun Mar 12 17:59:31 2006 +0000
- update to 2.14.0
diff --git a/.cvsignore b/.cvsignore
index f7bbde5..e6e0f01 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,10 +1,2 @@
-gnome-applets-2.11.91.tar.gz
gnome-applets-2.9.3.1-modemlights.tar.bz2
-gnome-applets-2.12.0.tar.bz2
-gnome-applets-2.12.1.tar.bz2
-gnome-applets-2.12.2.tar.bz2
-gnome-applets-2.13.1.tar.bz2
-gnome-applets-2.13.2.tar.bz2
-gnome-applets-2.13.3.tar.bz2
-gnome-applets-2.13.4.tar.bz2
-gnome-applets-2.13.90.tar.bz2
+gnome-applets-2.14.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a9bbb46..9f934da 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.13.90
-Release: 8
+Version: 2.14.0
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -195,6 +195,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Mar 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
+- update to 2.14.0
+
* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-8
- s/divemount/drivemount/
diff --git a/sources b/sources
index 0e1a900..d77f355 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-9aac02f11ad626b2e92767f083762f8f gnome-applets-2.13.90.tar.bz2
+0c7789d642003f38c86d02a3384d3350 gnome-applets-2.14.0.tar.bz2
commit 0d14914388339376a43c6b6c362c9701c6d3c239
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Mar 9 15:46:40 2006 +0000
- s/divemount/drivemount/
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 183ef08..a9bbb46 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 7
+Release: 8
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -146,7 +146,7 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/battstat.schemas \
%{_sysconfdir}/gconf/schemas/charpick.schemas \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
- %{_sysconfdir}/gconf/schemas/divemount.schemas \
+ %{_sysconfdir}/gconf/schemas/drivemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
%{_sysconfdir}/gconf/schemas/gswitchit.schemas \
%{_sysconfdir}/gconf/schemas/gtik.schemas \
@@ -195,6 +195,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-8
+- s/divemount/drivemount/
+
* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-7
- remove some bad trailing spaces introduced in 2.13.90-6
commit 0dc393947d6afd936da4b21892f04d61ed5c2c1e
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Mar 9 15:23:04 2006 +0000
- remove some bad trailing spaces introduced in 2.13.90-6
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6cd1c79..183ef08 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 6
+Release: 7
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -148,14 +148,14 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
%{_sysconfdir}/gconf/schemas/divemount.schemas \
%{_sysconfdir}/gconf/schemas/geyes.schemas \
- %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
- %{_sysconfdir}/gconf/schemas/gtik.schemas \
- %{_sysconfdir}/gconf/schemas/gweather.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
- %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
- %{_sysconfdir}/gconf/schemas/mixer.schemas \
- %{_sysconfdir}/gconf/schemas/modemlights.schemas \
- %{_sysconfdir}/gconf/schemas/multiload.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/gtik.schemas \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
+ %{_sysconfdir}/gconf/schemas/multiload.schemas \
%{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null
%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
@@ -195,6 +195,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Mar 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-7
+- remove some bad trailing spaces introduced in 2.13.90-6
+
* Wed Mar 8 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-6
- improve package installation time by running gconftool-2 only
once in %%post
commit 00c8719ba0238eaa209ae7ff9283ac81122e0ea3
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 8 18:14:45 2006 +0000
- improve package installation time by running gconftool-2 only once in
%%post
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4992281..6cd1c79 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -141,10 +141,22 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
-for S in $SCHEMAS; do
- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/battstat.schemas \
+ %{_sysconfdir}/gconf/schemas/charpick.schemas \
+ %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \
+ %{_sysconfdir}/gconf/schemas/divemount.schemas \
+ %{_sysconfdir}/gconf/schemas/geyes.schemas \
+ %{_sysconfdir}/gconf/schemas/gswitchit.schemas \
+ %{_sysconfdir}/gconf/schemas/gtik.schemas \
+ %{_sysconfdir}/gconf/schemas/gweather.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \
+ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \
+ %{_sysconfdir}/gconf/schemas/mixer.schemas \
+ %{_sysconfdir}/gconf/schemas/modemlights.schemas \
+ %{_sysconfdir}/gconf/schemas/multiload.schemas \
+ %{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null
%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
%postun
@@ -183,6 +195,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Mar 8 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-6
+- improve package installation time by running gconftool-2 only
+ once in %%post
+
* Wed Mar 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-5
- Fix a crash in the mixer applet (#184285, #182957)
commit 492080ef127c814957a2f6490bac51073fc37b99
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 8 16:27:21 2006 +0000
- update mclasen's patch to add set_data_full in a few places
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3a9daa3..4992281 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -30,7 +30,6 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
-Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch
Patch8: gnome-applets-2.13.90-mixer-crash.patch
URL: http://www.gnome.org/
@@ -88,7 +87,6 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
-%patch7 -p1 -b .ref-mixer-elements
%patch8 -p1 -b .mixer-crash
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
commit fe756f191b7713e3ab9e4bc8b1a5055c929e91fa
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 8 15:43:25 2006 +0000
fix a double-free in the mixer applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b86d987..3a9daa3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -31,6 +31,7 @@ Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch
+Patch8: gnome-applets-2.13.90-mixer-crash.patch
URL: http://www.gnome.org/
@@ -88,6 +89,7 @@ small utilities for the GNOME panel.
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
%patch7 -p1 -b .ref-mixer-elements
+%patch8 -p1 -b .mixer-crash
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -183,6 +185,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Mar 8 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-5
+- Fix a crash in the mixer applet (#184285, #182957)
+
* Tue Mar 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-4
- ref some objects given to us by gstreamer
commit 4e99315c16fa2205cbcc9cee6953c8bfb1b4e1ab
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 8 03:49:22 2006 +0000
- ref some objects given to us by gstreamer
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a8b66ec..b86d987 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -30,6 +30,7 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
+Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch
URL: http://www.gnome.org/
@@ -86,6 +87,7 @@ small utilities for the GNOME panel.
%patch4 -p1 -b .cpufreq
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
+%patch7 -p1 -b .ref-mixer-elements
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -181,6 +183,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Mar 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-4
+- ref some objects given to us by gstreamer
+
* Wed Mar 1 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
- More stock ticker fun (bug 179528)
commit 996953e5654e3e6109f9970f30ad96f1babc1b3a
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Mar 1 22:25:45 2006 +0000
- More stock ticker fun (bug 179528)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 73b3ebb..a8b66ec 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -29,7 +29,7 @@ Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
-Patch6: gnome-applets-2.13.4-stock-ticker.patch
+Patch6: gnome-applets-2.13.90-stock-ticker.patch
URL: http://www.gnome.org/
@@ -181,6 +181,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Mar 1 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
+- More stock ticker fun (bug 179528)
+
* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.90-2
- BuildRequires: which
commit c845d67ee2aab50a7fce82d2b12d35b54f1f8918
Author: Karsten Hopp <karsten(a)fedoraproject.org>
Date: Tue Feb 28 13:45:55 2006 +0000
- BuildRequires: which
if [ -f "C/accessx-status.xml" ]; then d="../"; else d="$sd/"; fi; \ (cd
es/ && \ `which xml2po` -e -p \ "${d}es/es.po" \
"${d}C/accessx-status.xml" > accessx-status.xml.tmp && \ cp
accessx-status.xml.tmp accessx-status.xml && rm -f
accessx-status.xml.tmp) /bin/sh: which: command not found /bin/sh: -e:
command not found make[3]: *** [es/accessx-status.xml] Error 127
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 335be06..73b3ebb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.90
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -54,6 +54,7 @@ BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: gnome-doc-utils
+BuildRequires: which
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -180,6 +181,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.90-2
+- BuildRequires: which
+
* Sun Feb 26 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-1
- Update to 2.13.90
commit 566ff6cf1ea0bb60034cffef053bb84a18b3f052
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Feb 27 03:31:38 2006 +0000
2.13.90
diff --git a/.cvsignore b/.cvsignore
index c4ba9d0..f7bbde5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ gnome-applets-2.13.1.tar.bz2
gnome-applets-2.13.2.tar.bz2
gnome-applets-2.13.3.tar.bz2
gnome-applets-2.13.4.tar.bz2
+gnome-applets-2.13.90.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a039ab7..335be06 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.13.4
-Release: 4
+Version: 2.13.90
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -180,6 +180,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.90-1
+- Update to 2.13.90
+
* Thu Feb 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-4
- Make the stock ticker work with gcc 4.1 (#179528)
diff --git a/sources b/sources
index 7211852..0e1a900 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-d45875668fd4e30d0863bf71ead44caa gnome-applets-2.13.4.tar.bz2
+9aac02f11ad626b2e92767f083762f8f gnome-applets-2.13.90.tar.bz2
commit e4c5467b15ab140d989b83eaec2041da922e2685
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 23 15:54:39 2006 +0000
Add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7a8784f..a039ab7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -181,7 +181,7 @@ fi
%changelog
* Thu Feb 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-4
-- Make the stock ticker work with gcc 4.1
+- Make the stock ticker work with gcc 4.1 (#179528)
* Sat Feb 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-3
- Remove a warning from the stock ticker applet
commit 550646e3c0d10bdcf9245c6f0ff037fce23c478e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 23 15:53:34 2006 +0000
Make stock ticker work with gcc 4.1
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 01b6ba9..7a8784f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.4
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -29,6 +29,7 @@ Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
+Patch6: gnome-applets-2.13.4-stock-ticker.patch
URL: http://www.gnome.org/
@@ -83,6 +84,7 @@ small utilities for the GNOME panel.
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
%patch5 -p1 -b .warning
+%patch6 -p1 -b .stock-ticker
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -178,6 +180,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Thu Feb 23 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-4
+- Make the stock ticker work with gcc 4.1
+
* Sat Feb 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-3
- Remove a warning from the stock ticker applet
commit c691c5c7a4c4d10885e54f778703f0a23892ca64
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Feb 18 05:52:34 2006 +0000
Avoid a warning in the stock ticker applet
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 660e9a7..01b6ba9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.4
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,6 +28,8 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
+Patch5: gnome-applets-2.13.4-warning.patch
+
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -65,10 +67,10 @@ Requires: usermode
Source10: cpufreq-selector.app
Source11: cpufreq-selector.pam
-
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -80,6 +82,7 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .warning
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -175,6 +178,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sat Feb 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-3
+- Remove a warning from the stock ticker applet
+
* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-2
- Build with --enable-mini-commander
commit 3cf01b4dd18957ff8ed6b51497107e8038320f67
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 15 05:12:07 2006 +0000
Typo fix
diff --git a/gnome-applets.spec b/gnome-applets.spec
index da25bab..660e9a7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -92,7 +92,7 @@ tar xjf %{SOURCE1}
autoconf
%build
-%configure \
+%configure \
--enable-suid=no \
--disable-scrollkeeper \
--enable-mini-commander
commit fb2f6ae514f7b3ee4d624b3c3eefa9de8c5965de
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 15 05:04:47 2006 +0000
Build with --enable-mini-commander
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8cd4e06..da25bab 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.4
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -92,7 +92,10 @@ tar xjf %{SOURCE1}
autoconf
%build
-%configure --enable-suid=no --disable-scrollkeeper
+%configure \
+ --enable-suid=no \
+ --disable-scrollkeeper \
+ --enable-mini-commander
make
%install
@@ -172,6 +175,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-2
+- Build with --enable-mini-commander
+
* Sun Feb 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-1
- Update to 2.13.4
commit 7d749b493b47018ff9ac22e0b32a34c87a72ee6b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 12 19:40:33 2006 +0000
2.13.4
diff --git a/.cvsignore b/.cvsignore
index 1971270..c4ba9d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ gnome-applets-2.12.2.tar.bz2
gnome-applets-2.13.1.tar.bz2
gnome-applets-2.13.2.tar.bz2
gnome-applets-2.13.3.tar.bz2
+gnome-applets-2.13.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b28b3c3..8cd4e06 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.13.3
-Release: 4.2
+Version: 2.13.4
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,8 +28,6 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=329476
-Patch5: gnome-applets-2.13.3-bad-weather.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -82,7 +80,6 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .bad-weather
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -175,6 +172,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.4-1
+- Update to 2.13.4
+
* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.2
- bump again for double-long bug on ppc(64)
diff --git a/sources b/sources
index bd2c9f1..7211852 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-a21a38a13cafbf4bcd841210f3dbc228 gnome-applets-2.13.3.tar.bz2
+d45875668fd4e30d0863bf71ead44caa gnome-applets-2.13.4.tar.bz2
commit 511481ef707fc5443fe9249477600e16d7aa0fe0
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Feb 11 03:12:30 2006 +0000
bump for bug in double-long on ppc(64)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2d70363..b28b3c3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.3
-Release: 4.1
+Release: 4.2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -175,6 +175,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.2
+- bump again for double-long bug on ppc(64)
+
* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.1
- rebuilt for new gcc4.1 snapshot and glibc changes
commit c573ea7f5ec014db6ff6cb5a8f0df796e0a4749c
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 7 11:50:41 2006 +0000
bump for new gcc/glibc
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6ed929f..2d70363 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.3
-Release: 4
+Release: 4.1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -175,6 +175,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 1:2.13.3-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
* Wed Feb 01 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-4
- Fix an overflow in the weather applet
commit a3acab006187ae708710e7adfae9d12cf1a81694
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 1 15:29:50 2006 +0000
add bug ref
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 12e5df9..6ed929f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -28,6 +28,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=329476
Patch5: gnome-applets-2.13.3-bad-weather.patch
URL: http://www.gnome.org/
commit 800ecbdc60de6536d046bd6bf94946a4221343d7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 1 15:07:29 2006 +0000
Bad weather
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e59d546..12e5df9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.3
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,6 +28,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
+Patch5: gnome-applets-2.13.3-bad-weather.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -80,6 +81,7 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .bad-weather
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -172,6 +174,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Feb 01 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-4
+- Fix an overflow in the weather applet
+
* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-3
- Update gstreamer requires
commit b1d69ba0ad052cb062409dffc8e552ea357e52a5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 31 20:16:26 2006 +0000
grr
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 990519d..e59d546 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -42,7 +42,8 @@ BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
-BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
commit 10613455e49b521446c9ab7f9e877bea0de6f211
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 31 20:12:29 2006 +0000
more fixes
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4d7c4a1..990519d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -42,7 +42,7 @@ BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
-BuildRequires: gstreamer08-plugins-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
commit 5ff3d1092ae472d24de7c0aeb21ec8b96284b247
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 31 20:08:47 2006 +0000
bump rev
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f52a5e1..4d7c4a1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.3
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -171,7 +171,7 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
-* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-2
+* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-3
- Update gstreamer requires
* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
commit e0eefd5bbdb895d08d15b9fc446bac25429ba1b8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 31 20:06:39 2006 +0000
fix gstreamer requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bd7ddb1..f52a5e1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -6,7 +6,7 @@
%define libgtop2_version 2.12.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
-%define gstreamer_plugins_version 0.7.6-2
+%define gstreamer_plugins_version 0.10
%define libxklavier_version 1.13
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.10.2
@@ -53,7 +53,8 @@ BuildRequires: gnome-doc-utils
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
-Requires: gstreamer08-plugins >= %{gstreamer_plugins_version}
+Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version}
+Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version}
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
@@ -170,6 +171,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-2
+- Update gstreamer requires
+
* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
- Update to 2.13.3
commit a2b7a32b9ab7a462b6070c9d38b68f4b2a0b4225
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 31 05:36:12 2006 +0000
2.13.3
diff --git a/.cvsignore b/.cvsignore
index fa268dd..1971270 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ gnome-applets-2.12.1.tar.bz2
gnome-applets-2.12.2.tar.bz2
gnome-applets-2.13.1.tar.bz2
gnome-applets-2.13.2.tar.bz2
+gnome-applets-2.13.3.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 770b876..bd7ddb1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.13.2
+Version: 2.13.3
Release: 2
Epoch: 1
License: GPL
@@ -170,6 +170,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Jan 31 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
+- Update to 2.13.3
+
* Wed Jan 18 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-2
- BuildRequire gnome-doc-utils
diff --git a/sources b/sources
index b631ecb..bd2c9f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-fd89a1eb8c1384084f29b0da6acdecb3 gnome-applets-2.13.2.tar.bz2
+a21a38a13cafbf4bcd841210f3dbc228 gnome-applets-2.13.3.tar.bz2
commit 98c7f45edf314631c4e9579abbd00a6c0a8ca824
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 18 13:47:01 2006 +0000
BuildRequire gnome-doc-utils
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 053d4b0..770b876 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.2
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -49,6 +49,7 @@ BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: gnome-doc-utils
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -169,6 +170,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jan 18 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-2
+- BuildRequire gnome-doc-utils
+
* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
- Update to 2.13.2
commit f798d63e6669287e36ad65e4d400cfe24472fcb1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 17 05:23:28 2006 +0000
2.13.2
diff --git a/.cvsignore b/.cvsignore
index d9bf96a..fa268dd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ gnome-applets-2.12.0.tar.bz2
gnome-applets-2.12.1.tar.bz2
gnome-applets-2.12.2.tar.bz2
gnome-applets-2.13.1.tar.bz2
+gnome-applets-2.13.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 303cef1..053d4b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.13.1
-Release: 4
+Version: 2.13.2
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -169,6 +169,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
+- Update to 2.13.2
+
* Fri Jan 05 2006 John (J5) Palmieri <johnp(a)redhat.com> 2.13.1-4
- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages
we need gstreamer08 for now
diff --git a/sources b/sources
index ef40763..b631ecb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-3e7a78d837c6e2f8e41c8a0553673417 gnome-applets-2.13.1.tar.bz2
+fd89a1eb8c1384084f29b0da6acdecb3 gnome-applets-2.13.2.tar.bz2
commit f30d0df2519d8c2e9a9a15f7d90b8a8dad43cd6b
Author: John (J5) Palmieri <johnp(a)fedoraproject.org>
Date: Thu Jan 5 23:28:52 2006 +0000
- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages
we need gstreamer08 for now
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4c74a7b..303cef1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.1
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -42,7 +42,7 @@ BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: libxklavier-devel >= %{libxklavier_version}
-BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
+BuildRequires: gstreamer08-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
@@ -52,7 +52,7 @@ BuildRequires: dbus-devel >= %{dbus_version}
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
-Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
+Requires: gstreamer08-plugins >= %{gstreamer_plugins_version}
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
@@ -169,6 +169,10 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Jan 05 2006 John (J5) Palmieri <johnp(a)redhat.com> 2.13.1-4
+- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages
+ we need gstreamer08 for now
+
* Wed Jan 04 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-3
- Rebuild against new libgtop
commit 90f6fbaab886404d84ef9430e7c78bfeb7324df5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 4 14:36:23 2006 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3df33b0..4c74a7b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -169,6 +169,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Wed Jan 04 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-3
+- Rebuild against new libgtop
+
* Fri Dec 16 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-2
- Rebuild against new libgtop
commit 4f1fcc502f511d8b4554878639eace0a6c40dbc8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Dec 16 15:46:48 2005 +0000
Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b492276..3df33b0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.13.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -169,6 +169,9 @@ fi
%{_libdir}/pkgconfig/gweather.pc
%changelog
+* Fri Dec 16 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-2
+- Rebuild against new libgtop
+
* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-1
- Update to 2.13.1
- Update file lists
commit 5ee684eafc00b397f4f1fbec0a1913481b0c2b0f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 15 05:39:05 2005 +0000
Typo fix
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7a055db..b492276 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -163,7 +163,7 @@ fi
# These are really devel files, but we don't want a devel package
# for just three files
-%{_includedir}/libgswitchiyyt
+%{_includedir}/libgswitchit
%{_libdir}/pkgconfig/gswitchit.pc
%{_includedir}/libgweather
%{_libdir}/pkgconfig/gweather.pc
commit 4c2a29e35726c9c707e093cd4990f1aa8619f47c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 15 05:33:34 2005 +0000
Update file lists
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0c41c01..7a055db 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -103,6 +103,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
# usermode-ify cpufreq-selector
@@ -151,6 +153,7 @@ fi
%{_datadir}/omf/*
%{_bindir}/*
%{_libdir}/bonobo/servers/*
+%{_libdir}/libgweather.so*
%{_libexecdir}/*
%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
@@ -160,12 +163,15 @@ fi
# These are really devel files, but we don't want a devel package
# for just three files
-%{_includedir}/libgswitchit
+%{_includedir}/libgswitchiyyt
%{_libdir}/pkgconfig/gswitchit.pc
+%{_includedir}/libgweather
+%{_libdir}/pkgconfig/gweather.pc
%changelog
* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-1
- Update to 2.13.1
+- Update file lists
* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> 2.12.2-1.1
- rebuilt
commit 705d3aa97d3336e7678e8cb12ffbb0d2c070cbdf
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 15 05:18:27 2005 +0000
2.13.1
diff --git a/.cvsignore b/.cvsignore
index 05031e0..d9bf96a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.12.0.tar.bz2
gnome-applets-2.12.1.tar.bz2
gnome-applets-2.12.2.tar.bz2
+gnome-applets-2.13.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9fa6cd5..0c41c01 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.12.2
-Release: 1.1
+Version: 2.13.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -164,6 +164,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.1-1
+- Update to 2.13.1
+
* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> 2.12.2-1.1
- rebuilt
diff --git a/sources b/sources
index 503dcb8..ef40763 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-41aa44df2b0477594e59f59245c7d052 gnome-applets-2.12.2.tar.bz2
+3e7a78d837c6e2f8e41c8a0553673417 gnome-applets-2.13.1.tar.bz2
commit 53a8d57a002f2a86cf5f22c57687399ec5da046d
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Dec 10 16:48:56 2005 +0000
bad bump fix
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ea36463..9fa6cd5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.12.2
-Release: 1 .1
+Release: 1.1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -164,7 +164,7 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
+* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> 2.12.2-1.1
- rebuilt
* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.2-1
commit ecf4884c4d2d561f33c80b9689e8fd3f6d7d3990
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Fri Dec 9 22:40:35 2005 +0000
gcc update bump
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 1760572..ea36463 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.12.2
-Release: 1
+Release: 1 .1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -164,6 +164,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
+- rebuilt
+
* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.2-1
- Update to 2.12.2
commit 2752f3832dea272af434de6e556b67cf6260f8ba
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Dec 2 05:19:46 2005 +0000
2.12.2
diff --git a/.cvsignore b/.cvsignore
index 6d09ef3..05031e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ gnome-applets-2.11.91.tar.gz
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.12.0.tar.bz2
gnome-applets-2.12.1.tar.bz2
+gnome-applets-2.12.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6baae6f..1760572 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.12.1
-Release: 4
+Version: 2.12.2
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -164,6 +164,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.2-1
+- Update to 2.12.2
+
* Thu Dec 01 2005 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.12.1-4
- rebuild for new dbus
diff --git a/sources b/sources
index 1884693..503dcb8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-06dd0b634d7092fa8af2ce302f68f912 gnome-applets-2.12.1.tar.bz2
+41aa44df2b0477594e59f59245c7d052 gnome-applets-2.12.2.tar.bz2
commit 926c5df20a78decf479eeae4e7c6400a0773ba7b
Author: John (J5) Palmieri <johnp(a)fedoraproject.org>
Date: Thu Dec 1 23:18:04 2005 +0000
- rebuild for new dbus
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b82bdcf..6baae6f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -11,13 +11,14 @@
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.10.2
%define gnome_utils_version 2.8.1
+%define dbus_version 0.60
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.12.1
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -47,6 +48,7 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
BuildRequires: gnome-utils >= %{gnome_utils_version}
+BuildRequires: dbus-devel >= %{dbus_version}
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -162,6 +164,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Dec 01 2005 John (J5) Palmieri <johnp(a)redhat.com> - 1:2.12.1-4
+- rebuild for new dbus
+
* Mon Nov 14 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-3
- build correct command string for cpufreq-selection. Fix
spotted by Ingo Schaefer <ingo(a)ingo-shaefer.de> (Bug 164147).
commit e0472cc7d4a5bd9c2c100774f472ab3881f8536e
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Nov 14 18:34:35 2005 +0000
- build correct command string for cpufreq-selection. Fix spotted by Ingo
Schaefer <ingo(a)ingo-shaefer.de> (Bug 164147).
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aeb5ac4..b82bdcf 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.12.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -162,6 +162,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Mon Nov 14 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-3
+- build correct command string for cpufreq-selection. Fix
+ spotted by Ingo Schaefer <ingo(a)ingo-shaefer.de> (Bug 164147).
+
* Thu Oct 20 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-2
- require libgtop2 >= 2.12.0, bug 171285
commit 9e2a5691194ebe5f9e1e34bdcfdcda572eaec257
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Oct 20 14:38:27 2005 +0000
- require libgtop2 >= 2.12.0, bug 171285
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 11871a1..aeb5ac4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,7 +3,7 @@
%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define gnome_panel_version 2.5.91
-%define libgtop2_version 2.5.0
+%define libgtop2_version 2.12.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.7.6-2
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.12.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -162,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Oct 20 2005 Ray Strode <rstrode(a)redhat.com> - 1:2.12.1-2
+- require libgtop2 >= 2.12.0, bug 171285
+
* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.1-1
- Update to 2.12.1
commit 8d2b2e3bbfca0edb6447a7a1ffb8465bcc381f1c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Oct 6 14:50:17 2005 +0000
2.12.1
diff --git a/.cvsignore b/.cvsignore
index 5a9fb45..6d09ef3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
gnome-applets-2.11.91.tar.gz
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.12.0.tar.bz2
+gnome-applets-2.12.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b3c9e0b..11871a1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -16,7 +16,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.12.0
+Version: 2.12.1
Release: 1
Epoch: 1
License: GPL
@@ -162,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.1-1
+- Update to 2.12.1
+
* Thu Sep 8 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.0-1
- Update to 2.12.0, drop upstreamed patches
diff --git a/sources b/sources
index a0862a4..1884693 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-513dc1dc7d213f4ed0d302345c838aff gnome-applets-2.12.0.tar.bz2
+06dd0b634d7092fa8af2ce302f68f912 gnome-applets-2.12.1.tar.bz2
commit c9cce6a60467c713f15f49ee267e4175ceba83ce
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Sep 8 13:45:35 2005 +0000
2.12.0
diff --git a/.cvsignore b/.cvsignore
index c28167e..5a9fb45 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
gnome-applets-2.11.91.tar.gz
gnome-applets-2.9.3.1-modemlights.tar.bz2
+gnome-applets-2.12.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3be5e0b..b3c9e0b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -16,19 +16,17 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.11.91
-Release: 5
+Version: 2.12.0
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.gz
+Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
-# drop this patch when we go to the next version
-Patch5: gnome-applets-pangoxft.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -77,7 +75,6 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .pangoxft
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -165,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Sep 8 2005 Matthias Clasen <mclasen(a)redhat.com> - 1:2.12.0-1
+- Update to 2.12.0, drop upstreamed patches
+
* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-5
- fun with auto* to really get the build working
diff --git a/sources b/sources
index f25c35e..a0862a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5e4b7b07329933a67d008533c288acf9 gnome-applets-2.11.91.tar.gz
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+513dc1dc7d213f4ed0d302345c838aff gnome-applets-2.12.0.tar.bz2
commit bdb4fb7d83510eaec126a446b5a70c0b370a4de8
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Aug 18 03:47:56 2005 +0000
- fun with auto* to really get the build working
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 80c2d50..3be5e0b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.11.91
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -27,6 +27,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
+# drop this patch when we go to the next version
Patch5: gnome-applets-pangoxft.patch
URL: http://www.gnome.org/
@@ -86,10 +87,9 @@ tar xjf %{SOURCE1}
%patch3 -p1 -b .ppp-command
-automake
autoconf
-%build
+%build
%configure --enable-suid=no --disable-scrollkeeper
make
@@ -165,6 +165,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-5
+- fun with auto* to really get the build working
+
* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-4
- patch from upstream cvs to fix build with new pango (bgo #313368)
commit 9faca06a0c7b1cbd4eeb78caa1638e4a536d096e
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Aug 18 02:59:11 2005 +0000
typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e6650a6..80c2d50 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,7 +27,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
-Ptach5: gnome-applets-pangoxft.patch
+Patch5: gnome-applets-pangoxft.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
commit 9a256863bb17aa698c90b09720bad57281e29aa1
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Thu Aug 18 02:58:21 2005 +0000
- patch from upstream cvs to fix build with new pango (bgo #313368)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3d5a058..e6650a6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.11.91
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -27,6 +27,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
+Ptach5: gnome-applets-pangoxft.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -75,6 +76,7 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .pangoxft
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -84,6 +86,7 @@ tar xjf %{SOURCE1}
%patch3 -p1 -b .ppp-command
+automake
autoconf
%build
@@ -162,6 +165,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Aug 17 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.11.91-4
+- patch from upstream cvs to fix build with new pango (bgo #313368)
+
* Tue Aug 16 2005 Warren Togami <wtogami(a)redhat.com> - 1:2.11.91-3
- rebuild for new cairo
commit d4fe2cfdf20f150ee8f82e8f470919495c801854
Author: Warren Togami <wtogami(a)fedoraproject.org>
Date: Wed Aug 17 06:19:39 2005 +0000
rebuild for new cairo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ea34bd4..3d5a058 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,7 +17,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.11.91
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -162,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Tue Aug 16 2005 Warren Togami <wtogami(a)redhat.com> - 1:2.11.91-3
+- rebuild for new cairo
+
* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
- disable scrollkeeper database updates
- add omf files to package list
commit c113edd46af7fad3bb55e08fca8cdb40e4c33b53
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Aug 11 18:33:17 2005 +0000
- disable scrollkeeper database updates
- add omf files to package list
- require gnome-utils for gucharmap/charpick integration
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9e66afc..ea34bd4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -10,6 +10,7 @@
%define libxklavier_version 1.13
%define libwnck_version 2.9.3
%define libgnome_desktop_version 2.10.2
+%define gnome_utils_version 2.8.1
%define po_package gnome-applets-2.0
@@ -45,6 +46,7 @@ BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
+BuildRequires: gnome-utils >= %{gnome_utils_version}
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -144,7 +146,7 @@ fi
%{_datadir}/gnome
%{_datadir}/gnome-applets
%{_datadir}/xmodmap
-%{_datadir}/omf/gnome-applets
+%{_datadir}/omf/*
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
@@ -162,6 +164,8 @@ fi
%changelog
* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
- disable scrollkeeper database updates
+- add omf files to package list
+- require gnome-utils for gucharmap/charpick integration
* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
- New upstream version
commit c58e00a1c98d76d7d4f7e51d3f3cf626e38c94ab
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Aug 11 18:05:19 2005 +0000
- disable scrollkeeper database updates
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 477983d..9e66afc 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -85,7 +85,7 @@ tar xjf %{SOURCE1}
autoconf
%build
-%configure --enable-suid=no
+%configure --enable-suid=no --disable-scrollkeeper
make
%install
@@ -161,7 +161,7 @@ fi
%changelog
* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
-- rebuilt
+- disable scrollkeeper database updates
* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
- New upstream version
commit a283d75f945505c99f00210a3058573a4f8277ba
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Aug 11 17:29:52 2005 +0000
- rebuilt
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 12d3942..477983d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -16,7 +16,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.11.91
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -160,6 +160,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Aug 11 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-2
+- rebuilt
+
* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
- New upstream version
commit b39ff7a563786ffdb31562789cfb916b21f2e0a9
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Aug 10 17:40:17 2005 +0000
add old modemlights back to sources
diff --git a/.cvsignore b/.cvsignore
index 2d4a75e..c28167e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
gnome-applets-2.11.91.tar.gz
+gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/sources b/sources
index 0747649..f25c35e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
5e4b7b07329933a67d008533c288acf9 gnome-applets-2.11.91.tar.gz
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 5d89361455f9f222eca82c65201fc8e2ec521ace
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Aug 10 17:37:05 2005 +0000
- New upstream version
diff --git a/.cvsignore b/.cvsignore
index b3f5ae8..2d4a75e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1 @@
-gnome-applets-2.9.5.tar.bz2
-gnome-applets-2.9.6.tar.bz2
-gnome-applets-2.10.0.tar.bz2
-gnome-applets-2.9.3.1-modemlights.tar.bz2
-gnome-applets-2.10.1.tar.bz2
-gnome-applets-2.11.1.tar.bz2
-gnome-applets-2.11.2.tar.bz2
+gnome-applets-2.11.91.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e54a144..12d3942 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,15 +15,14 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.11.2
+Version: 2.11.91
Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.gz
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
-Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
@@ -72,7 +71,6 @@ small utilities for the GNOME panel.
%prep
%setup -q
%patch0 -p1 -b .use-old-modemlights
-%patch1 -p1 -b .fix-docs-error
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
@@ -162,6 +160,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Aug 10 2005 Ray Strode <rstrode(a)redhat.com> 1:2.11.91-1
+- New upstream version
+
* Fri Aug 5 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.2-2
- New upstream version
diff --git a/sources b/sources
index 411bda7..0747649 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-9ca884986e8a92eb1271ffd34e41042a gnome-applets-2.11.2.tar.bz2
+5e4b7b07329933a67d008533c288acf9 gnome-applets-2.11.91.tar.gz
commit ba5a1ea577da128ca748cc24f8041778aff9812b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Aug 5 17:17:31 2005 +0000
2.11.2
diff --git a/.cvsignore b/.cvsignore
index 4401c5e..b3f5ae8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ gnome-applets-2.10.0.tar.bz2
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.10.1.tar.bz2
gnome-applets-2.11.1.tar.bz2
+gnome-applets-2.11.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ca6abbc..e54a144 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,8 +15,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.11.1
-Release: 2
+Version: 2.11.2
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -162,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Aug 5 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.2-2
+- New upstream version
+
* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-2
- Rebuilt
diff --git a/sources b/sources
index 568d9d1..411bda7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
-e8ce3499fe74d471c3fdfeff3ed5637a gnome-applets-2.11.1.tar.bz2
+9ca884986e8a92eb1271ffd34e41042a gnome-applets-2.11.2.tar.bz2
commit a699684041ddad6debdfe93f799e106892a1bc46
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 13 03:18:44 2005 +0000
Rebuilt
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e9f8ed2..ca6abbc 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -16,7 +16,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.11.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -162,6 +162,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-2
+- Rebuilt
+
* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-1
- Update to 2.11.1
commit 486e1257ad2761994432240bf79426d19de9e654
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 9 04:31:23 2005 +0000
Update requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2f6b6a9..e9f8ed2 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -9,6 +9,7 @@
%define gstreamer_plugins_version 0.7.6-2
%define libxklavier_version 1.13
%define libwnck_version 2.9.3
+%define libgnome_desktop_version 2.10.2
%define po_package gnome-applets-2.0
@@ -44,6 +45,7 @@ BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
+BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit 39cb0e2e62162ef5bd33b6c3172894aaca8b09e9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 9 04:12:43 2005 +0000
Updates
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 63127c8..2f6b6a9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -24,6 +24,7 @@ Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.11.1-cpufreq.patch
URL: http://www.gnome.org/
commit ab270cf5c8169f35cec2e7eca3ad69dd69953ce9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 9 04:10:42 2005 +0000
2.11.1
diff --git a/.cvsignore b/.cvsignore
index 11e2b65..4401c5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ gnome-applets-2.9.6.tar.bz2
gnome-applets-2.10.0.tar.bz2
gnome-applets-2.9.3.1-modemlights.tar.bz2
gnome-applets-2.10.1.tar.bz2
+gnome-applets-2.11.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2fdc538..63127c8 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -14,8 +14,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.10.1
-Release: 10
+Version: 2.11.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -24,9 +24,7 @@ Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
-Patch3: gnome-applets-2.3.6-ppp-command.patch
-Patch4: gnome-applets-2.10.1-cpufreq.patch
-Patch5: gnome-applets-2.10.1-no-mixer-warning-on-startup.patch
+Patch4: gnome-applets-2.11.1-cpufreq.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -74,7 +72,6 @@ small utilities for the GNOME panel.
%patch1 -p1 -b .fix-docs-error
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .no-mixer-warning-on-startup
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -162,6 +159,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 1:2.11.1-1
+- Update to 2.11.1
+
* Fri Jul 1 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.10.1-10
- Backport from HEAD patch to remove lame warning dialog when the
mixer applet can't find a mixer device
diff --git a/sources b/sources
index 16ca7cc..568d9d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-da9cd75f77972c96eec9551d41878a7f gnome-applets-2.10.1.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+e8ce3499fe74d471c3fdfeff3ed5637a gnome-applets-2.11.1.tar.bz2
commit 4c3577cc5c85028df9cbfa89821d9fd744fdba6d
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Fri Jul 1 12:44:07 2005 +0000
- Backport from HEAD patch to remove lame warning dialog when the mixer
applet can't find a mixer device
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f4cb06f..2fdc538 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,7 +15,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 9
+Release: 10
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -26,6 +26,7 @@ Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
Patch4: gnome-applets-2.10.1-cpufreq.patch
+Patch5: gnome-applets-2.10.1-no-mixer-warning-on-startup.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -73,6 +74,7 @@ small utilities for the GNOME panel.
%patch1 -p1 -b .fix-docs-error
%patch2 -p1 -b .use-builtin-apm
%patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .no-mixer-warning-on-startup
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -160,6 +162,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Jul 1 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.10.1-10
+- Backport from HEAD patch to remove lame warning dialog when the
+ mixer applet can't find a mixer device
+
* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 1:2.10.1-9
- remove setuid bit from cpufreq-selector, usermode-ify it
commit 96dbed665b8ce0dbfac0b9cbb4c08b2eef72f9c3
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Fri May 27 18:29:32 2005 +0000
- remove setuid bit from cpufreq-selector
- set it up for consolehelper use
- hardcode it to /usr/bin (hack) to make sure it runs the consolehelper
version
- take out the checks for 'is it setuid or am I root'
diff --git a/cpufreq-selector.app b/cpufreq-selector.app
new file mode 100644
index 0000000..6a738ec
--- /dev/null
+++ b/cpufreq-selector.app
@@ -0,0 +1 @@
+FALLBACK=true
diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam
new file mode 100644
index 0000000..321c2ee
--- /dev/null
+++ b/cpufreq-selector.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth sufficient pam_rootok.so
+auth required pam_console.so
+account required pam_permit.so
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 82595c0..f4cb06f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,7 +15,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 8
+Release: 9
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -25,6 +25,7 @@ Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
Patch3: gnome-applets-2.3.6-ppp-command.patch
+Patch4: gnome-applets-2.10.1-cpufreq.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -51,6 +52,12 @@ Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
# For wireless-applet backwards compat
Requires: gnome-netstatus >= 2.8.0-2
+# For cpufreq-selector
+Requires: usermode
+Source10: cpufreq-selector.app
+Source11: cpufreq-selector.pam
+
+
Obsoletes: battstat_applet
Obsoletes: gnome-cpufreq-applet
@@ -65,6 +72,7 @@ small utilities for the GNOME panel.
%patch0 -p1 -b .use-old-modemlights
%patch1 -p1 -b .fix-docs-error
%patch2 -p1 -b .use-builtin-apm
+%patch4 -p1 -b .cpufreq
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -77,7 +85,7 @@ tar xjf %{SOURCE1}
autoconf
%build
-%configure
+%configure --enable-suid=no
make
%install
@@ -92,6 +100,15 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+
+# usermode-ify cpufreq-selector
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector $RPM_BUILD_ROOT%{_sbindir}
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,security/console.apps}
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/cpufreq-selector
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cpufreq-selector
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -121,7 +138,6 @@ fi
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
-
%{_datadir}/pixmaps
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/gnome-2.0/ui/*
@@ -132,7 +148,10 @@ fi
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
+%{_sbindir}/*
%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/pam.d/*
+%{_sysconfdir}/security/console.apps/*
%{_sysconfdir}/sound
# These are really devel files, but we don't want a devel package
@@ -141,6 +160,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 1:2.10.1-9
+- remove setuid bit from cpufreq-selector, usermode-ify it
+
* Thu May 19 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-8
- Install modemlights gconf schema (bug 157764).
commit f6113d3f05b9ccbd8b1d85fa20eba0c6e5a818a0
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu May 19 18:34:13 2005 +0000
- Install modemlights gconf schema (bug 157764).
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e5e342a..82595c0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,7 +15,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 7
+Release: 8
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -104,7 +104,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
+SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -141,6 +141,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu May 19 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-8
+- Install modemlights gconf schema (bug 157764).
+
* Fri May 13 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-7
- Don't disable battstat on some platforms (bug 157683).
commit da76ebea9ad339ff35c3b03b9dc63982dfe2df1e
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri May 13 19:40:12 2005 +0000
- Don't disable battstat on some platforms (bug 157683).
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ac5957a..e5e342a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,6 +1,3 @@
-# apmd is built on %{ix86} and ppc
-%define apmd_archs %{ix86} ppc
-
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.6.0
@@ -11,7 +8,6 @@
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.7.6-2
%define libxklavier_version 1.13
-%define apmd_version 3.0.2-22
%define libwnck_version 2.9.3
%define po_package gnome-applets-2.0
@@ -19,7 +15,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 6
+Release: 7
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -81,13 +77,7 @@ tar xjf %{SOURCE1}
autoconf
%build
-%ifarch %{apmd_archs}
-%define DisableBattstat ""
-%else
-%define DisableBattstat "--disable-battstat"
-%endif
-
-%configure %{DisableBattstat}
+%configure
make
%install
@@ -114,10 +104,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-%ifarch %{apmd_archs}
-SCHEMAS="battstat.schemas"
-%endif
-SCHEMAS="$SCHEMAS charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
+SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -146,9 +133,7 @@ fi
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
%{_sysconfdir}/gconf/schemas/*
-%ifarch %{apmd_archs}
%{_sysconfdir}/sound
-%endif
# These are really devel files, but we don't want a devel package
# for just three files
@@ -156,6 +141,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri May 13 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-7
+- Don't disable battstat on some platforms (bug 157683).
+
* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.10.1-6
- silence %%post
commit 3d42fb69c03ef04fc0a4401305773c5b0297fa8c
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Wed Apr 27 04:28:47 2005 +0000
- silence %post
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ff86531..ac5957a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,7 +19,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -110,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache %{_datadir}/icons/hicolor
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -127,7 +127,7 @@ done
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache %{_datadir}/icons/hicolor
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
%files -f %{po_package}.lang
@@ -156,6 +156,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 1:2.10.1-6
+- silence %%post
+
* Tue Apr 26 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-5
- Add back old patch to change ppp connect/disconnect commands
(bug 147675)
commit 3c5892e56b2378753fb95477ba23e72f97f959bf
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Apr 26 15:54:15 2005 +0000
- Add back old patch to change ppp connect/disconnect commands (bug 147675)
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
new file mode 100644
index 0000000..dcfbbbc
--- /dev/null
+++ b/gnome-applets-2.3.6-ppp-command.patch
@@ -0,0 +1,20 @@
+--- gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:22.000000000 +0200
++++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:59.000000000 +0200
+@@ -27,7 +27,7 @@
+ <key>/schemas/apps/modemlights/prefs/connect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppon</default>
++ <default>/sbin/ifup ppp0</default>
+ <locale name="C">
+ <short>Command executed when connecting</short>
+ <long></long>
+@@ -38,7 +38,7 @@
+ <key>/schemas/apps/modemlights/prefs/disconnect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppoff</default>
++ <default>/sbin/ifdown ppp0</default>
+ <locale name="C">
+ <short>Command executed when disconnecting</short>
+ <long></long>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ad4573d..ff86531 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,7 +19,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,6 +28,7 @@ Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch1: gnome-applets-2.10.1-fix-docs-error.patch
Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3: gnome-applets-2.3.6-ppp-command.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -75,6 +76,8 @@ cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
rm -rf modemlights
tar xjf %{SOURCE1}
+%patch3 -p1 -b .ppp-command
+
autoconf
%build
@@ -153,6 +156,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Tue Apr 26 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-5
+- Add back old patch to change ppp connect/disconnect commands
+ (bug 147675)
+
* Wed Apr 20 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-4
- Use builtin copy of apmlib instead of adding an external dependency
(bug 155125)
commit 0f6d045a54e4e87c8c32cac7138ecfcc23f0dc40
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Apr 20 14:17:16 2005 +0000
- Use builtin copy of apmlib instead of adding an external dependency (bug
155125)
diff --git a/gnome-applets-2.10.1-use-builtin-apm.patch b/gnome-applets-2.10.1-use-builtin-apm.patch
new file mode 100644
index 0000000..66408b4
--- /dev/null
+++ b/gnome-applets-2.10.1-use-builtin-apm.patch
@@ -0,0 +1,15 @@
+--- gnome-applets-2.10.1/configure.in.use-builtin-apm 2005-04-20 09:46:00.000000000 -0400
++++ gnome-applets-2.10.1/configure.in 2005-04-20 09:46:22.000000000 -0400
+@@ -242,12 +242,10 @@ if test x$disable_battstat = xno; then
+ case "${host}" in
+ powerpc-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that use libapm
+ *-*-linux*)
+ NEED_LIBAPM=yes
+- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+ ;;
+ # list of supported OS cores that do not use libapm
+ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3b20f3f..ad4573d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,7 +19,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -27,6 +27,7 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.ta
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
Patch1: gnome-applets-2.10.1-fix-docs-error.patch
+Patch2: gnome-applets-2.10.1-use-builtin-apm.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -45,9 +46,6 @@ BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
-%ifarch %{apmd_archs}
-BuildRequires: apmd >= %{apmd_version}
-%endif
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -66,16 +64,10 @@ manager for the X Window System. The gnome-applets package provides
small utilities for the GNOME panel.
%prep
-%ifarch %{apmd_archs}
-if ! test -e /usr/lib/libapm.a ; then
- echo "You must have apmd installed"
- exit 1
-fi
-%endif
-
%setup -q
%patch0 -p1 -b .use-old-modemlights
%patch1 -p1 -b .fix-docs-error
+%patch2 -p1 -b .use-builtin-apm
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -161,6 +153,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Apr 20 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-4
+- Use builtin copy of apmlib instead of adding an external dependency
+ (bug 155125)
+
* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-3
- Apply patch from Jan de Groot <jan(a)jgc.homeip.net> to
silence scrollkeeper noise (bug 152236)
commit 652185b54415778c1ac91d900c870a8b7809f587
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Apr 14 20:25:44 2005 +0000
- Apply patch from Jan de Groot <jan(a)jgc.homeip.net> to silence
scrollkeeper noise (bug 152236)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d227b94..3b20f3f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,13 +19,14 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
+Patch1: gnome-applets-2.10.1-fix-docs-error.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -74,6 +75,7 @@ fi
%setup -q
%patch0 -p1 -b .use-old-modemlights
+%patch1 -p1 -b .fix-docs-error
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -159,6 +161,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-3
+- Apply patch from Jan de Groot <jan(a)jgc.homeip.net> to
+ silence scrollkeeper noise (bug 152236)
+
* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-2
- Add Obsoletes: gnome-cpufreq-applet (bug 154853)
commit 860553949f4a98e9eda71c2fc34518d3a99d0206
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Apr 14 17:18:32 2005 +0000
- Add Obsoletes: gnome-cpufreq-applet (bug 154853)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 841db68..d227b94 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,7 +19,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -56,6 +56,7 @@ Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
+Obsoletes: gnome-cpufreq-applet
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -158,6 +159,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Apr 14 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-2
+- Add Obsoletes: gnome-cpufreq-applet (bug 154853)
+
* Thu Apr 7 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-1
- update to 2.10.1
- actually build the old modemlights that were added in 2.10.0-4
commit d8b02a4c8aaa76a2c7d17f638c10d22bf890a661
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Apr 7 21:42:29 2005 +0000
- readd source tarball
diff --git a/sources b/sources
index 51876ff..16ca7cc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
da9cd75f77972c96eec9551d41878a7f gnome-applets-2.10.1.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit 853e6b90e8223197186b15037fb761699f0913c0
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Apr 7 21:37:16 2005 +0000
- update to 2.10.1
- actually build the old modemlights that were added in 2.10.0-4
diff --git a/.cvsignore b/.cvsignore
index 029601c..11e2b65 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ gnome-applets-2.9.5.tar.bz2
gnome-applets-2.9.6.tar.bz2
gnome-applets-2.10.0.tar.bz2
gnome-applets-2.9.3.1-modemlights.tar.bz2
+gnome-applets-2.10.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b6f858e..841db68 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,13 +18,14 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.10.0
-Release: 5
+Version: 2.10.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
+Patch0: gnome-applets-2.10.1-use-old-modemlights.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -56,8 +57,6 @@ Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
-Patch1: gnome-applets-2.9.6-gcc4-fix.patch
-
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -73,8 +72,7 @@ fi
%endif
%setup -q
-
-%patch1 -p1 -b .gcc4-fix
+%patch0 -p1 -b .use-old-modemlights
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -82,6 +80,7 @@ cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
rm -rf modemlights
tar xjf %{SOURCE1}
+autoconf
%build
%ifarch %{apmd_archs}
@@ -159,6 +158,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Thu Apr 7 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.1-1
+- update to 2.10.1
+- actually build the old modemlights that were added in 2.10.0-4
+
* Tue Apr 5 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-5
- Don't use %postun -p optimization now that we do more than
just /sbin/ldconfig in %postun (bug 152236)
diff --git a/sources b/sources
index b0eb39b..51876ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c230df43a21a0d788197b5b0f3e688f1 gnome-applets-2.10.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+da9cd75f77972c96eec9551d41878a7f gnome-applets-2.10.1.tar.bz2
commit a87e71440d02a3296d6eb28d3546d3878c6268bc
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Apr 5 15:15:30 2005 +0000
- Don't use %postun -p optimization now that we do more than just
/sbin/ldconfig in %postun (bug 152236)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5b56607..b6f858e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -19,7 +19,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.0
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -126,7 +126,8 @@ for S in $SCHEMAS; do
done
%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor
@@ -158,6 +159,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Tue Apr 5 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-5
+- Don't use %postun -p optimization now that we do more than
+ just /sbin/ldconfig in %postun (bug 152236)
+
* Mon Apr 4 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-4
- use old modemlights applet that doesn't depend on gnome-system-tools
commit c0cd66ee1710f8d50537df3bd0002ba30cd824ad
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Apr 4 16:05:31 2005 +0000
- use old modemlights applet that doesn't depend on gnome-system-tools
diff --git a/.cvsignore b/.cvsignore
index 29725a0..029601c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
gnome-applets-2.9.5.tar.bz2
gnome-applets-2.9.6.tar.bz2
gnome-applets-2.10.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index baece9e..5b56607 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -12,17 +12,19 @@
%define gstreamer_plugins_version 0.7.6-2
%define libxklavier_version 1.13
%define apmd_version 3.0.2-22
+%define libwnck_version 2.9.3
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.0
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -40,6 +42,7 @@ BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires: libwnck-devel >= %{libwnck_version}
%ifarch %{apmd_archs}
BuildRequires: apmd >= %{apmd_version}
%endif
@@ -75,6 +78,10 @@ fi
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE1}
+
%build
%ifarch %{apmd_archs}
@@ -151,7 +158,10 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
-* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com>
+* Mon Apr 4 2005 Ray Strode <rstrode(a)redhat.com> 1:2.10.0-4
+- use old modemlights applet that doesn't depend on gnome-system-tools
+
+* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-3
- rebuilt
* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
diff --git a/sources b/sources
index f785105..b0eb39b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
c230df43a21a0d788197b5b0f3e688f1 gnome-applets-2.10.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
commit e91f7bc5aae4790cc372b64a8e51162ed8652b2b
Author: Christopher Aillon <caillon(a)fedoraproject.org>
Date: Mon Mar 28 10:56:12 2005 +0000
Fix if check in specfiles.
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2453467..baece9e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.0
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
/sbin/ldconfig
scrollkeeper-update
touch --no-create %{_datadir}/icons/hicolor
-if [-x /usr/bin/gtk-update-icon-cache ]; then
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor
fi
@@ -121,7 +121,7 @@ done
%postun -p /sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
-if [-x /usr/bin/gtk-update-icon-cache ]; then
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache %{_datadir}/icons/hicolor
fi
@@ -151,6 +151,9 @@ fi
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com>
+- rebuilt
+
* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
- Update the GTK+ theme icon cache on (un)install
commit aac9a94d272b584a3ec311cb9d8f84c9bbfd249a
Author: Christopher Aillon <caillon(a)fedoraproject.org>
Date: Fri Mar 25 14:57:43 2005 +0000
- Update the GTK+ theme icon cache on (un)install
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 4d39fde..2453467 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,7 +3,7 @@
%define glib2_version 2.2.0
%define pango_version 1.2.0
-%define gtk2_version 2.2.0
+%define gtk2_version 2.6.0
%define libgnomeui_version 2.3.0
%define gnome_panel_version 2.5.91
%define libgtop2_version 2.5.0
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.10.0
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,7 +28,7 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: scrollkeeper >= 0.1.4
-
+Prereq: gtk2 >= %{gtk2_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -104,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
scrollkeeper-update
+touch --no-create %{_datadir}/icons/hicolor
+if [-x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache %{_datadir}/icons/hicolor
+fi
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
%ifarch %{apmd_archs}
@@ -116,6 +120,10 @@ done
%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
%postun -p /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+if [-x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache %{_datadir}/icons/hicolor
+fi
%files -f %{po_package}.lang
%defattr(-, root, root)
@@ -143,6 +151,9 @@ done
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
+- Update the GTK+ theme icon cache on (un)install
+
* Wed Mar 16 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.10.0-1
- Rebuild against new libwnck
- Update to 2.10.0
commit d0b7cbec05b24ece89e0af73ad267f6e7d8e7b67
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 16 13:52:38 2005 +0000
Drop upstreamed patch
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 561d08f..4d39fde 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -53,7 +53,6 @@ Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
-Patch0: gnome-applets-2.9.5-mixer-crash-with-no-channels.patch
Patch1: gnome-applets-2.9.6-gcc4-fix.patch
%description
@@ -72,7 +71,6 @@ fi
%setup -q
-%patch0 -p1 -b .mixer-crash-with-no-channel
%patch1 -p1 -b .gcc4-fix
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -146,8 +144,9 @@ done
%changelog
* Wed Mar 16 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.10.0-1
-- Update to 2.10.0
- Rebuild against new libwnck
+- Update to 2.10.0
+- Drop upstreamed patch
* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
- Stop libgswitchit using -Werror
commit b33cf057f631294bf7524e74641a1e70f2c76aee
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Mar 16 13:44:19 2005 +0000
Update to 2.10.0
diff --git a/.cvsignore b/.cvsignore
index e8d36f9..29725a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
gnome-applets-2.9.5.tar.bz2
gnome-applets-2.9.6.tar.bz2
+gnome-applets-2.10.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e2d8b4c..561d08f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.9.6
-Release: 2
+Version: 2.10.0
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -145,6 +145,10 @@ done
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Mar 16 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.10.0-1
+- Update to 2.10.0
+- Rebuild against new libwnck
+
* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
- Stop libgswitchit using -Werror
- Rebuild with gcc4
diff --git a/sources b/sources
index 3034690..f785105 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43dcb1c3b5f9c86fac373f186a0936b8 gnome-applets-2.9.6.tar.bz2
+c230df43a21a0d788197b5b0f3e688f1 gnome-applets-2.10.0.tar.bz2
commit 0ce3b96d076ddd0b9ae12b5b1337289ec616f689
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Mar 2 18:02:30 2005 +0000
fix typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d491431..e2d8b4c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -72,8 +72,8 @@ fi
%setup -q
-%patch -p1 -b .mixer-crash-with-no-channel
-%patch -p1 -b .gcc4-fix
+%patch0 -p1 -b .mixer-crash-with-no-channel
+%patch1 -p1 -b .gcc4-fix
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
commit e17d1ae7bab5f72675b0baff137dc57bfeb9ffed
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Mar 2 18:01:59 2005 +0000
- Stop libgswitchit using -Werror
- Rebuild with gcc4
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7513a17..d491431 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -54,6 +54,7 @@ Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
Patch0: gnome-applets-2.9.5-mixer-crash-with-no-channels.patch
+Patch1: gnome-applets-2.9.6-gcc4-fix.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -71,7 +72,8 @@ fi
%setup -q
-%patch -p1 -b .mixer-crash-with-no-channels
+%patch -p1 -b .mixer-crash-with-no-channel
+%patch -p1 -b .gcc4-fix
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -144,6 +146,7 @@ done
%changelog
* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
+- Stop libgswitchit using -Werror
- Rebuild with gcc4
* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.6-1
commit 5f0c317807c6acd920fd18bcbccfea0ab3355ee3
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Mar 2 17:05:26 2005 +0000
- Rebuild with gcc4
diff --git a/gnome-applets.spec b/gnome-applets.spec
index daad7a3..7513a17 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.9.6
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -143,6 +143,9 @@ done
%{_libdir}/pkgconfig/gswitchit.pc
%changelog
+* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 1:2.9.6-2
+- Rebuild with gcc4
+
* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.6-1
- Update to 2.9.6
commit d38431bf3de182d3f026e7c42ae5b532647187b8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 9 15:45:56 2005 +0000
Update to 2.9.6
diff --git a/.cvsignore b/.cvsignore
index 548be1f..e8d36f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
gnome-applets-2.9.5.tar.bz2
+gnome-applets-2.9.6.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b2e2873..daad7a3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.9.5
-Release: 4
+Version: 2.9.6
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -142,8 +142,10 @@ done
%{_includedir}/libgswitchit
%{_libdir}/pkgconfig/gswitchit.pc
-
%changelog
+* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.6-1
+- Update to 2.9.6
+
* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-4
- Add patch for mixer crash - #147282.
Thanks Neil Paris for tracking down.
diff --git a/sources b/sources
index ca723d3..3034690 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc8419d673eb2a994a1f87864e39b4a2 gnome-applets-2.9.5.tar.bz2
+43dcb1c3b5f9c86fac373f186a0936b8 gnome-applets-2.9.6.tar.bz2
commit b8fe3a00d109ce8a0a70c3ccb99abe39976c97f7
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Feb 9 12:23:10 2005 +0000
rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index dff75c2..b2e2873 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.9.5
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -144,7 +144,7 @@ done
%changelog
-* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-3
+* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-4
- Add patch for mixer crash - #147282.
Thanks Neil Paris for tracking down.
commit 5241c320400b4df93bd16e4714d6cdd1d9e27a3d
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Feb 9 12:12:22 2005 +0000
oops
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d322b33..dff75c2 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -143,7 +143,7 @@ done
%{_libdir}/pkgconfig/gswitchit.pc
-%change log
+%changelog
* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-3
- Add patch for mixer crash - #147282.
Thanks Neil Paris for tracking down.
commit d70f544aed60cb9e716632e456b262c123196ebf
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Feb 9 12:00:05 2005 +0000
- Add patch for mixer crash - #147282. Thanks Neil Paris for tracking down.
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0eda6b4..d322b33 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.9.5
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -53,6 +53,8 @@ Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
+Patch0: gnome-applets-2.9.5-mixer-crash-with-no-channels.patch
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -69,6 +71,8 @@ fi
%setup -q
+%patch -p1 -b .mixer-crash-with-no-channels
+
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
%build
@@ -139,7 +143,11 @@ done
%{_libdir}/pkgconfig/gswitchit.pc
-%changelog
+%change log
+* Wed Feb 9 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.5-3
+- Add patch for mixer crash - #147282.
+ Thanks Neil Paris for tracking down.
+
* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.5-2
- Fix schemas list (#146880, #147011)
commit 75628cd712376bb4bbcb57d30a35b537f32508cf
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Fri Feb 4 16:05:42 2005 +0000
- Fix schemas list (#146880, #147011)
diff --git a/.cvsignore b/.cvsignore
index ef8add3..548be1f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-gnome-applets-2.7.3.tar.bz2
-gnome-applets-2.8.0.tar.bz2
gnome-applets-2.9.5.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2eabbb9..0eda6b4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.9.5
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -105,7 +105,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
%ifarch %{apmd_archs}
SCHEMAS="battstat.schemas"
%endif
-SCHEMAS="$SCHEMAS charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
+SCHEMAS="$SCHEMAS charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -140,6 +140,9 @@ done
%changelog
+* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.5-2
+- Fix schemas list (#146880, #147011)
+
* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.5-1
- Update to 2.9.5
commit 800de2b5425563a835e46ce10c702f4208599080
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 1 19:50:15 2005 +0000
Bleh
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7ae4d11..2eabbb9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -128,8 +128,10 @@ done
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
-#%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*
+%ifarch %{apmd_archs}
+%{_sysconfdir}/sound
+%endif
# These are really devel files, but we don't want a devel package
# for just three files
commit aad156d8ef58e6bd2b793f6bff0668e2f98fbd5a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 1 18:50:57 2005 +0000
ppc specific file list fix
diff --git a/gnome-applets.spec b/gnome-applets.spec
index e21e235..7ae4d11 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -124,9 +124,6 @@ done
%{_datadir}/gnome
%{_datadir}/gnome-applets
%{_datadir}/xmodmap
-%ifarch %{apmd_archs}
-%{_datadir}/battstat_applet
-%endif
%{_datadir}/omf/gnome-applets
%{_bindir}/*
%{_libdir}/bonobo/servers/*
commit add8d367b8f6e5aa5c5550ff10b7d4c9e5e14bbb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 1 18:43:44 2005 +0000
Adjust file paths, use DESTDIR instead of %makeinstall
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 51768bf..e21e235 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,8 +27,6 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Patch0: gnome-applets-2.9.5-paths.patch
-
Prereq: scrollkeeper >= 0.1.4
BuildRequires: glib2-devel >= %{glib2_version}
@@ -70,7 +68,6 @@ fi
%endif
%setup -q
-%patch0 -p1 -b .paths
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -89,7 +86,7 @@ make
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
%find_lang %{po_package}
@@ -121,26 +118,21 @@ done
%doc AUTHORS COPYING ChangeLog NEWS README
+%{_datadir}/pixmaps
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome/gkb
-%{_datadir}/gnome/help/*
-%{_datadir}/geyes
+%{_datadir}/gnome
+%{_datadir}/gnome-applets
%{_datadir}/xmodmap
-%{_datadir}/gweather
-%{_datadir}/stickynotes
%ifarch %{apmd_archs}
%{_datadir}/battstat_applet
%endif
-%{_datadir}/gswitchit
%{_datadir}/omf/gnome-applets
-%{_datadir}/gen_util
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
#%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/sound/events/*
# These are really devel files, but we don't want a devel package
# for just three files
commit ecf72008efb70a07a103373dade10e791729973e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 1 16:58:44 2005 +0000
Typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2823b2b..51768bf 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,7 +27,7 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Path0: gnome-applets-2.9.5-paths.patch
+Patch0: gnome-applets-2.9.5-paths.patch
Prereq: scrollkeeper >= 0.1.4
commit a31229f77a84220eaa238a59eb093bb55616d15e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 1 16:58:05 2005 +0000
Fix some autofoo issues
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 457ad78..2823b2b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,6 +27,8 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Path0: gnome-applets-2.9.5-paths.patch
+
Prereq: scrollkeeper >= 0.1.4
BuildRequires: glib2-devel >= %{glib2_version}
@@ -68,6 +70,7 @@ fi
%endif
%setup -q
+%patch0 -p1 -b .paths
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
commit 609c3768d273c7d9bf22322d59ecc06c106b0cb8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 31 20:55:24 2005 +0000
Fix libxklavier version
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cac582c..457ad78 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -10,7 +10,7 @@
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.7.6-2
-%define libxklavier_version 0.97
+%define libxklavier_version 1.13
%define apmd_version 3.0.2-22
%define po_package gnome-applets-2.0
commit 298781523ce2e62d73fd5d9dde969d62bd1b15f0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 31 20:51:12 2005 +0000
Remove unnecessary auto-x invokations
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f52c36b..cac582c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -73,12 +73,6 @@ cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
%build
-# .uniquecd patch modifies cdplayer/Makefile.am
-# .themed-mixer-icons patch modifies cdplayer/Makefile.am
-aclocal
-automake
-autoconf
-
%ifarch %{apmd_archs}
%define DisableBattstat ""
%else
commit 255475daf5b86fceb605b7e10cd1aea1910d207a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 31 20:40:52 2005 +0000
Fix a typo
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ffe3c8c..f52c36b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -40,7 +40,7 @@ BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-%ifarch ${apmd_archs}
+%ifarch %{apmd_archs}
BuildRequires: apmd >= %{apmd_version}
%endif
commit 43d0f82f267d4c55cadd5febcfd1bb9dc2a5e1a3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 31 20:35:10 2005 +0000
Upload the new tarball
diff --git a/.cvsignore b/.cvsignore
index cccaf27..ef8add3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
gnome-applets-2.7.3.tar.bz2
gnome-applets-2.8.0.tar.bz2
+gnome-applets-2.9.5.tar.bz2
diff --git a/sources b/sources
index 42be185..ca723d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-956ab6b71db8b75676f7e123c5d68b55 gnome-applets-2.8.0.tar.bz2
+dc8419d673eb2a994a1f87864e39b4a2 gnome-applets-2.9.5.tar.bz2
commit 26804d32774f2654dde30a0c3e8467c6a12c7637
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 31 20:34:22 2005 +0000
Update to 2.9.5
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
deleted file mode 100644
index 4d3bc0d..0000000
--- a/gnome-applets-2.3.6-ppp-command.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-applets-2.3.6/modemlights/modemlights.schemas.in.ppp-command 2003-08-18 14:18:22.000000000 +0200
-+++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:59.000000000 +0200
-@@ -27,7 +27,7 @@
- <key>/schemas/apps/modemlights/prefs/connect</key>
- <owner>modemlights_applet2</owner>
- <type>string</type>
-- <default>pppon</default>
-+ <default>/sbin/ifup ppp0</default>
- <locale name="C">
- <short>Command executed when connecting</short>
- <long></long>
-@@ -38,7 +38,7 @@
- <key>/schemas/apps/modemlights/prefs/disconnect</key>
- <owner>modemlights_applet2</owner>
- <type>string</type>
-- <default>pppoff</default>
-+ <default>/sbin/ifdown ppp0</default>
- <locale name="C">
- <short>Command executed when disconnecting</short>
- <long></long>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cb8cf99..ffe3c8c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.8.0
-Release: 6
+Version: 2.9.5
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -53,25 +53,6 @@ Requires: gnome-netstatus >= 2.8.0-2
Obsoletes: battstat_applet
-Source2: omf.make
-
-# Upstream in 2.8.1
-Source3: charpick.png
-Source4: gnome-eyes.png
-Source5: gswitchit-applet.png
-
-Patch1: gnome-applets-2.3.6-ppp-command.patch
-# Register ourself globally so that gnome-cd can tell if we are
-# running or not.
-Patch2: gnome-applets-2.3.6-uniquecd.patch
-# Shrink volume applet for msw
-Patch3: gnome-applets-2.8.0-themed-mixer-icons.patch
-# Activate netstatus for wireless-applet backwards compat (#131652)
-Patch4: gnome-applets-2.8.0-use-netstatus-for-wireless.patch
-# Fix crash in #134572 - will go upstream
-Patch5: gnome-applet-2.8.0-gweather-crash-with-prefs.patch
-
-
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -88,18 +69,7 @@ fi
%setup -q
-cp %{SOURCE2} .
-
-%patch1 -p1 -b .ppp-command
-%patch2 -p1 -b .uniquecd
-%patch3 -p1 -b .themed-mixer-icons
-%patch4 -p1 -b .use-netstatus-for-wireless
-%patch5 -p1 -b .gweather-crash-with-prefs
-
-cp %{SOURCE3} charpick/
-cp %{SOURCE4} geyes/
-cp %{SOURCE5} gswitchit/
-cp %{SOURCE5} gswitchit/gswitchit-properties-capplet.png
+cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
%build
@@ -130,14 +100,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-# Remove the wireless applet
-rm -rf $RPM_BUILD_ROOT%{_libexecdir}/wireless-applet
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-2.0/ui/GNOME_WirelessApplet.xml
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/wireless
-rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-applets/wireless*.omf
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/wireless-applet
-rm -rf $RPM_BUILD_ROOT%{_datadir}/wireless-applet
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -162,7 +124,6 @@ done
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome/gkb
@@ -191,6 +152,9 @@ done
%changelog
+* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.5-1
+- Update to 2.9.5
+
* Sun Jan 30 2005 Florian La Roche <laroche(a)redhat.com>
- rebuild against new libs
commit 5d77c16a70ac731e7ad7fa86d7485c4cda20fdee
Author: Florian La Roche <laroche(a)fedoraproject.org>
Date: Sun Jan 30 15:58:45 2005 +0000
- rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e86991..cb8cf99 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.8.0
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -191,6 +191,9 @@ done
%changelog
+* Sun Jan 30 2005 Florian La Roche <laroche(a)redhat.com>
+- rebuild against new libs
+
* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-5
- Add patch to fix crash with gweather preferences (#134572)
commit 8b8c121ab7f18e58dc47256760fb410eb1d1dbb2
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Thu Oct 7 17:46:25 2004 +0000
- Add patch to fix crash with gweather preferences (#134572)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bab180d..3e86991 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.8.0
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -68,6 +68,8 @@ Patch2: gnome-applets-2.3.6-uniquecd.patch
Patch3: gnome-applets-2.8.0-themed-mixer-icons.patch
# Activate netstatus for wireless-applet backwards compat (#131652)
Patch4: gnome-applets-2.8.0-use-netstatus-for-wireless.patch
+# Fix crash in #134572 - will go upstream
+Patch5: gnome-applet-2.8.0-gweather-crash-with-prefs.patch
%description
@@ -92,6 +94,7 @@ cp %{SOURCE2} .
%patch2 -p1 -b .uniquecd
%patch3 -p1 -b .themed-mixer-icons
%patch4 -p1 -b .use-netstatus-for-wireless
+%patch5 -p1 -b .gweather-crash-with-prefs
cp %{SOURCE3} charpick/
cp %{SOURCE4} geyes/
@@ -188,6 +191,9 @@ done
%changelog
+* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-5
+- Add patch to fix crash with gweather preferences (#134572)
+
* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-4
- Fix mixer icons bugs - #134224 and #134773
commit 5f2a1c5f259a60f3051a77753c3974fbfcb4e3c4
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Thu Oct 7 16:03:23 2004 +0000
fixup %files
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d38a47c..bab180d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -159,9 +159,11 @@ done
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/pixmaps
-%{_datadir}/gnome-2.0
-%{_datadir}/gnome
+%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome/gkb
+%{_datadir}/gnome/help/*
%{_datadir}/geyes
%{_datadir}/xmodmap
%{_datadir}/gweather
@@ -170,14 +172,14 @@ done
%{_datadir}/battstat_applet
%endif
%{_datadir}/gswitchit
-%{_datadir}/omf
+%{_datadir}/omf/gnome-applets
%{_datadir}/gen_util
%{_bindir}/*
-%{_libdir}/bonobo
+%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
#%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/sound
+%{_sysconfdir}/sound/events/*
# These are really devel files, but we don't want a devel package
# for just three files
commit c5de0ebcbd31840c287f4f7c1687aa02b6a38018
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Thu Oct 7 15:48:48 2004 +0000
only require apmd on certain archs
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 44bdd7a..d38a47c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -40,7 +40,9 @@ BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+%ifarch ${apmd_archs}
BuildRequires: apmd >= %{apmd_version}
+%endif
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
commit 68ea5a25f342b74a5fc8788742373341aa64291c
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Thu Oct 7 15:32:32 2004 +0000
- Fix mixer icons bugs - #134224 and #134773
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0c69434..44bdd7a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.8.0
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -63,9 +63,9 @@ Patch1: gnome-applets-2.3.6-ppp-command.patch
# running or not.
Patch2: gnome-applets-2.3.6-uniquecd.patch
# Shrink volume applet for msw
-Patch4: gnome-applets-2.7.2-smallvolume.patch
+Patch3: gnome-applets-2.8.0-themed-mixer-icons.patch
# Activate netstatus for wireless-applet backwards compat (#131652)
-Patch5: gnome-applets-2.8.0-use-netstatus-for-wireless.patch
+Patch4: gnome-applets-2.8.0-use-netstatus-for-wireless.patch
%description
@@ -88,8 +88,8 @@ cp %{SOURCE2} .
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
-%patch4 -p1 -b .smallvolume
-%patch5 -p1 -b .use-netstatus-for-wireless
+%patch3 -p1 -b .themed-mixer-icons
+%patch4 -p1 -b .use-netstatus-for-wireless
cp %{SOURCE3} charpick/
cp %{SOURCE4} geyes/
@@ -99,6 +99,7 @@ cp %{SOURCE5} gswitchit/gswitchit-properties-capplet.png
%build
# .uniquecd patch modifies cdplayer/Makefile.am
+# .themed-mixer-icons patch modifies cdplayer/Makefile.am
aclocal
automake
autoconf
@@ -183,6 +184,9 @@ done
%changelog
+* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.0-4
+- Fix mixer icons bugs - #134224 and #134773
+
* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-3
- Add new icons from upstream
commit 472195805b4f62553c4e628e2bd4d171058dbee5
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Wed Sep 29 12:45:10 2004 +0000
- Add new icons from upstream
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b35e25d..0c69434 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.8.0
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -53,6 +53,11 @@ Obsoletes: battstat_applet
Source2: omf.make
+# Upstream in 2.8.1
+Source3: charpick.png
+Source4: gnome-eyes.png
+Source5: gswitchit-applet.png
+
Patch1: gnome-applets-2.3.6-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
@@ -86,6 +91,11 @@ cp %{SOURCE2} .
%patch4 -p1 -b .smallvolume
%patch5 -p1 -b .use-netstatus-for-wireless
+cp %{SOURCE3} charpick/
+cp %{SOURCE4} geyes/
+cp %{SOURCE5} gswitchit/
+cp %{SOURCE5} gswitchit/gswitchit-properties-capplet.png
+
%build
# .uniquecd patch modifies cdplayer/Makefile.am
@@ -173,6 +183,9 @@ done
%changelog
+* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-3
+- Add new icons from upstream
+
* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
- Remove the wireless applet and add patch to use the netstatus
applet for backwards compat. bug #131652.
commit f308b41dafe61b643938183e81dbe6e6bedca4d3
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Tue Sep 21 16:35:58 2004 +0000
- Remove the wireless applet and add patch to use the netstatus applet for
backwards compat. bug #131652.
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ae067e9..b35e25d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.8.0
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -46,6 +46,9 @@ Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
+# For wireless-applet backwards compat
+Requires: gnome-netstatus >= 2.8.0-2
+
Obsoletes: battstat_applet
Source2: omf.make
@@ -56,6 +59,8 @@ Patch1: gnome-applets-2.3.6-ppp-command.patch
Patch2: gnome-applets-2.3.6-uniquecd.patch
# Shrink volume applet for msw
Patch4: gnome-applets-2.7.2-smallvolume.patch
+# Activate netstatus for wireless-applet backwards compat (#131652)
+Patch5: gnome-applets-2.8.0-use-netstatus-for-wireless.patch
%description
@@ -79,6 +84,7 @@ cp %{SOURCE2} .
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
%patch4 -p1 -b .smallvolume
+%patch5 -p1 -b .use-netstatus-for-wireless
%build
@@ -108,6 +114,14 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+# Remove the wireless applet
+rm -rf $RPM_BUILD_ROOT%{_libexecdir}/wireless-applet
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-2.0/ui/GNOME_WirelessApplet.xml
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/wireless
+rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/gnome-applets/wireless*.omf
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/wireless-applet
+rm -rf $RPM_BUILD_ROOT%{_datadir}/wireless-applet
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -144,7 +158,6 @@ done
%endif
%{_datadir}/gswitchit
%{_datadir}/omf
-%{_datadir}/wireless-applet
%{_datadir}/gen_util
%{_bindir}/*
%{_libdir}/bonobo
@@ -160,6 +173,10 @@ done
%changelog
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
+- Remove the wireless applet and add patch to use the netstatus
+ applet for backwards compat. bug #131652.
+
* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
- Update to 2.8.0
commit 505fdfccd1c948b7b723e214f107ffcf3432f9bc
Author: Mark McLoughlin <markmc(a)fedoraproject.org>
Date: Tue Sep 21 10:41:55 2004 +0000
- Update to 2.8.0
diff --git a/.cvsignore b/.cvsignore
index d0b147a..cccaf27 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
gnome-applets-2.7.3.tar.bz2
+gnome-applets-2.8.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 55489f9..ae067e9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.7.3
-Release: 2
+Version: 2.8.0
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -160,6 +160,9 @@ done
%changelog
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
+- Update to 2.8.0
+
* Wed Sep 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-2
- Rebuild
diff --git a/sources b/sources
index eb6d00f..42be185 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dbd25682c55b8e9fa4e448653723adc gnome-applets-2.7.3.tar.bz2
+956ab6b71db8b75676f7e123c5d68b55 gnome-applets-2.8.0.tar.bz2
commit 95addefc413d65a21a33d4f40a9c8721fcb09d6d
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:26:01 2004 +0000
auto-import changelog data from gnome-applets-2.7.3-2.src.rpm
Wed Sep 01 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-2
- Rebuild
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 82ab16d..55489f9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.7.3
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -160,6 +160,9 @@ done
%changelog
+* Wed Sep 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-2
+- Rebuild
+
* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-1
- Update to 2.7.3
commit 2d26e7a64d965f74e1f85440997461290336c6cd
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:55 2004 +0000
auto-import changelog data from gnome-applets-2.7.3-1.src.rpm
Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-1
- Update to 2.7.3
diff --git a/.cvsignore b/.cvsignore
index 100484d..d0b147a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.7.2.tar.bz2
+gnome-applets-2.7.3.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 88164d4..82ab16d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.7.2
-Release: 2
+Version: 2.7.3
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -160,6 +160,9 @@ done
%changelog
+* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.3-1
+- Update to 2.7.3
+
* Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
- Run mc-install-default-macros in %post
- Fixed small-volume patch from Nathan Fredrickson <nathan(a)silverorange.com>
diff --git a/sources b/sources
index ddaaa46..eb6d00f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc5fb7469a8e6dc1954e3a06cb3903b4 gnome-applets-2.7.2.tar.bz2
+2dbd25682c55b8e9fa4e448653723adc gnome-applets-2.7.3.tar.bz2
commit a474d5ba89b1ac08afeaef567d440453d59815d8
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:44 2004 +0000
auto-import changelog data from gnome-applets-2.7.2-2.src.rpm
Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
- Run mc-install-default-macros in %post
- Fixed small-volume patch from Nathan Fredrickson
<nathan(a)silverorange.com>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b22576e..88164d4 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.7.2
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -55,7 +55,7 @@ Patch1: gnome-applets-2.3.6-ppp-command.patch
# running or not.
Patch2: gnome-applets-2.3.6-uniquecd.patch
# Shrink volume applet for msw
-Patch4: gnome-applets-2.3.6-smallvolume.patch
+Patch4: gnome-applets-2.7.2-smallvolume.patch
%description
@@ -123,6 +123,7 @@ SCHEMAS="$SCHEMAS charpick.schemas drivemount.schemas geyes.schemas gkb.schemas
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
+%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
%postun -p /sbin/ldconfig
@@ -159,6 +160,10 @@ done
%changelog
+* Fri Aug 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-2
+- Run mc-install-default-macros in %post
+- Fixed small-volume patch from Nathan Fredrickson <nathan(a)silverorange.com>
+
* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
- Update to 2.7.2
commit dd8f1cd706f11f97d9b2fae6c6ce6c0a61003fa4
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:34 2004 +0000
auto-import changelog data from gnome-applets-2.7.2-1.src.rpm
Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
- Update to 2.7.2
diff --git a/.cvsignore b/.cvsignore
index 832d52a..100484d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.7.1.tar.bz2
+gnome-applets-2.7.2.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index db85150..b22576e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.7.1
-Release: 2
+Version: 2.7.2
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -159,6 +159,9 @@ done
%changelog
+* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.2-1
+- Update to 2.7.2
+
* Wed Aug 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-2
- Remove reference to cdplayer.schemas which has been removed (bug #129490)
diff --git a/sources b/sources
index 4def8c1..ddaaa46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e935de38203a2d21c8a55de34f364ef0 gnome-applets-2.7.1.tar.bz2
+dc5fb7469a8e6dc1954e3a06cb3903b4 gnome-applets-2.7.2.tar.bz2
commit 221fbc5a4c6f335333658a65b59d42643cbd777f
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:30 2004 +0000
auto-import changelog data from gnome-applets-2.7.1-2.src.rpm
Wed Aug 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-2
- Remove reference to cdplayer.schemas which has been removed (bug #129490)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d97dbc7..db85150 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.7.1
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -119,7 +119,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
%ifarch %{apmd_archs}
SCHEMAS="battstat.schemas"
%endif
-SCHEMAS="$SCHEMAS cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
+SCHEMAS="$SCHEMAS charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -159,6 +159,9 @@ done
%changelog
+* Wed Aug 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-2
+- Remove reference to cdplayer.schemas which has been removed (bug #129490)
+
* Thu Aug 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-1
- Update to 2.7.1
- Remove battstat-arg patch - upstream now
commit 483880599e2e2700502a0f519e05d93f63c8297d
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:21 2004 +0000
auto-import changelog data from gnome-applets-2.7.1-1.src.rpm
Thu Aug 05 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-1
- Update to 2.7.1
- Remove battstat-arg patch - upstream now
diff --git a/.cvsignore b/.cvsignore
index 1de2154..832d52a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.6.2.1.tar.bz2
+gnome-applets-2.7.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 21cd423..d97dbc7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.6.2.1
-Release: 2
+Version: 2.7.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -50,7 +50,6 @@ Obsoletes: battstat_applet
Source2: omf.make
-Patch0: gnome-applets-2.6.2.1-disable-battstat-arg.diff
Patch1: gnome-applets-2.3.6-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
@@ -77,7 +76,6 @@ fi
cp %{SOURCE2} .
-%patch0 -p1 -b .disable-battstat-arg
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
%patch4 -p1 -b .smallvolume
@@ -161,6 +159,10 @@ done
%changelog
+* Thu Aug 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.1-1
+- Update to 2.7.1
+- Remove battstat-arg patch - upstream now
+
* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-2
- rebuild
diff --git a/sources b/sources
index 9b387c9..4def8c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d29dc21035db8b93671058d7f1ac4aaa gnome-applets-2.6.2.1.tar.bz2
+e935de38203a2d21c8a55de34f364ef0 gnome-applets-2.7.1.tar.bz2
commit 199e97a62f698b6755c5c1d6ab62a3e1c2355aed
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:25:09 2004 +0000
auto-import changelog data from gnome-applets-2.6.2.1-2.src.rpm
2.6.2.1-2
- rebuild
2.6.2.1-1
- Update to 2.6.2.1
- Re-do the way we decide whether to build the battstat applet. Should fix
122379
- Remove some patches that have gone upstream
diff --git a/.cvsignore b/.cvsignore
index 773e951..1de2154 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.6.0.tar.bz2
+gnome-applets-2.6.2.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5c21ef5..21cd423 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,5 +1,5 @@
# apmd is built on %{ix86} and ppc
-%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc64 x86_64
+%define apmd_archs %{ix86} ppc
%define glib2_version 2.2.0
%define pango_version 1.2.0
@@ -17,8 +17,8 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.6.0
-Release: 8
+Version: 2.6.2.1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -50,17 +50,13 @@ Obsoletes: battstat_applet
Source2: omf.make
+Patch0: gnome-applets-2.6.2.1-disable-battstat-arg.diff
Patch1: gnome-applets-2.3.6-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
Patch2: gnome-applets-2.3.6-uniquecd.patch
-# Keep the CD device closed except when actually accessing it
-# (bugzilla.gnome.org 91512)
-Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
Patch4: gnome-applets-2.3.6-smallvolume.patch
-Patch5: gnome-applets-2.5.6-libapm.patch
-Patch6: gnome-applets-2.6.0-channelsettings.patch
%description
@@ -70,8 +66,7 @@ manager for the X Window System. The gnome-applets package provides
small utilities for the GNOME panel.
%prep
-%ifnarch %{no_apm_archs}
-
+%ifarch %{apmd_archs}
if ! test -e /usr/lib/libapm.a ; then
echo "You must have apmd installed"
exit 1
@@ -82,14 +77,10 @@ fi
cp %{SOURCE2} .
+%patch0 -p1 -b .disable-battstat-arg
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
-#patch3 -p1 -b .keepclosed
%patch4 -p1 -b .smallvolume
-# Fix up mode 0000 files created by patch2
-chmod -R a+r .
-%patch5 -p1 -b .libapm
-%patch6 -p1 -b .channelsettings
%build
@@ -98,7 +89,13 @@ aclocal
automake
autoconf
-%configure
+%ifarch %{apmd_archs}
+%define DisableBattstat ""
+%else
+%define DisableBattstat "--disable-battstat"
+%endif
+
+%configure %{DisableBattstat}
make
%install
@@ -121,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-%ifnarch s390 s390x
+%ifarch %{apmd_archs}
SCHEMAS="battstat.schemas"
%endif
SCHEMAS="$SCHEMAS cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
@@ -143,7 +140,7 @@ done
%{_datadir}/xmodmap
%{_datadir}/gweather
%{_datadir}/stickynotes
-%ifnarch %{no_apm_archs}
+%ifarch %{apmd_archs}
%{_datadir}/battstat_applet
%endif
%{_datadir}/gswitchit
@@ -164,6 +161,15 @@ done
%changelog
+* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-2
+- rebuild
+
+* Wed Jul 21 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.2.1-1
+- Update to 2.6.2.1
+- Re-do the way we decide whether to build the battstat applet.
+ Should fix 122379
+- Remove some patches that have gone upstream
+
* Tue Jun 22 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-8
- Fix typo with apmd requires
diff --git a/sources b/sources
index 8756c93..9b387c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c2dcde8fc94dd43f8aa7be52ca9c103 gnome-applets-2.6.0.tar.bz2
+d29dc21035db8b93671058d7f1ac4aaa gnome-applets-2.6.2.1.tar.bz2
commit 534eb86b7b63fe8520e78439c877b119c8b307b2
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:24:54 2004 +0000
auto-import changelog data from gnome-applets-2.6.0-8.src.rpm
2.6.0-8
- Fix typo with apmd requires
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 547e8a0..5c21ef5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -11,14 +11,14 @@
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.7.6-2
%define libxklavier_version 0.97
-%define ampd_version 3.0.2-22
+%define apmd_version 3.0.2-22
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.6.0
-Release: 7
+Release: 8
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -164,6 +164,9 @@ done
%changelog
+* Tue Jun 22 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-8
+- Fix typo with apmd requires
+
* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
- Remove ifarch'd buildrequires on apmd
commit 511d72ae326768a396b43e7380b163ae2695c56e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:24:41 2004 +0000
auto-import changelog data from gnome-applets-2.6.0-7.src.rpm
Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
- Remove ifarch'd buildrequires on apmd
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c28b669..547e8a0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -18,7 +18,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.6.0
-Release: 5
+Release: 7
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -40,9 +40,7 @@ BuildRequires: libxklavier-devel >= %{libxklavier_version}
BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-%ifnarch %{no_apm_archs}
BuildRequires: apmd >= %{apmd_version}
-%endif
Requires: gnome-panel >= %{gnome_panel_version}
Requires: libxklavier >= %{libxklavier_version}
@@ -166,6 +164,10 @@ done
%changelog
+* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+- Remove ifarch'd buildrequires on apmd
+
* Thu May 05 2004 Nils Philippsen <nphilipp(a)redhat.com> 1:2.6.0-5
- fix #120354 (mixer applet forgets channel settings)
commit 037cb92ab0a70d7a08d979f02b23155dc89e4790
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:24:33 2004 +0000
auto-import changelog data from gnome-applets-2.6.0-5.src.rpm
2.6.0-5
- fix #120354 (mixer applet forgets channel settings)
2.6.0-4
- fix error during update on s390(x) due to missing battery applet
2.6.0-3
- Build battstat on ppc too
2.6.0-2
- Add gswitchit.schemas to SCHEMAS
Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
- Update to 2.6.0
diff --git a/.cvsignore b/.cvsignore
index 598a8d8..773e951 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.5.7.tar.bz2
+gnome-applets-2.6.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ea340ed..c28b669 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,4 +1,5 @@
-%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc ppc64 x86_64
+# apmd is built on %{ix86} and ppc
+%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc64 x86_64
%define glib2_version 2.2.0
%define pango_version 1.2.0
@@ -10,13 +11,14 @@
%define libbonoboui_version 2.3.0
%define gstreamer_plugins_version 0.7.6-2
%define libxklavier_version 0.97
+%define ampd_version 3.0.2-22
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.5.7
-Release: 4
+Version: 2.6.0
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -39,7 +41,7 @@ BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
%ifnarch %{no_apm_archs}
-BuildRequires: apmd
+BuildRequires: apmd >= %{apmd_version}
%endif
Requires: gnome-panel >= %{gnome_panel_version}
@@ -60,6 +62,7 @@ Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
Patch4: gnome-applets-2.3.6-smallvolume.patch
Patch5: gnome-applets-2.5.6-libapm.patch
+Patch6: gnome-applets-2.6.0-channelsettings.patch
%description
@@ -88,6 +91,7 @@ cp %{SOURCE2} .
# Fix up mode 0000 files created by patch2
chmod -R a+r .
%patch5 -p1 -b .libapm
+%patch6 -p1 -b .channelsettings
%build
@@ -119,7 +123,10 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="battstat.schemas cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
+%ifnarch s390 s390x
+SCHEMAS="battstat.schemas"
+%endif
+SCHEMAS="$SCHEMAS cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -159,6 +166,21 @@ done
%changelog
+* Thu May 05 2004 Nils Philippsen <nphilipp(a)redhat.com> 1:2.6.0-5
+- fix #120354 (mixer applet forgets channel settings)
+
+* Thu Apr 29 2004 Karsten Hopp <karsten(a)redhat.de> 1:2.6.0-4
+- fix error during update on s390(x) due to missing battery applet
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 1:2.6.0-3
+- Build battstat on ppc too
+
+* Wed Apr 14 2004 Alex Larsson <alexl(a)redhat.com> 1:2.6.0-2
+- Add gswitchit.schemas to SCHEMAS
+
+* Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
+- Update to 2.6.0
+
* Tue Mar 16 2004 Jeremy Katz <katzj(a)redhat.com> 1:2.5.7-4
- rebuild for new gstreamer
diff --git a/sources b/sources
index 88cc1ad..8756c93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1b053ec93d861dbd07052e66895647b gnome-applets-2.5.7.tar.bz2
+9c2dcde8fc94dd43f8aa7be52ca9c103 gnome-applets-2.6.0.tar.bz2
commit c8bba04285825500fcd2d8516f1190f52e3b3488
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:24:10 2004 +0000
auto-import changelog data from gnome-applets-2.5.7-4.src.rpm
2.5.7-4
- rebuild for new gstreamer
Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-3
- Update Requires/BuildRequires to include gstreamer-plugins
Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-2
- Rebuild
Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-1
- Update to 2.5.7
- Add gnome-panel-devel BuildRequires
Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
2.5.6-1
- update to 2..5.6
Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
diff --git a/.cvsignore b/.cvsignore
index c024612..598a8d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.5.4.tar.bz2
+gnome-applets-2.5.7.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2f95c28..ea340ed 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,17 +4,19 @@
%define pango_version 1.2.0
%define gtk2_version 2.2.0
%define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.5.0
+%define gnome_panel_version 2.5.91
%define libgtop2_version 2.5.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
+%define gstreamer_plugins_version 0.7.6-2
+%define libxklavier_version 0.97
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.5.4
-Release: 1
+Version: 2.5.7
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -28,19 +30,21 @@ Prereq: scrollkeeper >= 0.1.4
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: gnome-panel >= %{gnome_panel_version}
+BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: libxklavier-devel >= %{libxklavier_version}
+BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version}
BuildRequires: /usr/bin/automake
-BuildRequires: libxklavier
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
%ifnarch %{no_apm_archs}
BuildRequires: apmd
%endif
Requires: gnome-panel >= %{gnome_panel_version}
-Requires: libxklavier
+Requires: libxklavier >= %{libxklavier_version}
+Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
Obsoletes: battstat_applet
@@ -55,8 +59,7 @@ Patch2: gnome-applets-2.3.6-uniquecd.patch
Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
Patch4: gnome-applets-2.3.6-smallvolume.patch
-
-Patch5: gnome-applets-2.5.4-xklavier.patch
+Patch5: gnome-applets-2.5.6-libapm.patch
%description
@@ -84,10 +87,7 @@ cp %{SOURCE2} .
%patch4 -p1 -b .smallvolume
# Fix up mode 0000 files created by patch2
chmod -R a+r .
-
-cd libgswitchit
-%patch5 -p0 -b .xklavier
-cd ..
+%patch5 -p1 -b .libapm
%build
@@ -138,7 +138,9 @@ done
%{_datadir}/xmodmap
%{_datadir}/gweather
%{_datadir}/stickynotes
+%ifnarch %{no_apm_archs}
%{_datadir}/battstat_applet
+%endif
%{_datadir}/gswitchit
%{_datadir}/omf
%{_datadir}/wireless-applet
@@ -157,6 +159,28 @@ done
%changelog
+* Tue Mar 16 2004 Jeremy Katz <katzj(a)redhat.com> 1:2.5.7-4
+- rebuild for new gstreamer
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-3
+- Update Requires/BuildRequires to include gstreamer-plugins
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-2
+- Rebuild
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.7-1
+- Update to 2.5.7
+- Add gnome-panel-devel BuildRequires
+
+* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Thu Feb 26 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.6-1
+- update to 2..5.6
+
+* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.4-1
- update to 2.5.4
diff --git a/sources b/sources
index 37d12d5..88cc1ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93c0dd87e32f4bbaec3d3c4859679db0 gnome-applets-2.5.4.tar.bz2
+a1b053ec93d861dbd07052e66895647b gnome-applets-2.5.7.tar.bz2
commit fad46b8ee5e4ca464d0cbafcaa2559ecde87134e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:23:53 2004 +0000
auto-import changelog data from gnome-applets-2.5.4-1.src.rpm
2.5.4-1
- update to 2.5.4
diff --git a/.cvsignore b/.cvsignore
index ed38322..c024612 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.4.1.tar.bz2
+gnome-applets-2.5.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cfe5ea3..2f95c28 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,8 +4,8 @@
%define pango_version 1.2.0
%define gtk2_version 2.2.0
%define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.3.0
-%define libgtop2_version 2.0.2
+%define gnome_panel_version 2.5.0
+%define libgtop2_version 2.5.0
%define gail_version 1.2.0
%define libbonoboui_version 2.3.0
@@ -13,7 +13,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.4.1
+Version: 2.5.4
Release: 1
Epoch: 1
License: GPL
@@ -32,13 +32,15 @@ BuildRequires: gnome-panel >= %{gnome_panel_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: /usr/bin/automake-1.4
+BuildRequires: /usr/bin/automake
+BuildRequires: libxklavier
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
%ifnarch %{no_apm_archs}
BuildRequires: apmd
%endif
Requires: gnome-panel >= %{gnome_panel_version}
+Requires: libxklavier
Obsoletes: battstat_applet
@@ -54,6 +56,9 @@ Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
Patch4: gnome-applets-2.3.6-smallvolume.patch
+Patch5: gnome-applets-2.5.4-xklavier.patch
+
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
@@ -80,10 +85,16 @@ cp %{SOURCE2} .
# Fix up mode 0000 files created by patch2
chmod -R a+r .
+cd libgswitchit
+%patch5 -p0 -b .xklavier
+cd ..
+
%build
# .uniquecd patch modifies cdplayer/Makefile.am
-automake-1.4
+aclocal
+automake
+autoconf
%configure
make
@@ -128,6 +139,7 @@ done
%{_datadir}/gweather
%{_datadir}/stickynotes
%{_datadir}/battstat_applet
+%{_datadir}/gswitchit
%{_datadir}/omf
%{_datadir}/wireless-applet
%{_datadir}/gen_util
@@ -138,7 +150,16 @@ done
%{_sysconfdir}/gconf/schemas/*
%{_sysconfdir}/sound
+# These are really devel files, but we don't want a devel package
+# for just three files
+%{_includedir}/libgswitchit
+%{_libdir}/pkgconfig/gswitchit.pc
+
+
%changelog
+* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 1:2.5.4-1
+- update to 2.5.4
+
* Fri Oct 3 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.4.1-1
- 2.4.1
diff --git a/sources b/sources
index 295d083..37d12d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf018f1692ab305954123d8123ef45d1 gnome-applets-2.4.1.tar.bz2
+93c0dd87e32f4bbaec3d3c4859679db0 gnome-applets-2.5.4.tar.bz2
commit 6c4d74eb938092efedb28bdcb3397e3e6397456e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:23:47 2004 +0000
auto-import changelog data from gnome-applets-2.4.1-1.src.rpm
2.4.1-1
- 2.4.1
2.3.7-1
- Add missing schemas to post (fixes #102710)
- Update to 2.3.7
- Add ifnarch apmd buildreq
2.3.6-1
- update for gnome 2.3
2.2.2-3
- require the newer libgtop2 so it rebuilds vs. correct soname
2.2.2-2
- rebuild against new libgtop
2.2.2-1
- 2.2.2
Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
- rebuilt
diff --git a/.cvsignore b/.cvsignore
index feee3d5..ed38322 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.2.0.tar.bz2
+gnome-applets-2.4.1.tar.bz2
diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch
new file mode 100644
index 0000000..4d3bc0d
--- /dev/null
+++ b/gnome-applets-2.3.6-ppp-command.patch
@@ -0,0 +1,20 @@
+--- gnome-applets-2.3.6/modemlights/modemlights.schemas.in.ppp-command 2003-08-18 14:18:22.000000000 +0200
++++ gnome-applets-2.3.6/modemlights/modemlights.schemas.in 2003-08-18 14:18:59.000000000 +0200
+@@ -27,7 +27,7 @@
+ <key>/schemas/apps/modemlights/prefs/connect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppon</default>
++ <default>/sbin/ifup ppp0</default>
+ <locale name="C">
+ <short>Command executed when connecting</short>
+ <long></long>
+@@ -38,7 +38,7 @@
+ <key>/schemas/apps/modemlights/prefs/disconnect</key>
+ <owner>modemlights_applet2</owner>
+ <type>string</type>
+- <default>pppoff</default>
++ <default>/sbin/ifdown ppp0</default>
+ <locale name="C">
+ <short>Command executed when disconnecting</short>
+ <long></long>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 9a76f8b..cfe5ea3 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,18 +3,18 @@
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.2.0
-%define libgnomeui_version 2.2.0
-%define gnome_panel_version 2.2.0.1-5
-%define libgtop2_version 2.0.0-5
+%define libgnomeui_version 2.3.0
+%define gnome_panel_version 2.3.0
+%define libgtop2_version 2.0.2
%define gail_version 1.2.0
-%define libbonoboui_version 2.2.0
+%define libbonoboui_version 2.3.0
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.2.0
-Release: 8
+Version: 2.4.1
+Release: 1
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -34,20 +34,25 @@ BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: /usr/bin/automake-1.4
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+%ifnarch %{no_apm_archs}
+BuildRequires: apmd
+%endif
Requires: gnome-panel >= %{gnome_panel_version}
Obsoletes: battstat_applet
-Patch1: gnome-applets-2.0.1-ppp-command.patch
+Source2: omf.make
+
+Patch1: gnome-applets-2.3.6-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
-Patch2: gnome-applets-2.2.0-uniquecd.patch
+Patch2: gnome-applets-2.3.6-uniquecd.patch
# Keep the CD device closed except when actually accessing it
# (bugzilla.gnome.org 91512)
Patch3: gnome-applets-2.0.1-keepclosed.patch
# Shrink volume applet for msw
-Patch4: gnome-applets-2.2.0-smallvolume.patch
+Patch4: gnome-applets-2.3.6-smallvolume.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -66,6 +71,8 @@ fi
%setup -q
+cp %{SOURCE2} .
+
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
#patch3 -p1 -b .keepclosed
@@ -101,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="modemlights.schemas cdplayer.schemas drivemount.schemas charpick.schemas geyes.schemas mini-commander.schemas gkb.schemas multiload.schemas gtik.schemas gweather.schemas battstat.schemas"
+SCHEMAS="battstat.schemas cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -119,6 +126,7 @@ done
%{_datadir}/geyes
%{_datadir}/xmodmap
%{_datadir}/gweather
+%{_datadir}/stickynotes
%{_datadir}/battstat_applet
%{_datadir}/omf
%{_datadir}/wireless-applet
@@ -131,6 +139,29 @@ done
%{_sysconfdir}/sound
%changelog
+* Fri Oct 3 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.4.1-1
+- 2.4.1
+
+* Wed Aug 27 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.7-1
+- Add missing schemas to post (fixes #102710)
+- Update to 2.3.7
+- Add ifnarch apmd buildreq
+
+* Mon Aug 18 2003 Alexander Larsson <alexl(a)redhat.com> 1:2.3.6-1
+- update for gnome 2.3
+
+* Mon Jul 28 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-3
+- require the newer libgtop2 so it rebuilds vs. correct soname
+
+* Fri Jul 18 2003 <timp(a)redhat.com> 1:2.2.2-2
+- rebuild against new libgtop
+
+* Mon Jul 7 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.2-1
+- 2.2.2
+
+* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
* Mon Feb 24 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-8
- change the volume applet size fix patch to work
diff --git a/sources b/sources
index e6e8965..295d083 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c5650d11253fd5c4716c96f688729f7 gnome-applets-2.2.0.tar.bz2
+bf018f1692ab305954123d8123ef45d1 gnome-applets-2.4.1.tar.bz2
commit c5a3de5809001f61600c09709a683d75144df508
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:23:20 2004 +0000
auto-import changelog data from gnome-applets-2.2.0-8.src.rpm
2.2.0-8
- change the volume applet size fix patch to work
Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
- debuginfo rebuild
2.2.0-6
- clamp size of volume applet to 24
2.2.0-5
- rebuild with datadir/wireless-applet and datadir/gen_util, someone got
overzealous deleting unpackaged files instead of packaging them. #82279
2.2.0-4
- rebuild to get new gnome-panel
2.2.0-3
- nuke buildreq Xft
2.2.0-2
- fix path in modemlights patch
2.2.0-1
- 2.2.0
Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
- rebuilt
2.1.3-1
- update to 2.1.3
Tue Dec 03 2002 Havoc Pennington <hp(a)redhat.com>
- require newer panel, libgtop2
- require newer libgnomeui, libbonoboui
2.1.1-2
- remove unpackaged files from the buildroot
2.1.1-1
- update to 2.1.1
- add x86_64 to no_apm_archs
diff --git a/.cvsignore b/.cvsignore
index 7a143c2..feee3d5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.0.1.tar.bz2
+gnome-applets-2.2.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bfde330..9a76f8b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,23 +1,24 @@
-%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc ppc64
+%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc ppc64 x86_64
-%define glib2_version 2.0.3
-%define pango_version 1.0.99
-%define gtk2_version 2.0.5
-%define libgnomeui_version 2.0.0
-%define gnome_panel_version 2.0.0
-%define libgtop2_version 2.0.0
-%define gail_version 0.17-2
+%define glib2_version 2.2.0
+%define pango_version 1.2.0
+%define gtk2_version 2.2.0
+%define libgnomeui_version 2.2.0
+%define gnome_panel_version 2.2.0.1-5
+%define libgtop2_version 2.0.0-5
+%define gail_version 1.2.0
+%define libbonoboui_version 2.2.0
%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.0.1
-Release: 6
+Version: 2.2.0
+Release: 8
Epoch: 1
License: GPL
Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}…
+Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -29,11 +30,10 @@ BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: gnome-panel >= %{gnome_panel_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
-BuildRequires: Xft
-BuildRequires: fontconfig
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: /usr/bin/automake-1.4
+BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
Requires: gnome-panel >= %{gnome_panel_version}
@@ -42,10 +42,12 @@ Obsoletes: battstat_applet
Patch1: gnome-applets-2.0.1-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
-Patch2: gnome-applets-2.0.1-uniquecd.patch
+Patch2: gnome-applets-2.2.0-uniquecd.patch
# Keep the CD device closed except when actually accessing it
# (bugzilla.gnome.org 91512)
Patch3: gnome-applets-2.0.1-keepclosed.patch
+# Shrink volume applet for msw
+Patch4: gnome-applets-2.2.0-smallvolume.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -66,7 +68,8 @@ fi
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
-%patch3 -p1 -b .keepclosed
+#patch3 -p1 -b .keepclosed
+%patch4 -p1 -b .smallvolume
# Fix up mode 0000 files created by patch2
chmod -R a+r .
@@ -118,6 +121,8 @@ done
%{_datadir}/gweather
%{_datadir}/battstat_applet
%{_datadir}/omf
+%{_datadir}/wireless-applet
+%{_datadir}/gen_util
%{_bindir}/*
%{_libdir}/bonobo
%{_libexecdir}/*
@@ -126,6 +131,49 @@ done
%{_sysconfdir}/sound
%changelog
+* Mon Feb 24 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-8
+- change the volume applet size fix patch to work
+
+* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
+- debuginfo rebuild
+
+* Sat Feb 22 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-6
+- clamp size of volume applet to 24
+
+* Thu Feb 20 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-5
+- rebuild with datadir/wireless-applet and datadir/gen_util,
+ someone got overzealous deleting unpackaged files instead
+ of packaging them. #82279
+
+* Fri Feb 14 2003 Jonathan Blandford <jrb(a)redhat.com> 1:2.2.0-4
+- rebuild to get new gnome-panel
+
+* Fri Feb 14 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-3
+- nuke buildreq Xft
+
+* Mon Feb 10 2003 Bill Nottingham <notting(a)redhat.com> 1:2.2.0-2
+- fix path in modemlights patch
+
+* Wed Feb 5 2003 Havoc Pennington <hp(a)redhat.com> 1:2.2.0-1
+- 2.2.0
+
+* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
+- rebuilt
+
+* Mon Dec 23 2002 Jeremy Katz <katzj(a)redhat.com> 1:2.1.3-1
+- update to 2.1.3
+
+* Tue Dec 3 2002 Havoc Pennington <hp(a)redhat.com>
+- require newer panel, libgtop2
+- require newer libgnomeui, libbonoboui
+
+* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-2
+- remove unpackaged files from the buildroot
+
+* Mon Dec 2 2002 Tim Powers <timp(a)redhat.com> 1:2.1.1-1
+- update to 2.1.1
+- add x86_64 to no_apm_archs
+
* Tue Aug 27 2002 Owen Taylor <otaylor(a)redhat.com>
- Register the cd player per-device (#72645).
diff --git a/sources b/sources
index eefa499..e6e8965 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40b9c65619467d364cb3e54086151ee0 gnome-applets-2.0.1.tar.bz2
+2c5650d11253fd5c4716c96f688729f7 gnome-applets-2.2.0.tar.bz2
commit 3ecff9c5187e9ce3ec4e60d04d69a52f2dced4dd
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:23:15 2004 +0000
auto-import changelog data from gnome-applets-2.0.1-6.src.rpm
Tue Aug 27 2002 Owen Taylor <otaylor(a)redhat.com>
- Register the cd player per-device (#72645).
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 279a209..bfde330 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -13,7 +13,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.0.1
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -87,6 +87,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
%find_lang %{po_package}
+# Clean up unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -123,6 +126,9 @@ done
%{_sysconfdir}/sound
%changelog
+* Tue Aug 27 2002 Owen Taylor <otaylor(a)redhat.com>
+- Register the cd player per-device (#72645).
+
* Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
- Keep the CD device closed except when actually accessing it
(bugzilla.gnome.org 91512)
commit adee96c199397d5f50f012376220fc55269169f7
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:23:04 2004 +0000
auto-import gnome-applets-2.0.1-5 from gnome-applets-2.0.1-5.src.rpm
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 408a267..279a209 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -13,7 +13,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.0.1
-Release: 4
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -43,6 +43,9 @@ Patch1: gnome-applets-2.0.1-ppp-command.patch
# Register ourself globally so that gnome-cd can tell if we are
# running or not.
Patch2: gnome-applets-2.0.1-uniquecd.patch
+# Keep the CD device closed except when actually accessing it
+# (bugzilla.gnome.org 91512)
+Patch3: gnome-applets-2.0.1-keepclosed.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -63,7 +66,8 @@ fi
%patch1 -p1 -b .ppp-command
%patch2 -p1 -b .uniquecd
-# Fix up mode 0000 files created by patch
+%patch3 -p1 -b .keepclosed
+# Fix up mode 0000 files created by patch2
chmod -R a+r .
%build
@@ -120,6 +124,8 @@ done
%changelog
* Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
+- Keep the CD device closed except when actually accessing it
+ (bugzilla.gnome.org 91512)
- Register CD player so we can start only one CD player
for display from magicdev. (#39208)
commit cd61776a21d6e706d6dcf19d2546bd4fce7cec12
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:57 2004 +0000
auto-import changelog data from gnome-applets-2.0.1-4.src.rpm
Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
- Register CD player so we can start only one CD player for display from
magicdev. (#39208)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 905296f..408a267 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -13,7 +13,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.0.1
-Release: 3
+Release: 4
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -33,12 +33,16 @@ BuildRequires: Xft
BuildRequires: fontconfig
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: /usr/bin/automake-1.4
Requires: gnome-panel >= %{gnome_panel_version}
Obsoletes: battstat_applet
Patch1: gnome-applets-2.0.1-ppp-command.patch
+# Register ourself globally so that gnome-cd can tell if we are
+# running or not.
+Patch2: gnome-applets-2.0.1-uniquecd.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -58,9 +62,15 @@ fi
%setup -q
%patch1 -p1 -b .ppp-command
+%patch2 -p1 -b .uniquecd
+# Fix up mode 0000 files created by patch
+chmod -R a+r .
%build
+# .uniquecd patch modifies cdplayer/Makefile.am
+automake-1.4
+
%configure
make
@@ -109,6 +119,10 @@ done
%{_sysconfdir}/sound
%changelog
+* Fri Aug 23 2002 Owen Taylor <otaylor(a)redhat.com>
+- Register CD player so we can start only one CD player
+ for display from magicdev. (#39208)
+
* Tue Aug 13 2002 Havoc Pennington <hp(a)redhat.com>
- add ppc ppc64 to no_apm_arches #67564
commit 6e204027cd3c4bb6c0cd09eebd3c92405ec726ee
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:53 2004 +0000
auto-import changelog data from gnome-applets-2.0.1-3.src.rpm
Tue Aug 13 2002 Havoc Pennington <hp(a)redhat.com>
- add ppc ppc64 to no_apm_arches #67564
diff --git a/gnome-applets.spec b/gnome-applets.spec
index a4f5f79..905296f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,4 +1,4 @@
-%define no_apm_archs alpha ia64 s390 s390x sparc sparc64
+%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc ppc64
%define glib2_version 2.0.3
%define pango_version 1.0.99
@@ -13,7 +13,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 2.0.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -109,6 +109,9 @@ done
%{_sysconfdir}/sound
%changelog
+* Tue Aug 13 2002 Havoc Pennington <hp(a)redhat.com>
+- add ppc ppc64 to no_apm_arches #67564
+
* Wed Jul 31 2002 Nalin Dahyabhai <nalin(a)redhat.com>
- include applets in libexecdir
commit cd62d79a0fbe057abe1ded2cd9f2341c44f3505e
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:47 2004 +0000
auto-import changelog data from gnome-applets-2.0.1-2.src.rpm
Wed Jul 31 2002 Nalin Dahyabhai <nalin(a)redhat.com>
- include applets in libexecdir
Mon Jul 29 2002 Havoc Pennington <hp(a)redhat.com>
- 2.0.1, and build with new gail
- 69971 (use correct ppp on/off commands)
- remove scrollkeeper dtd-compliance patch, fixed upstream apparently
(patch doesn't apply anymore)
Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
- Fix %find_lang
Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
- rebuild with new libs
- remove temporary hack for too-old libgnomeui
- add /etc/sound stuff to file list
diff --git a/.cvsignore b/.cvsignore
index b3fb9d7..7a143c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.0.0.tar.bz2
+gnome-applets-2.0.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 63f307b..a4f5f79 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,20 +1,23 @@
%define no_apm_archs alpha ia64 s390 s390x sparc sparc64
-%define glib2_version 2.0.0
-%define gtk2_version 2.0.0
-%define libgnomeui_version 1.117.2
-%define gnome_panel_version 1.5.24
-%define libgtop2_version 1.90.2
+%define glib2_version 2.0.3
+%define pango_version 1.0.99
+%define gtk2_version 2.0.5
+%define libgnomeui_version 2.0.0
+%define gnome_panel_version 2.0.0
+%define libgtop2_version 2.0.0
+%define gail_version 0.17-2
+
+%define po_package gnome-applets-2.0
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 2.0.0
-Release: 4
+Version: 2.0.1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}…
-Patch: gnome-applets-scrollkeeper-dtd.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,10 +31,14 @@ BuildRequires: gnome-panel >= %{gnome_panel_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: Xft
BuildRequires: fontconfig
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gail-devel >= %{gail_version}
Requires: gnome-panel >= %{gnome_panel_version}
-Obsoletes: battstat_applet
+Obsoletes: battstat_applet
+
+Patch1: gnome-applets-2.0.1-ppp-command.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -49,10 +56,8 @@ fi
%endif
%setup -q
-%patch -p0 -b .scrollkeeper-dtd
-## temporary hack since I have new gnome-applets but not new gnome libs
-perl -pi -e 's/REQUIRED=2.0.0/REQUIRED=0.0.1/g' configure configure.in
+%patch1 -p1 -b .ppp-command
%build
@@ -66,7 +71,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%makeinstall
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang %name
+%find_lang %{po_package}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,7 +88,7 @@ done
%postun -p /sbin/ldconfig
-%files -f %{name}.lang
+%files -f %{po_package}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
@@ -98,10 +103,32 @@ done
%{_datadir}/omf
%{_bindir}/*
%{_libdir}/bonobo
+%{_libexecdir}/*
#%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/sound
%changelog
+* Wed Jul 31 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- include applets in libexecdir
+
+* Mon Jul 29 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.1, and build with new gail
+- 69971 (use correct ppp on/off commands)
+- remove scrollkeeper dtd-compliance patch,
+ fixed upstream apparently (patch doesn't apply anymore)
+
+* Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
+- Fix %%find_lang
+
+* Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild with new libs
+- remove temporary hack for too-old libgnomeui
+- add /etc/sound stuff to file list
+
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- rebuild in different environment
+
* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
- fix a scrollkeeper validation bug
diff --git a/sources b/sources
index 99a89dc..eefa499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3a55f1d0c2486b55943f2da213f4ca5 gnome-applets-2.0.0.tar.bz2
+40b9c65619467d364cb3e54086151ee0 gnome-applets-2.0.1.tar.bz2
commit bdd79ddbefdaf87db0071f6d7e84f38d8ebd767c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:31 2004 +0000
auto-import changelog data from gnome-applets-2.0.0-4.src.rpm
Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
- fix a scrollkeeper validation bug
Wed Jun 12 2002 Havoc Pennington <hp(a)redhat.com>
- remove panel-menu.schemas from the list of schemas.
- 2.0.0
Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
- rebuild in different environment
Wed Jun 05 2002 Havoc Pennington <hp(a)redhat.com>
- 1.105.0
Sun May 26 2002 Tim Powers <timp(a)redhat.com>
- automated rebuild
Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
- rebuild in different environment
Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
- 1.103.0
Fri May 03 2002 Havoc Pennington <hp(a)redhat.com>
- 1.100.0
Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
- GNOME 2 version
diff --git a/.cvsignore b/.cvsignore
index 068c6ba..b3fb9d7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-battstat_applet-2.0.10.tar.gz
-gnome-applets-1.4.0.5.tar.gz
-gnome-applets-pofiles.tar.gz
+gnome-applets-2.0.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 8323f52..63f307b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,42 +1,37 @@
-%define battstat battstat_applet-2.0.10
%define no_apm_archs alpha ia64 s390 s390x sparc sparc64
-Summary: Small applications for the GNOME panel.
+%define glib2_version 2.0.0
+%define gtk2_version 2.0.0
+%define libgnomeui_version 1.117.2
+%define gnome_panel_version 1.5.24
+%define libgtop2_version 1.90.2
+
+Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 1.4.0.5
-Release: 6
+Version: 2.0.0
+Release: 4
Epoch: 1
License: GPL
-Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.t…
-Source2: gnome-applets-1.2.4-ja.po
-Source3: gtik2_applet.desktop
-Source4: gnome-applets-pofiles.tar.gz
-Source5: battstat_applet-2.0.10.tar.gz
+Group: User Interface/Desktops
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}…
+Patch: gnome-applets-scrollkeeper-dtd.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gnome-libs-devel libgtop-devel gdk-pixbuf-devel gnome-core-devel gdbm-devel
-BuildRequires: GConf-devel
-BuildRequires: gnome-vfs-devel >= 1.0.4
-BuildRequires: /usr/bin/automake-1.4
+Prereq: scrollkeeper >= 0.1.4
-Requires: libxml
-Requires: libgtop
-Requires: gnome-core >= 1.1.2
-Requires: gdk-pixbuf >= 0.7.0
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: gnome-panel >= %{gnome_panel_version}
+BuildRequires: libgtop2-devel >= %{libgtop2_version}
+BuildRequires: Xft
+BuildRequires: fontconfig
-Obsoletes: battstat_applet
+Requires: gnome-panel >= %{gnome_panel_version}
-Patch1: gnome-applets-1.2.4-isdn.patch
-Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
-Patch3: gnome-applets-1.4.0.1-mixer.patch
-Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch
-Patch5: gnome-applets-1.4.0.5-charpick-cflags.patch
-Patch6: gnome-applets-1.4.0.5-pppcommand.patch
-Patch7: gnome-applets-1.4.0.5-yahoo.patch
-Patch8: gnome-applets-1.4.0.5-orientation.patch
+Obsoletes: battstat_applet
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -46,201 +41,95 @@ small utilities for the GNOME panel.
%prep
%ifnarch %{no_apm_archs}
-%setup -q -a 5
if ! test -e /usr/lib/libapm.a ; then
echo "You must have apmd installed"
exit 1
fi
-
-%else
-%setup -q
%endif
-# already upstream, left here in case I downgrade to 1.4.0.1
-# %patch1 -p1 -b .isdn
-
-%ifnarch %{no_apm_archs}
-%patch2 -p1 -b .nobrokenpath
-%endif
-
-# also appears to be upstream, though changed slightly (?)
-# %patch3 -p0 -b .mixer
-
-cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
-cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
-# translations
-tar zxf %{SOURCE4}
-# broken po file
-rm -f po/zh_TW.po; touch po/zh_TW.po
-
-%ifnarch %{no_apm_archs}
-%patch4 -p0 -b .batstat_dialog
-%endif
+%setup -q
+%patch -p0 -b .scrollkeeper-dtd
-%patch5 -p1 -b .charpick-cflags
-%patch6 -p1 -b .pppcommand
-%patch7 -p1 -b .yahoo
-%ifnarch %{no_apm_archs}
-%patch8 -p1 -b .orientation
-%endif
+## temporary hack since I have new gnome-applets but not new gnome libs
+perl -pi -e 's/REQUIRED=2.0.0/REQUIRED=0.0.1/g' configure configure.in
%build
-libtoolize --copy --force
-aclocal-1.4 -I macros
-automake-1.4
-autoconf
%configure
-OLD_PO_FILE_INPUT=yes make
-
-%ifnarch %{no_apm_archs}
-cd %{battstat}
-libtoolize --copy --force
-aclocal-1.4 -I macros
-automake-1.4
-autoconf
-%configure
-%endif
+make
%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
-%ifnarch %{no_apm_archs}
-## install battstat
-cd %{battstat}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%makeinstall
-%endif
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-## delete desktop files for extraneous applets
-cd $RPM_BUILD_ROOT%{_prefix}/share/applets
-# Salvage this toy clock
-mv Clocks/jbc_applet.desktop Amusements
-# nuke other clocks
-/bin/rm -rf Clocks
+%find_lang %name
-# whoever thought whereami had utility was on hard drugs
-mv Utility/whereami_applet.desktop Amusements
+%clean
+rm -rf $RPM_BUILD_ROOT
-## battery_applet .desktop has more translations and a better name,
-## so we use it, but have it launch battstat instead
+%post
+/sbin/ldconfig
+scrollkeeper-update
-cat Monitors/battery_applet.desktop | sed -e 's/battery_applet/battstat_applet/g' > Utility/battstat_applet.desktop
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="modemlights.schemas cdplayer.schemas drivemount.schemas charpick.schemas geyes.schemas mini-commander.schemas gkb.schemas multiload.schemas gtik.schemas gweather.schemas battstat.schemas"
+for S in $SCHEMAS; do
+ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+done
-# Then nuke battery_applet.desktop
-rm Monitors/battery_applet.desktop
+%postun -p /sbin/ldconfig
-%ifarch %{no_apm_archs}
-# nuke battstat stuff
-rm Utility/battstat_applet.desktop
-%else
-# nuke original battstat .desktop
-rm Monitors/battstat_applet.desktop
-%endif
+%files -f %{name}.lang
+%defattr(-, root, root)
-cd $RPM_BUILD_DIR/%{name}-%{version}
+%doc AUTHORS COPYING ChangeLog NEWS README
-# no binary stripping
-if [ -f %{name}.files ] ; then
- rm -f %{name}.files
-fi
-##############################################################################
-##
-function ProcessLang() {
- # rpm provides a handy scriptlet to do the locale stuff lets use that.
- if [ -f /usr/lib/rpm/find-lang.sh ] ; then
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
- sed "s:(644, root, root, 755):(444, bin, bin, 555):" %{name}.lang >tmp.lang && mv tmp.lang %{name}.lang
- if [ -f %{name}.files ] ; then
- cat %{name}.files %{name}.lang >tmp.files && mv tmp.files %{name}.files
- fi
- fi
-}
-function ProcessBin() {
- # Gather up all the executable files. Stripping if requested.
- # This will not recurse.
- if [ -d $RPM_BUILD_ROOT%{_prefix}/bin ] ; then
- echo "%defattr (0555, bin, bin)" >>%{name}.files
- find $RPM_BUILD_ROOT%{_prefix}/bin -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>%{name}.files
- fi
-}
-
-function ProcessLib() {
- # Gather up any libraries.
- # Usage: ProcessLib <dir> <type> <output file>
- # Type is either 'runtime' or 'devel'
- if [ -d $1 ] ; then
- echo "%defattr (0555, bin, bin)" >>$3
- case "$2" in
- runtime)
- # Grab runtime libraries
- find $1 -name "*.so.*" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
- ;;
- devel)
- find $1 -name "*.so" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
- find $1 -name "*.la" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
- find $1 -name "*.a" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
- find $1 -name "*.sh" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
- ;;
- esac
- fi
-}
-function ProcessDir() {
- # Build a list of files in the specified dir sticking
- # a %defattr line as specified in front of the mess. This is intended
- # for normal dirs. Use ProcessLib for library dirs
- # for include dirs. Appending to <output file>.
- # This will recurse.
- #
- # Usage: ProcessDir <dir> <output file> <attr>
- #
- if [ -d $1 ] ; then
- if [ ! -z "$3" ] ; then
- echo "%defattr ($3)" >>$2
- fi
- echo "*** Processing $1"
- find $1 -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>$2
- fi
-}
-
-function BuildFiles() {
- ProcessBin
- ProcessLang
- for i in `find $RPM_BUILD_ROOT%{_prefix}/share -maxdepth 1 -type d -print | \
- sed "s:^$RPM_BUILD_ROOT%{_prefix}/share::g"` ; do
- echo $i
- case $i in
- /applets|/asclock|/clockmail|/geyes|/gnome|/gweather|/odometer|/sound-monitor|/pixmaps|/tickastat|/xmodmap)
-
- ProcessDir $RPM_BUILD_ROOT%{_prefix}/share$i %{name}.files "0444, bin, bin, 0555"
- ;;
- *)
- ;;
- esac
- done
- ProcessDir $RPM_BUILD_ROOT/etc %{name}.files "0444, bin, bin, 0555"
- ProcessLib $RPM_BUILD_ROOT%{_prefix}/lib runtime %{name}.files
-}
-
-BuildFiles
+%{_datadir}/pixmaps
+%{_datadir}/gnome-2.0
+%{_datadir}/gnome
+%{_datadir}/geyes
+%{_datadir}/xmodmap
+%{_datadir}/gweather
+%{_datadir}/battstat_applet
+%{_datadir}/omf
+%{_bindir}/*
+%{_libdir}/bonobo
+#%{_libdir}/*.so.*
+%{_sysconfdir}/gconf/schemas/*
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%changelog
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin(a)redhat.com>
+- fix a scrollkeeper validation bug
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+* Wed Jun 12 2002 Havoc Pennington <hp(a)redhat.com>
+- remove panel-menu.schemas from the list of schemas.
+- 2.0.0
-%files -f %{name}.files
-%defattr(-, root, root)
+* Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
-# Need to own the directories too
-/usr/share/gnome/gkb
-/usr/share/gnome/help/*
+* Wed Jun 5 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.105.0
-%doc AUTHORS COPYING ChangeLog NEWS README
+* Sun May 26 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.103.0
+
+* Fri May 3 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.100.0
+
+* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
+- GNOME 2 version
-%changelog
* Mon Apr 15 2002 Havoc Pennington <hp(a)redhat.com>
- merge translations
diff --git a/sources b/sources
index 41e693f..99a89dc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz
-55fe2ebe5d8e0f9df28004dac8d9eb5e gnome-applets-1.4.0.5.tar.gz
-8e5c907e8fb104ebeec05ce45d764cd5 gnome-applets-pofiles.tar.gz
+f3a55f1d0c2486b55943f2da213f4ca5 gnome-applets-2.0.0.tar.bz2
commit 9892d6ae843790fc575c903a4b04c5789464ca48
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:26 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.5-6.src.rpm
Mon Apr 15 2002 Havoc Pennington <hp(a)redhat.com>
- merge translations
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 08b562f..8323f52 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,7 +4,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 1.4.0.5
-Release: 5
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -71,6 +71,8 @@ cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
# translations
tar zxf %{SOURCE4}
+# broken po file
+rm -f po/zh_TW.po; touch po/zh_TW.po
%ifnarch %{no_apm_archs}
%patch4 -p0 -b .batstat_dialog
@@ -239,6 +241,9 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Mon Apr 15 2002 Havoc Pennington <hp(a)redhat.com>
+- merge translations
+
* Thu Apr 11 2002 Havoc Pennington <hp(a)redhat.com>
- default battstat applet to vertical mode
diff --git a/sources b/sources
index 65e221f..41e693f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz
55fe2ebe5d8e0f9df28004dac8d9eb5e gnome-applets-1.4.0.5.tar.gz
-ff43dcd6c14690ae7a3ade5307a16565 gnome-applets-pofiles.tar.gz
+8e5c907e8fb104ebeec05ce45d764cd5 gnome-applets-pofiles.tar.gz
commit 12f838a591bbeda8de39ef45ed036fa6ca2411ca
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:22:06 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.5-5.src.rpm
Thu Apr 11 2002 Havoc Pennington <hp(a)redhat.com>
- default battstat applet to vertical mode
Thu Mar 21 2002 Havoc Pennington <hp(a)redhat.com>
- add patch to adapt to yahoo web site changes, #61561
Tue Mar 05 2002 Havoc Pennington <hp(a)redhat.com>
- remove requires libghttp4
Mon Mar 04 2002 Havoc Pennington <hp(a)redhat.com>
- no apm on sparc, #60538
- obsolete battstat_applet for Ximian compat, #51427
- use ifup/ifdown ppp0 instead of pppon/pppoff for default ppp command in
modemlights, #54199
Tue Feb 12 2002 Havoc Pennington <hp(a)redhat.com>
- 1.4.0.5, cross fingers
- add gconf-devel buildreq, though this is dubious as hell (pulled in by
gtik using gnome-vfs, but if gtik actually accessed gconf it would fail
due to gnorba conflict)
- patch totally busted charpick Makefile.am cflags override
Thu Jan 24 2002 Havoc Pennington <hp(a)redhat.com>
- automake14
diff --git a/.cvsignore b/.cvsignore
index cbbaf73..068c6ba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
battstat_applet-2.0.10.tar.gz
-gnome-applets-1.4.0.1.tar.gz
+gnome-applets-1.4.0.5.tar.gz
gnome-applets-pofiles.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 5286213..08b562f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,10 +1,10 @@
%define battstat battstat_applet-2.0.10
-%define no_apm_archs alpha ia64 s390 s390x
+%define no_apm_archs alpha ia64 s390 s390x sparc sparc64
Summary: Small applications for the GNOME panel.
Name: gnome-applets
-Version: 1.4.0.1
-Release: 6a
+Version: 1.4.0.5
+Release: 5
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -18,18 +18,25 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gnome-libs-devel libgtop-devel gdk-pixbuf-devel gnome-core-devel gdbm-devel
+BuildRequires: GConf-devel
+BuildRequires: gnome-vfs-devel >= 1.0.4
+BuildRequires: /usr/bin/automake-1.4
Requires: libxml
Requires: libgtop
-Requires: libghttp
Requires: gnome-core >= 1.1.2
Requires: gdk-pixbuf >= 0.7.0
+Obsoletes: battstat_applet
+
Patch1: gnome-applets-1.2.4-isdn.patch
Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
Patch3: gnome-applets-1.4.0.1-mixer.patch
Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch
-Patch5: gnome-applets-1.4.0.1-scrollkeeper.patch
+Patch5: gnome-applets-1.4.0.5-charpick-cflags.patch
+Patch6: gnome-applets-1.4.0.5-pppcommand.patch
+Patch7: gnome-applets-1.4.0.5-yahoo.patch
+Patch8: gnome-applets-1.4.0.5-orientation.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -50,13 +57,15 @@ fi
%setup -q
%endif
-%patch1 -p1 -b .isdn
+# already upstream, left here in case I downgrade to 1.4.0.1
+# %patch1 -p1 -b .isdn
%ifnarch %{no_apm_archs}
%patch2 -p1 -b .nobrokenpath
%endif
-%patch3 -p0 -b .mixer
+# also appears to be upstream, though changed slightly (?)
+# %patch3 -p0 -b .mixer
cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
@@ -66,19 +75,30 @@ tar zxf %{SOURCE4}
%ifnarch %{no_apm_archs}
%patch4 -p0 -b .batstat_dialog
%endif
-%patch5 -p1 -b .scrollkeeper
-automake
+
+%patch5 -p1 -b .charpick-cflags
+%patch6 -p1 -b .pppcommand
+%patch7 -p1 -b .yahoo
+%ifnarch %{no_apm_archs}
+%patch8 -p1 -b .orientation
+%endif
%build
-%configure --sysconfdir=/etc
-CFLAGS="$RPM_OPT_FLAGS"
+libtoolize --copy --force
+aclocal-1.4 -I macros
+automake-1.4
+autoconf
+%configure
OLD_PO_FILE_INPUT=yes make
%ifnarch %{no_apm_archs}
cd %{battstat}
-automake
-%configure
+libtoolize --copy --force
+aclocal-1.4 -I macros
+automake-1.4
+autoconf
+%configure
%endif
%install
@@ -216,11 +236,34 @@ BuildFiles
/usr/share/gnome/gkb
/usr/share/gnome/help/*
-
-
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Thu Apr 11 2002 Havoc Pennington <hp(a)redhat.com>
+- default battstat applet to vertical mode
+
+* Thu Mar 21 2002 Havoc Pennington <hp(a)redhat.com>
+- add patch to adapt to yahoo web site changes, #61561
+
+* Tue Mar 5 2002 Havoc Pennington <hp(a)redhat.com>
+- remove requires libghttp4
+
+* Mon Mar 4 2002 Havoc Pennington <hp(a)redhat.com>
+- no apm on sparc, #60538
+- obsolete battstat_applet for Ximian compat, #51427
+- use ifup/ifdown ppp0 instead of pppon/pppoff for default
+ ppp command in modemlights, #54199
+
+* Tue Feb 12 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.4.0.5, cross fingers
+- add gconf-devel buildreq, though this is dubious as hell
+ (pulled in by gtik using gnome-vfs, but if gtik actually
+ accessed gconf it would fail due to gnorba conflict)
+- patch totally busted charpick Makefile.am cflags override
+
+* Thu Jan 24 2002 Havoc Pennington <hp(a)redhat.com>
+- automake14
+
* Thu Aug 30 2001 Alex Larsson <alexl(a)redhat.com>
- Removed annoying broken battery full dialog #52861
- Also fix mixer applet for USB sound #52603
diff --git a/sources b/sources
index 954da6f..65e221f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz
-5b459439d4d698e86a6239734f42ca9f gnome-applets-1.4.0.1.tar.gz
+55fe2ebe5d8e0f9df28004dac8d9eb5e gnome-applets-1.4.0.5.tar.gz
ff43dcd6c14690ae7a3ade5307a16565 gnome-applets-pofiles.tar.gz
commit fcc528a97bb4c096fddb8e160ae5778dc8f1f0c5
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:21:54 2004 +0000
auto-import gnome-applets-1.4.0.1-6a from gnome-applets-1.4.0.1-6a.src.rpm
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cdb33d6..5286213 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,7 +4,7 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 1.4.0.1
-Release: 6
+Release: 6a
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -29,6 +29,7 @@ Patch1: gnome-applets-1.2.4-isdn.patch
Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
Patch3: gnome-applets-1.4.0.1-mixer.patch
Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch
+Patch5: gnome-applets-1.4.0.1-scrollkeeper.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -65,6 +66,8 @@ tar zxf %{SOURCE4}
%ifnarch %{no_apm_archs}
%patch4 -p0 -b .batstat_dialog
%endif
+%patch5 -p1 -b .scrollkeeper
+automake
%build
commit 203b9c6feba0aa69ccd303f01e837d85f6f84337
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:21:33 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.1-6.src.rpm
Thu Aug 30 2001 Alex Larsson <alexl(a)redhat.com>
- Removed annoying broken battery full dialog #52861
- Also fix mixer applet for USB sound #52603
Mon Aug 27 2001 Havoc Pennington <hp(a)redhat.com>
- Add po files from sources.redhat.com
diff --git a/.cvsignore b/.cvsignore
index e6d3ab6..cbbaf73 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
battstat_applet-2.0.10.tar.gz
gnome-applets-1.4.0.1.tar.gz
-gnome-applets-po.tar.gz
+gnome-applets-pofiles.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2286b86..cdb33d6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,14 +4,14 @@
Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 1.4.0.1
-Release: 4
+Release: 6
Epoch: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.t…
Source2: gnome-applets-1.2.4-ja.po
Source3: gtik2_applet.desktop
-Source4: gnome-applets-po.tar.gz
+Source4: gnome-applets-pofiles.tar.gz
Source5: battstat_applet-2.0.10.tar.gz
URL: http://www.gnome.org/
@@ -27,6 +27,8 @@ Requires: gdk-pixbuf >= 0.7.0
Patch1: gnome-applets-1.2.4-isdn.patch
Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
+Patch3: gnome-applets-1.4.0.1-mixer.patch
+Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -53,10 +55,17 @@ fi
%patch2 -p1 -b .nobrokenpath
%endif
+%patch3 -p0 -b .mixer
+
cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
# translations
tar zxf %{SOURCE4}
+
+%ifnarch %{no_apm_archs}
+%patch4 -p0 -b .batstat_dialog
+%endif
+
%build
%configure --sysconfdir=/etc
@@ -209,6 +218,13 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Thu Aug 30 2001 Alex Larsson <alexl(a)redhat.com>
+- Removed annoying broken battery full dialog #52861
+- Also fix mixer applet for USB sound #52603
+
+* Mon Aug 27 2001 Havoc Pennington <hp(a)redhat.com>
+- Add po files from sources.redhat.com
+
* Wed Aug 15 2001 Alexander Larsson <alexl(a)redhat.com>
- Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
diff --git a/sources b/sources
index db5ce6e..954da6f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz
5b459439d4d698e86a6239734f42ca9f gnome-applets-1.4.0.1.tar.gz
-624027d99a001ccd99dc93daacf56a22 gnome-applets-po.tar.gz
+ff43dcd6c14690ae7a3ade5307a16565 gnome-applets-pofiles.tar.gz
commit 5b2de898f255a6d4995ffc4d9cfa995ca0aa2561
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:21:18 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.1-4.src.rpm
Wed Aug 15 2001 Alexander Larsson <alexl(a)redhat.com>
- Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
diff --git a/gnome-applets.spec b/gnome-applets.spec
index b06fba7..2286b86 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,13 +1,13 @@
%define battstat battstat_applet-2.0.10
%define no_apm_archs alpha ia64 s390 s390x
-Summary: Small applications which embed themselves in the GNOME panel
+Summary: Small applications for the GNOME panel.
Name: gnome-applets
Version: 1.4.0.1
-Release: 3
+Release: 4
Epoch: 1
License: GPL
-Group: User Interface/Desktops
+Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.t…
Source2: gnome-applets-1.2.4-ja.po
Source3: gtik2_applet.desktop
@@ -29,15 +29,10 @@ Patch1: gnome-applets-1.2.4-isdn.patch
Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
%description
-GNOME (GNU Network Object Model Environment) is a user-friendly
-set of applications and desktop tools to be used in conjunction with a
-window manager for the X Window System. GNOME is similar in purpose and
-scope to CDE and KDE, but GNOME is based completely on Open Source
-software. The gnome-applets package provides Panel applets which
-enhance your GNOME experience.
-
-You should install the gnome-applets package if you would like embed small
-utilities in the GNOME panel.
+GNOME (GNU Network Object Model Environment) is a user-friendly set of
+applications and desktop tools to be used in conjunction with a window
+manager for the X Window System. The gnome-applets package provides
+small utilities for the GNOME panel.
%prep
%ifnarch %{no_apm_archs}
@@ -205,9 +200,18 @@ BuildFiles
%files -f %{name}.files
%defattr(-, root, root)
+# Need to own the directories too
+/usr/share/gnome/gkb
+/usr/share/gnome/help/*
+
+
+
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Wed Aug 15 2001 Alexander Larsson <alexl(a)redhat.com>
+- Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
+
* Wed Jul 18 2001 Havoc Pennington <hp(a)redhat.com>
- add some build requires
- remove ifarch build requires, replace with check in setup
commit 104390b2004257cfd9592c9f75ab233a700d6397
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:21:11 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.1-3.src.rpm
Wed Jul 18 2001 Havoc Pennington <hp(a)redhat.com>
- add some build requires
- remove ifarch build requires, replace with check in setup
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0ef2b0a..b06fba7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,7 +4,7 @@
Summary: Small applications which embed themselves in the GNOME panel
Name: gnome-applets
Version: 1.4.0.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: User Interface/Desktops
@@ -17,10 +17,7 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gnome-libs-devel
-%ifnarch %{no_apm_archs}
-BuildRequires: apmd
-%endif
+BuildRequires: gnome-libs-devel libgtop-devel gdk-pixbuf-devel gnome-core-devel gdbm-devel
Requires: libxml
Requires: libgtop
@@ -45,6 +42,12 @@ utilities in the GNOME panel.
%prep
%ifnarch %{no_apm_archs}
%setup -q -a 5
+
+if ! test -e /usr/lib/libapm.a ; then
+ echo "You must have apmd installed"
+ exit 1
+fi
+
%else
%setup -q
%endif
@@ -205,6 +208,10 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Wed Jul 18 2001 Havoc Pennington <hp(a)redhat.com>
+- add some build requires
+- remove ifarch build requires, replace with check in setup
+
* Wed Jul 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
- sanitize specfile to RH style
- do not require apmd for s390 s390x
commit e43fd68c68ef2581a4738f5f30cd811271b53c3c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:21:08 2004 +0000
auto-import changelog data from gnome-applets-1.4.0.1-2.src.rpm
Wed Jul 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
- sanitize specfile to RH style
- do not require apmd for s390 s390x
Mon Jul 09 2001 Jonathan Blandford <jrb(a)redhat.com>
- new version
Sun Jul 08 2001 Havoc Pennington <hp(a)redhat.com>
- remove extra .desktop file for battstat
Sat Jul 07 2001 Havoc Pennington <hp(a)redhat.com>
- add battstat applet
- rearrange .desktop files for applets
diff --git a/.cvsignore b/.cvsignore
index f726322..e6d3ab6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-gnome-applets-1.2.4.tar.gz
+battstat_applet-2.0.10.tar.gz
+gnome-applets-1.4.0.1.tar.gz
gnome-applets-po.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 767195d..0ef2b0a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,22 +1,26 @@
-%define name gnome-applets
-%define ver 1.2.4
-%define RELEASE 5
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define battstat battstat_applet-2.0.10
+%define no_apm_archs alpha ia64 s390 s390x
Summary: Small applications which embed themselves in the GNOME panel
-Name: %name
-Version: %ver
-Release: %rel
+Name: gnome-applets
+Version: 1.4.0.1
+Release: 2
Epoch: 1
License: GPL
Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{ver}.tar.gz
-Source1: gnotices.xpm
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.t…
Source2: gnome-applets-1.2.4-ja.po
Source3: gtik2_applet.desktop
Source4: gnome-applets-po.tar.gz
+Source5: battstat_applet-2.0.10.tar.gz
URL: http://www.gnome.org/
-BuildRoot: %{_tmppath}/%{name}-%{ver}-root
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: gnome-libs-devel
+%ifnarch %{no_apm_archs}
+BuildRequires: apmd
+%endif
Requires: libxml
Requires: libgtop
@@ -24,8 +28,8 @@ Requires: libghttp
Requires: gnome-core >= 1.1.2
Requires: gdk-pixbuf >= 0.7.0
-Patch0: gnome-applets-1.2.1-oldlogo.patch
Patch1: gnome-applets-1.2.4-isdn.patch
+Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly
@@ -39,11 +43,18 @@ You should install the gnome-applets package if you would like embed small
utilities in the GNOME panel.
%prep
+%ifnarch %{no_apm_archs}
+%setup -q -a 5
+%else
%setup -q
-%patch -p1 -b .oldlogo
+%endif
+
%patch1 -p1 -b .isdn
-cp %{SOURCE1} slashapp/
+%ifnarch %{no_apm_archs}
+%patch2 -p1 -b .nobrokenpath
+%endif
+
cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
# translations
@@ -54,10 +65,50 @@ tar zxf %{SOURCE4}
CFLAGS="$RPM_OPT_FLAGS"
OLD_PO_FILE_INPUT=yes make
+%ifnarch %{no_apm_archs}
+cd %{battstat}
+automake
+%configure
+%endif
+
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%makeinstall
+%ifnarch %{no_apm_archs}
+## install battstat
+cd %{battstat}
+%makeinstall
+%endif
+
+## delete desktop files for extraneous applets
+cd $RPM_BUILD_ROOT%{_prefix}/share/applets
+# Salvage this toy clock
+mv Clocks/jbc_applet.desktop Amusements
+# nuke other clocks
+/bin/rm -rf Clocks
+
+# whoever thought whereami had utility was on hard drugs
+mv Utility/whereami_applet.desktop Amusements
+
+## battery_applet .desktop has more translations and a better name,
+## so we use it, but have it launch battstat instead
+
+cat Monitors/battery_applet.desktop | sed -e 's/battery_applet/battstat_applet/g' > Utility/battstat_applet.desktop
+
+# Then nuke battery_applet.desktop
+rm Monitors/battery_applet.desktop
+
+%ifarch %{no_apm_archs}
+# nuke battstat stuff
+rm Utility/battstat_applet.desktop
+%else
+# nuke original battstat .desktop
+rm Monitors/battstat_applet.desktop
+%endif
+
+cd $RPM_BUILD_DIR/%{name}-%{version}
+
# no binary stripping
if [ -f %{name}.files ] ; then
rm -f %{name}.files
@@ -154,6 +205,20 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Wed Jul 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- sanitize specfile to RH style
+- do not require apmd for s390 s390x
+
+* Mon Jul 9 2001 Jonathan Blandford <jrb(a)redhat.com>
+- new version
+
+* Sun Jul 08 2001 Havoc Pennington <hp(a)redhat.com>
+- remove extra .desktop file for battstat
+
+* Sat Jul 07 2001 Havoc Pennington <hp(a)redhat.com>
+- add battstat applet
+- rearrange .desktop files for applets
+
* Tue Jun 12 2001 Than Ngo <than(a)redhat.com>
- fix isdn stuff to build against kernel-2.4.x
- use %%{_tmppath}
diff --git a/sources b/sources
index 61e9af0..db5ce6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-f0afb1eccc444530163571a38f972f2d gnome-applets-1.2.4.tar.gz
+606bb5470828d761afc2a940b117e295 battstat_applet-2.0.10.tar.gz
+5b459439d4d698e86a6239734f42ca9f gnome-applets-1.4.0.1.tar.gz
624027d99a001ccd99dc93daacf56a22 gnome-applets-po.tar.gz
commit 494c934973ea084824c9763875a355edc805b555
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:20:58 2004 +0000
auto-import changelog data from gnome-applets-1.2.4-5.src.rpm
Tue Jun 12 2001 Than Ngo <than(a)redhat.com>
- fix isdn stuff to build against kernel-2.4.x
- use %{_tmppath}
Mon Jun 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
- allow newer gettext versions
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0db3481..767195d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,6 +1,6 @@
%define name gnome-applets
%define ver 1.2.4
-%define RELEASE 3a
+%define RELEASE 5
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
Summary: Small applications which embed themselves in the GNOME panel
@@ -16,7 +16,7 @@ Source2: gnome-applets-1.2.4-ja.po
Source3: gtik2_applet.desktop
Source4: gnome-applets-po.tar.gz
URL: http://www.gnome.org/
-BuildRoot: /var/tmp/%{name}-%{ver}-root
+BuildRoot: %{_tmppath}/%{name}-%{ver}-root
Requires: libxml
Requires: libgtop
@@ -24,7 +24,8 @@ Requires: libghttp
Requires: gnome-core >= 1.1.2
Requires: gdk-pixbuf >= 0.7.0
-Patch0: gnome-applets-1.2.1-oldlogo.patch
+Patch0: gnome-applets-1.2.1-oldlogo.patch
+Patch1: gnome-applets-1.2.4-isdn.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly
@@ -40,6 +41,8 @@ utilities in the GNOME panel.
%prep
%setup -q
%patch -p1 -b .oldlogo
+%patch1 -p1 -b .isdn
+
cp %{SOURCE1} slashapp/
cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
@@ -47,10 +50,9 @@ cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
tar zxf %{SOURCE4}
%build
-export OLD_PO_FILE_INPUT=yes
%configure --sysconfdir=/etc
CFLAGS="$RPM_OPT_FLAGS"
-make
+OLD_PO_FILE_INPUT=yes make
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -152,8 +154,12 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
-* Fri May 4 2001 Oliver Paukstadt <oliver.paukstadt(a)millenux.com>
-- ported to IBM zSeries (s390x, 64 bit)
+* Tue Jun 12 2001 Than Ngo <than(a)redhat.com>
+- fix isdn stuff to build against kernel-2.4.x
+- use %%{_tmppath}
+
+* Mon Jun 11 2001 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- allow newer gettext versions
* Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
- translations
commit ad09fa5620e9a8987a3440a79dfe5f7c43d7950c
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:20:53 2004 +0000
auto-import changelog data from gnome-applets-1.2.4-3a.src.rpm
Fri May 04 2001 Oliver Paukstadt <oliver.paukstadt(a)millenux.com>
- ported to IBM zSeries (s390x, 64 bit)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 127c21d..0db3481 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,6 +1,6 @@
%define name gnome-applets
%define ver 1.2.4
-%define RELEASE 3
+%define RELEASE 3a
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
Summary: Small applications which embed themselves in the GNOME panel
@@ -47,6 +47,7 @@ cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
tar zxf %{SOURCE4}
%build
+export OLD_PO_FILE_INPUT=yes
%configure --sysconfdir=/etc
CFLAGS="$RPM_OPT_FLAGS"
make
@@ -151,6 +152,9 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Fri May 4 2001 Oliver Paukstadt <oliver.paukstadt(a)millenux.com>
+- ported to IBM zSeries (s390x, 64 bit)
+
* Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
- translations
commit 38ef3e376b70d4cc44bc6cce5e579e8e703a4afb
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:20:50 2004 +0000
auto-import changelog data from gnome-applets-1.2.4-3.src.rpm
Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
- translations
Mon Feb 12 2001 Akira TAGOH <tagoh(a)redhat.com>
- Updated Japanese translation (ja.po, .desktop). Note: Please remove
Source[23]: when release the next upstream version.
Fri Jan 19 2001 Havoc Pennington <hp(a)redhat.com>
- 1.2.4
diff --git a/.cvsignore b/.cvsignore
index 1f9528e..f726322 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-gnome-applets-1.2.1.tar.gz
+gnome-applets-1.2.4.tar.gz
+gnome-applets-po.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f36ff22..127c21d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,6 +1,6 @@
%define name gnome-applets
-%define ver 1.2.1
-%define RELEASE 5
+%define ver 1.2.4
+%define RELEASE 3
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
Summary: Small applications which embed themselves in the GNOME panel
@@ -12,6 +12,9 @@ License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{ver}.tar.gz
Source1: gnotices.xpm
+Source2: gnome-applets-1.2.4-ja.po
+Source3: gtik2_applet.desktop
+Source4: gnome-applets-po.tar.gz
URL: http://www.gnome.org/
BuildRoot: /var/tmp/%{name}-%{ver}-root
@@ -38,6 +41,10 @@ utilities in the GNOME panel.
%setup -q
%patch -p1 -b .oldlogo
cp %{SOURCE1} slashapp/
+cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
+cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
+# translations
+tar zxf %{SOURCE4}
%build
%configure --sysconfdir=/etc
@@ -144,6 +151,16 @@ BuildFiles
%doc AUTHORS COPYING ChangeLog NEWS README
%changelog
+* Thu Mar 15 2001 Havoc Pennington <hp(a)redhat.com>
+- translations
+
+* Mon Feb 12 2001 Akira TAGOH <tagoh(a)redhat.com>
+- Updated Japanese translation (ja.po, .desktop).
+ Note: Please remove Source[23]: when release the next upstream version.
+
+* Fri Jan 19 2001 Havoc Pennington <hp(a)redhat.com>
+- 1.2.4
+
* Fri Aug 11 2000 Jonathan Blandford <jrb(a)redhat.com>
- Update Epoch
diff --git a/sources b/sources
index 5359abb..61e9af0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0e4b39e2c22a5e1ff4c56f6df1773f40 gnome-applets-1.2.1.tar.gz
+f0afb1eccc444530163571a38f972f2d gnome-applets-1.2.4.tar.gz
+624027d99a001ccd99dc93daacf56a22 gnome-applets-po.tar.gz
commit 1d3b4616f7a62ea0d3826a842cd01aaad3acf915
Author: cvsdist <cvsdist(a)fedoraproject.org>
Date: Thu Sep 9 05:20:44 2004 +0000
auto-import changelog data from gnome-applets-1.2.1-5.src.rpm
Fri Aug 11 2000 Jonathan Blandford <jrb(a)redhat.com>
- Update Epoch
Wed Jul 19 2000 Jonathan Blandford <jrb(a)redhat.com>
- Change slashapp to gnome-news app.
Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
- automatic rebuild
Mon Jun 19 2000 Owen Taylor <otaylor(a)redhat.com
- %defattr fixes
- Remove Docdir:
Thu Jun 15 2000 Havoc Pennington <hp(a)redhat.com>
- 1.2.1
- use %makeinstall
diff --git a/.cvsignore b/.cvsignore
index e69de29..1f9528e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+gnome-applets-1.2.1.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
new file mode 100644
index 0000000..f36ff22
--- /dev/null
+++ b/gnome-applets.spec
@@ -0,0 +1,162 @@
+%define name gnome-applets
+%define ver 1.2.1
+%define RELEASE 5
+%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+
+Summary: Small applications which embed themselves in the GNOME panel
+Name: %name
+Version: %ver
+Release: %rel
+Epoch: 1
+License: GPL
+Group: User Interface/Desktops
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{ver}.tar.gz
+Source1: gnotices.xpm
+URL: http://www.gnome.org/
+BuildRoot: /var/tmp/%{name}-%{ver}-root
+
+Requires: libxml
+Requires: libgtop
+Requires: libghttp
+Requires: gnome-core >= 1.1.2
+Requires: gdk-pixbuf >= 0.7.0
+
+Patch0: gnome-applets-1.2.1-oldlogo.patch
+
+%description
+GNOME (GNU Network Object Model Environment) is a user-friendly
+set of applications and desktop tools to be used in conjunction with a
+window manager for the X Window System. GNOME is similar in purpose and
+scope to CDE and KDE, but GNOME is based completely on Open Source
+software. The gnome-applets package provides Panel applets which
+enhance your GNOME experience.
+
+You should install the gnome-applets package if you would like embed small
+utilities in the GNOME panel.
+
+%prep
+%setup -q
+%patch -p1 -b .oldlogo
+cp %{SOURCE1} slashapp/
+%build
+
+%configure --sysconfdir=/etc
+CFLAGS="$RPM_OPT_FLAGS"
+make
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall
+
+# no binary stripping
+if [ -f %{name}.files ] ; then
+ rm -f %{name}.files
+fi
+##############################################################################
+##
+function ProcessLang() {
+ # rpm provides a handy scriptlet to do the locale stuff lets use that.
+ if [ -f /usr/lib/rpm/find-lang.sh ] ; then
+ /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
+ sed "s:(644, root, root, 755):(444, bin, bin, 555):" %{name}.lang >tmp.lang && mv tmp.lang %{name}.lang
+ if [ -f %{name}.files ] ; then
+ cat %{name}.files %{name}.lang >tmp.files && mv tmp.files %{name}.files
+ fi
+ fi
+}
+function ProcessBin() {
+ # Gather up all the executable files. Stripping if requested.
+ # This will not recurse.
+ if [ -d $RPM_BUILD_ROOT%{_prefix}/bin ] ; then
+ echo "%defattr (0555, bin, bin)" >>%{name}.files
+ find $RPM_BUILD_ROOT%{_prefix}/bin -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>%{name}.files
+ fi
+}
+
+function ProcessLib() {
+ # Gather up any libraries.
+ # Usage: ProcessLib <dir> <type> <output file>
+ # Type is either 'runtime' or 'devel'
+ if [ -d $1 ] ; then
+ echo "%defattr (0555, bin, bin)" >>$3
+ case "$2" in
+ runtime)
+ # Grab runtime libraries
+ find $1 -name "*.so.*" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
+ ;;
+ devel)
+ find $1 -name "*.so" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
+ find $1 -name "*.la" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
+ find $1 -name "*.a" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
+ find $1 -name "*.sh" -print | sed "s:^$RPM_BUILD_ROOT::g" >>$3
+ ;;
+ esac
+ fi
+}
+function ProcessDir() {
+ # Build a list of files in the specified dir sticking
+ # a %defattr line as specified in front of the mess. This is intended
+ # for normal dirs. Use ProcessLib for library dirs
+ # for include dirs. Appending to <output file>.
+ # This will recurse.
+ #
+ # Usage: ProcessDir <dir> <output file> <attr>
+ #
+ if [ -d $1 ] ; then
+ if [ ! -z "$3" ] ; then
+ echo "%defattr ($3)" >>$2
+ fi
+ echo "*** Processing $1"
+ find $1 -type f -print | sed "s:^$RPM_BUILD_ROOT::g" >>$2
+ fi
+}
+
+function BuildFiles() {
+ ProcessBin
+ ProcessLang
+ for i in `find $RPM_BUILD_ROOT%{_prefix}/share -maxdepth 1 -type d -print | \
+ sed "s:^$RPM_BUILD_ROOT%{_prefix}/share::g"` ; do
+ echo $i
+ case $i in
+ /applets|/asclock|/clockmail|/geyes|/gnome|/gweather|/odometer|/sound-monitor|/pixmaps|/tickastat|/xmodmap)
+
+ ProcessDir $RPM_BUILD_ROOT%{_prefix}/share$i %{name}.files "0444, bin, bin, 0555"
+ ;;
+ *)
+ ;;
+ esac
+ done
+ ProcessDir $RPM_BUILD_ROOT/etc %{name}.files "0444, bin, bin, 0555"
+ ProcessLib $RPM_BUILD_ROOT%{_prefix}/lib runtime %{name}.files
+}
+
+BuildFiles
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.files
+%defattr(-, root, root)
+
+%doc AUTHORS COPYING ChangeLog NEWS README
+
+%changelog
+* Fri Aug 11 2000 Jonathan Blandford <jrb(a)redhat.com>
+- Update Epoch
+
+* Wed Jul 19 2000 Jonathan Blandford <jrb(a)redhat.com>
+- Change slashapp to gnome-news app.
+
+* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
+- automatic rebuild
+
+* Mon Jun 19 2000 Owen Taylor <otaylor(a)redhat.com
+- %%defattr fixes
+- Remove Docdir:
+
+* Thu Jun 15 2000 Havoc Pennington <hp(a)redhat.com>
+- 1.2.1
+- use %%makeinstall
diff --git a/sources b/sources
index e69de29..5359abb 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0e4b39e2c22a5e1ff4c56f6df1773f40 gnome-applets-1.2.1.tar.gz
1
0