- up to 270.30

Changed files:
    nvidia-settings-xlibs.patch -> 1.5
    nvidia-settings.spec -> 1.21

diff --git a/nvidia-settings-xlibs.patch b/nvidia-settings-xlibs.patch
deleted file mode 100644 (file)
index a46f15d..0000000
--- a/nvidia-settings-xlibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- nvidia-settings-1.0/Makefile       2006-12-26 21:46:56.000000000 +0200
-+++ nvidia-settings-1.0/Makefile       2010-06-14 14:34:53.948906186 +0300
-@@ -116,9 +116,9 @@
- X11_CFLAGS = $(X11_INC_DIRS)
- 
- GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
--GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
-+GTK_LIBS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
- 
--X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
-+X11_LIBS := $(X11_LIB_DIRS) -lXxf86vm -lX11 -lXext -ldl
- 
- XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
- XNVCTRL_DIR := src/libXNVCtrl
-@@ -146,6 +146,7 @@
- 
- ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
- ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS)
-+ALL_LIBS = $(GTK_LIBS) $(X11_LIBS)
- 
- CPPFLAGS = $(ALL_CFLAGS)
- 
-@@ -236,10 +237,10 @@
-       $(MAKE) NV_CFLAGS='$(NV_CFLAGS)' -C $(XF86PARSER_DIR)
- 
- $(XNVCTRL_LIB):
--      $(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' -C $(XNVCTRL_DIR)
-+      $(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' LIBS='$(ALL_LIBS)' -C $(XNVCTRL_DIR)
- 
- $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB)
--      $(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -o $@
-+      $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) $(ALL_LIBS) -o $@
- 
- .PHONY: $(XF86PARSER_LIB) dist clean clobber
- 

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index e81e0e5247d82ecc76f7450a0195a1855666c24e..2fb9c0e409ab21317654da94c3044f7bc86521a0 100644 (file)
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -6,13 +6,12 @@
 Summary:       Tool for configuring the NVIDIA driver
 Summary(pl.UTF-8):     Narzędzie do konfigurowania sterownika NVIDIA
 Name:          nvidia-settings
-Version:       195.36.31
-Release:       2
+Version:       270.30
+Release:       1
 License:       GPL
 Group:         X11
-Source0:       ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.gz
-# Source0-md5: 30782edbe54e99f678cb73e08cd67470
-Patch0:                %{name}-xlibs.patch
+Source0:       ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
+# Source0-md5: 8137b32cae22cd14f1fca5fe6d945db7
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 URL:           ftp://download.nvidia.com/XFree86/nvidia-settings/
@@ -77,32 +76,34 @@ Biblioteka do obsługi rozszerzenia NV-CONTROL z najnowszych
 sterowników NVIDIA.
 
 %prep
-%setup -q -n %{name}-1.0
-%patch0 -p1
+%setup -q
+
+%{__rm} src/libXNVCtrl/libXNVCtrl.a
 
 %build
 %if %{with libXNVCtrl}
-cd src/libXNVCtrl
-%{__make} clean
-%{__make} \
+%{__make} -C src/libXNVCtrl \
+       NV_VERBOSE=1 \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
-cd ../..
+       X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
 %endif
 
 %if %{with nvidia_settings}
 %{__make} \
+       NV_VERBOSE=1 \
+       STRIP_CMD=: \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcppflags} %{rpmcflags}" \
-       LDFLAGS="%{rpmldflags}"
+       X_CFLAGS="%{rpmcppflags} %{rpmcflags}" \
+       X_LDFLAGS="%{rpmldflags}"
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %if %{with nvidia_settings}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir}}
-install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-cp -p doc/nvidia-settings.1 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1
+%{__make} install \
+       INSTALL="install -p" \
+       prefix=$RPM_BUILD_ROOT%{_prefix}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 %endif