4 changed files with 75 additions and 81 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/nvidia-settings-435.17.tar.bz2
+SOURCES/nvidia-settings-352.21.tar.bz2
--- a/.libXNVCtrl.metadata
+++ b/.libXNVCtrl.metadata
@ -1 +1 @@
-27ecd1c9d2ebad90bc73145d2ae68c03e98c1545  SOURCES/nvidia-settings-435.17.tar.bz2
+0c2d91e0fe941d7ff638bc55fb816528199e1241 SOURCES/nvidia-settings-352.21.tar.bz2
--- a/SOURCES/libxnvctrl_so_0.patch
+++ b/SOURCES/libxnvctrl_so_0.patch
@ -1,39 +1,67 @@
-diff -up nvidia-settings-435.17/src/libXNVCtrl/Makefile.shared nvidia-settings-435.17/src/libXNVCtrl/Makefile
--- nvidia-settings-435.17/src/libXNVCtrl/Makefile.shared	2019-08-07 06:12:32.000000000 +0200
-+++ nvidia-settings-435.17/src/libXNVCtrl/Makefile	2019-08-26 16:23:41.921778088 +0200
-@@ -50,8 +50,9 @@ LDFLAGS += $(XNVCTRL_LDFLAGS)
- 
- .PHONY: clean
- 
-all: $(LIBXNVCTRL)
-+all: $(LIBXNVCTRL) libXNVCtrl.so
- 
- clean:
- 	rm -rf $(LIBXNVCTRL) *~ \
- 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
-+	rm -f libXNVCtrl.so libXNVCtrl.so.*
-diff -up nvidia-settings-435.17/src/Makefile.shared nvidia-settings-435.17/src/Makefile
--- nvidia-settings-435.17/src/Makefile.shared	2019-08-07 06:12:31.000000000 +0200
-+++ nvidia-settings-435.17/src/Makefile	2019-08-26 16:17:31.133406921 +0200
-@@ -106,6 +106,9 @@ endif
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -106,6 +106,9 @@
 XNVCTRL_DIR             ?= libXNVCtrl
- XCONFIG_PARSER_DIR      ?= XF86Config-parser
- COMMON_UTILS_DIR        ?= common-utils
+ XNVCTRL_MAKEFILE        ?= Makefile
+ XNVCTRL_ARCHIVE         ?= $(XNVCTRL_DIR)/libXNVCtrl.a
 +XNVCTRL_SHARED          ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
 +#XNVCTRL_LIB            ?= $(XNVCTRL_ARCHIVE)
 +XNVCTRL_LIB             ?= $(XNVCTRL_SHARED)
+ XCONFIG_PARSER_DIR      ?= XF86Config-parser
+ COMMON_UTILS_DIR        ?= common-utils
 COMMON_UNIX_DIR         ?= common-unix
- VIRTUAL_RESOLUTIONS_DIR ?= $(COMMON_UNIX_DIR)/virtual-resolutions
+@@ -280,14 +283,17 @@
+ 	$(MKDIR) $(BINDIR)
+ 	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
 
-diff -up nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk.shared nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk
--- nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk.shared	2019-08-07 06:12:32.000000000 +0200
-+++ nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk	2019-08-26 16:54:44.518016474 +0200
-@@ -47,3 +47,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,
- 
- $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
- 	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
+-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
+	$(MAKE) -C $(XNVCTRL_DIR)
 +
