[packages/ddccontrol] - rel 1
mrozowik
mrozowik at pld-linux.org
Wed Aug 20 14:00:57 CEST 2025
commit 78c20ff997f1d5482c30a0771375ee2a8aefb22f
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Wed Aug 20 12:00:46 2025 +0000
- rel 1
ddccontrol-gnome.patch | 35 -----------------------------------
ddccontrol-link.patch | 24 ------------------------
ddccontrol-systemd_modules.patch | 11 +++++++++++
ddccontrol.spec | 29 ++++++++++++++++++++++-------
4 files changed, 33 insertions(+), 66 deletions(-)
---
diff --git a/ddccontrol.spec b/ddccontrol.spec
index 30696b4..9c9faf2 100644
--- a/ddccontrol.spec
+++ b/ddccontrol.spec
@@ -10,7 +10,7 @@ Summary: DDCcontrol - control the monitor parameters
Summary(pl.UTF-8): DDCcontrol - narzędzie do regulacji parametrów monitora
Name: ddccontrol
Version: 1.0.3
-Release: 0.1
+Release: 1
License: GPL v2+
Group: Applications
Source0: https://github.com/ddccontrol/ddccontrol/archive/refs/tags/%{version}.tar.gz
@@ -18,9 +18,9 @@ Source0: https://github.com/ddccontrol/ddccontrol/archive/refs/tags/%{version}.t
Source1: https://github.com/ddccontrol/ddccontrol-db/archive/refs/tags/%{dbversion}.tar.gz
# Source1-md5: 8ce537400ab9b1a0fafa90ae89acf3bb
Patch0: %{name}-desktop.patch
-Patch1: %{name}-gnome.patch
+Patch1: %{name}-systemd_modules.patch
+#leaving the pl.patch for now, for potential rediff
Patch2: %{name}-pl.patch
-Patch3: %{name}-link.patch
URL: http://ddccontrol.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -32,7 +32,9 @@ BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: pciutils-devel
BuildRequires: pkgconfig
+Requires(post,preun,postun): systemd-units
Requires: %{name}-libs = %{version}-%{release}
+Obsoletes: ddccontrol-applet <= 0.4.2-6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -94,12 +96,25 @@ Static ddccontrol library.
%description static -l pl.UTF-8
Biblioteka statyczna ddccontrol.
+%preun
+%systemd_preun ddccontrol.service
+
+%post
+%systemd_post ddccontrol.service
+
+%postun
+%systemd_reload
+
+%post gtk
+%update_icon_cache hicolor
+
+%postun gtk
+%update_icon_cache hicolor
+
%prep
%setup -q -a 1
%patch -P0 -p1
-#patch -P1 -p1
-#patch -P2 -p1
-#patch -P3 -p1
+%patch -P1 -p1
%build
./autogen.sh
@@ -145,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/ddccontrol
%attr(755,root,root) %{_libexecdir}/ddccontrol/ddccontrol_service
%attr(755,root,root) %{_libexecdir}/ddccontrol/ddcpci
-%{_libdir}/modules-load.d/ddccontrol-i2c-dev.conf
+%{_prefix}/lib/modules-load.d/ddccontrol-i2c-dev.conf
%{_datadir}/dbus-1/interfaces/ddccontrol.DDCControl.xml
%{_datadir}/dbus-1/system-services/ddccontrol.DDCControl.service
%{_datadir}/ddccontrol-db
diff --git a/ddccontrol-gnome.patch b/ddccontrol-gnome.patch
deleted file mode 100644
index f2dc057..0000000
--- a/ddccontrol-gnome.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am.orig 2006-06-15 18:45:19.000000000 +0200
-+++ ddccontrol-0.4.2/src/gnome-ddcc-applet/Makefile.am 2006-08-24 23:46:30.204199000 +0200
-@@ -9,8 +9,8 @@
- pkglib_PROGRAMS = ddcc-applet
- ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
-
--ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
--AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
-+ddcc_applet_LDADD = $(GNOME_APPLET_LDFLAGS) $(DDCC_LDADD)
-+AM_CFLAGS = $(GNOME_APPLET_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
-
- pkgdata_DATA = GNOME_ddcc-applet.xml
-
---- ddccontrol-0.4.2/configure.ac.orig 2006-07-27 22:45:07.000000000 +0200
-+++ ddccontrol-0.4.2/configure.ac 2006-08-24 23:47:16.771109250 +0200
-@@ -150,8 +150,8 @@
- if test x$support_gnome_applet = xyes; then
- if pkg-config --atleast-version=2.10 libpanelapplet-2.0 ; then
- GNOME_APPLET="gnome-ddcc-applet"
-- GNOME_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-- GNOME_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-+ GNOME_APPLET_LDFLAGS="$LIBXML2_LDFLAGS `pkg-config --libs gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
-+ GNOME_APPLET_CFLAGS="$LIBXML2_CFLAGS `pkg-config --cflags gtk+-2.0 gthread-2.0 libpanelapplet-2.0`"
- fi
- fi
-
-@@ -160,6 +160,8 @@
- AC_SUBST([GNOME_CFLAGS])
- AC_SUBST([GDDCCONTROL])
- AC_SUBST([GNOME_APPLET])
-+AC_SUBST([GNOME_APPLET_LDFLAGS])
-+AC_SUBST([GNOME_APPLET_CFLAGS])
-
- # Doc check
- support_doc=no
diff --git a/ddccontrol-link.patch b/ddccontrol-link.patch
deleted file mode 100644
index 718a7ed..0000000
--- a/ddccontrol-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ddccontrol-0.4.2.orig/configure.ac ddccontrol-0.4.2/configure.ac
---- ddccontrol-0.4.2.orig/configure.ac 2007-01-04 00:08:09.945690046 +0100
-+++ ddccontrol-0.4.2/configure.ac 2007-01-04 00:10:59.643360565 +0100
-@@ -101,7 +101,7 @@
- DDCPCI=
- if test x$support_ddcpci = xyes; then
- AC_CHECK_HEADERS([pci/pci.h], [], [AC_MSG_ERROR([PCI utils headers not found, please install pci-utils.], [1])], [])
-- AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])])
-+ AC_CHECK_LIB([pci], [pci_alloc], [], [AC_MSG_ERROR([PCI utils library not found, please install pci-utils.], [1])], [-lz])
- DDCPCI=ddcpci
- AC_DEFINE_UNQUOTED(HAVE_DDCPCI, 1, [Define if ddccontrol is built with ddcpci support.])
- fi
-diff -urN ddccontrol-0.4.2.orig/src/ddcpci/Makefile.am ddccontrol-0.4.2/src/ddcpci/Makefile.am
---- ddccontrol-0.4.2.orig/src/ddcpci/Makefile.am 2007-01-04 00:08:09.929689134 +0100
-+++ ddccontrol-0.4.2/src/ddcpci/Makefile.am 2007-01-04 00:20:26.227648363 +0100
-@@ -1,7 +1,7 @@
- INCLUDES = -I../lib -DLOCALEDIR=\"$(localedir)\"
-
- bin_PROGRAMS = ddcpci
--ddcpci_LDFLAGS = -Wl,-z,now
-+ddcpci_LDFLAGS = -Wl,-z,now,-lz
- ddcpci_SOURCES = main.c nvidia.c radeon.c i2c-algo-bit.c intel810.c ddcpci.h i2c-algo-bit.h via.c sis.c
-
- install-exec-hook:
diff --git a/ddccontrol-systemd_modules.patch b/ddccontrol-systemd_modules.patch
new file mode 100644
index 0000000..0e6ff8b
--- /dev/null
+++ b/ddccontrol-systemd_modules.patch
@@ -0,0 +1,11 @@
+--- ddccontrol-1.0.3/src/lib/Makefile.am~ 2024-01-31 09:38:39.000000000 +0000
++++ ddccontrol-1.0.3/src/lib/Makefile.am 2025-08-20 11:25:57.086445143 +0000
+@@ -9,7 +9,7 @@
+
+ $(pkgconfig_DATA): $(srcdir)/ddccontrol.pc.in $(top_builddir)/config.status
+
+-modulesdir = $(libdir)/modules-load.d/
++modulesdir = /usr/lib/modules-load.d/
+ modules_DATA = ddccontrol-i2c-dev.conf
+
+ lib_LTLIBRARIES = libddccontrol.la
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ddccontrol.git/commitdiff/78c20ff997f1d5482c30a0771375ee2a8aefb22f
More information about the pld-cvs-commit
mailing list