-+libXNVCtrl.so: $(LIBXNVCTRL_OBJ)
+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
+ 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
+-	    -rdynamic -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) $(LIBS)
+	    -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
+ 	$(call quiet_cmd,STRIP_CMD) $@
+ 
+ $(GTK2LIB): $(GTK2_OBJS) $(XCP_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
+-	    $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
+	    $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $(GTK2LIB) \
+ 	    -Wl,-soname -Wl,$(GTK2LIB_SONAME) \
+ 	    $(GTK2_OBJS) $(XCP_OBJS)
+@@ -296,7 +302,7 @@
+ ifdef BUILD_GTK3LIB
+ $(GTK3LIB): $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+-	    $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
+	    $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $(GTK3LIB) \
+ 	    -Wl,-soname -Wl,$(GTK3LIB_SONAME) \
+ 	    $(GTK3_OBJS) $(XCP_OBJS)
+--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
+@@ -55,10 +55,17 @@
+ .PHONY: clean
+ 
+ all: $(LIBXNVCTRL)
+all: libXNVCtrl.so
+ 
+ $(LIBXNVCTRL) : $(OBJS)
+ 	$(AR) ru $@ $(OBJS)
+ 
+libXNVCtrl.so: $(OBJS)
+	$(RM) $@ $@.*
 +	$(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
 +	ln -s $@.0.0.0 $@.0
 +	ln -s $@.0 $@
+
+ # define the rule to build each object file
+ $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
+ 
+@@ -68,3 +75,4 @@
+ clean:
+ 	rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
+ 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+	rm -f libXNVCtrl.so libXNVCtrl.so.*
--- a/SPECS/libXNVCtrl.spec
+++ b/SPECS/libXNVCtrl.spec
@ -1,11 +1,12 @@
 Name:           libXNVCtrl
-Version:        435.17
-Release:        6%{?dist}
+Version:        352.21
+Release:        9%{?dist}
 Summary:        Library providing the NV-CONTROL API
 License:        GPLv2+
-URL:            https://download.nvidia.com/XFree86/nvidia-settings/
-Source0:        %{url}/nvidia-settings-%{version}.tar.bz2
+URL:            ftp://download.nvidia.com/XFree86/nvidia-settings/
+Source0:        ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{version}.tar.bz2
 Patch0:         libxnvctrl_so_0.patch
+Patch1:         libxnvctrl_optflags.patch

 BuildRequires: gcc
 BuildRequires: make
@ -13,10 +14,6 @@ BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: hostname

-# Obsoletes older package provided in the NVIDIA CUDA repository
-Obsoletes: nvidia-%{name} < 3:%{version}-100
-Provides: nvidia-%{name} = 3:%{version}-100
-
 %description
 This packages contains the libXNVCtrl library from the nvidia-settings
 application. This library provides the NV-CONTROL API for communicating with
@ -27,8 +24,9 @@ themselves.

 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       libX11-devel%{?_isa}
+Requires:       libX11-devel

 %description    devel
 The %{name}-devel package contains libraries and header files for
@ -36,18 +34,18 @@ developing applications that use %{name}.


 %prep
-%autosetup -p1 -n nvidia-settings-%{version}
+%setup -q -n nvidia-settings-%{version}
+%patch0 -p1
+%patch1 -p1


 %build
-%{set_build_flags}
-%make_build \
-   CC="%{__cc}" \
+make %{?_smp_mflags} \
+   CC="gcc" \
   NV_VERBOSE=1 \
-   DO_STRIP=0 \
-   STRIP_CMD=/dev/true \
-   -C src/%{name} \
-   libXNVCtrl.so
+   OPTFLAGS="%{optflags}" \
+   LDFLAGS="%{build_ldflags}" \
+   -C src/%{name}


 %install
@ -67,7 +65,7 @@ popd


 %files
-%license COPYING
+%doc COPYING
 %{_libdir}/%{name}.so.0*

 %files devel
@ -77,38 +75,6 @@ popd


 %changelog
-* Fri Feb 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 435.17-6
- Rebuilt for MSVSphere 9.3
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Tom Stellard <tstellar@redhat.com> - 435.17-2
- Replace hard-coded gcc with __cc macro
-
-* Mon Aug 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 435.17-1
- Update to 435.17
- Obsoletes older nvidia-libXNVCtrl from cuda repo
- Switch URL to https
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 352.21-9
 - Use ldconfig scriptlet macros