Browse Source

reverted commit r12312

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12313 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
72e859eb58
3 changed files with 39 additions and 52 deletions
  1. 22 22
      P/PackageKit/PackageKit-vl.spec
  2. 11 5
      c/cups/cups-vl.spec
  3. 6 25
      k/kernel/kernel-vl.spec

+ 22 - 22
P/PackageKit/PackageKit-vl.spec

@@ -8,14 +8,19 @@ License:	GPLv2
 Group:		Applications/System
 Source0:	http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
 Source100:	filter-requires-%{name}.sh
+# from autoconf-archive-2018.03.13
+# https://www.gnu.org/software/autoconf-archive/
+Source1000: ax_cxx_compile_stdcxx.m4
+Source1001: ax_cxx_compile_stdcxx_11.m4
+Source1002: ax_cxx_compile_stdcxx_14.m4
+
 
 # for VineLinux
-Patch100: pk-aptrpm.patch
-#Patch100:	PackageKit-0.7.1-backend-aptcc-vine.patch
+Patch100:	PackageKit-0.7.1-backend-aptcc-vine.patch
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:	yasumichi
+Packager:	yasumichi, Takemikaduchi
 
 Summary:	A DBUS packaging abstraction layer
 Summary(ja):	DBUS のパッケージング抽象レイヤ
@@ -29,21 +34,17 @@ BuildRequires:	dbus-glib-devel
 BuildRequires:	libgudev1-devel
 BuildRequires:	pm-utils-devel
 BuildRequires:	polkit-devel
-BuildRequires:	NetworkManager-libnm-devel
+BuildRequires:	NetworkManager-devel
 BuildRequires:	sqlite3-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	gtk2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:	gstreamer1-devel
 BuildRequires:	gstreamer1-plugins-base-devel
+BuildRequires:	apt-devel
 BuildRequires:	gtk-doc
 BuildRequires:	python
 BuildRequires:	bash-completion
-BuildRequires:	autoconf-archive
-BuildRequires:	vala-devel
-
-Requires: apt >= 0.5.15lorg3.95-29
-Requires: perl-List-MoreUtils
 
 # Don't depend on Debconf::Client::ConfModule
 %define __perl_requires %{SOURCE100}
@@ -91,18 +92,24 @@ PackageKit の HTML ドキュメント
 
 %prep
 %setup -q
-%patch100 -p1 -b .vine
+#%patch100 -p1 -b .vine
+
+cp -f \
+  %{SOURCE1000} \
+  %{SOURCE1001} \
+  %{SOURCE1002} \
+  m4/
 
 %build
-autoreconf -ivf
+autoreconf -if
 %configure \
 	--disable-static \
+	--disable-systemd \
 	--disable-qt \
 	--disable-systemd \
-	--disable-systemd-updates \
-	--enable-aptrpm \
-	--with-default-backend=aptrpm
-
+	--disable-systemd-updates 
+#	--enable-aptcc \
+#	--with-default-backend=aptcc
 %{__make} %{?_smp_mflags}
 
 %install
@@ -173,10 +180,6 @@ popd > /dev/null
 %{_bindir}/pkcon
 %{_libdir}/packagekit-backend/libpk_backend_dummy.so
 %{_libdir}/packagekit-backend/libpk_backend_test_*.so
-%{_libdir}/packagekit-backend/libpk_backend_aptrpm.so
-%{_datadir}/PackageKit/helpers/aptrpm
-%{_datadir}/apt/scripts/*
-%{_sysconfdir}/apt/apt.conf.d/packagekit.conf
 %if 0%{?bundled_libdnf}
 %{_libdir}/PackageKit/
 %endif
@@ -222,9 +225,6 @@ popd > /dev/null
 %{_datadir}/gtk-doc/html/PackageKit
 
 %changelog
-* Wed Oct 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.12-2
-- added apt-rpm support.
-
 * Mon Dec 10 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.12-1
 - new upstream release.
 

+ 11 - 5
c/cups/cups-vl.spec

@@ -7,7 +7,7 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 2.3.0
+Version: 2.2.11
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -16,7 +16,7 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, tomop
 
-Source: https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
+Source: https://github.com/apple/cups/releases/download/release-%{version}/cups-%{version}-source.tar.gz
 # Our initscript
 Source1: cups.init
 # Pixmap for desktop file
@@ -52,7 +52,9 @@ Source206: pxlmono.ppd.gz
 Source207: pxlcolor.ppd.gz
 Source208: cups.conf
 
+Patch1: cups-no-gzip-man.patch
 Patch2: cups-system-auth.patch
+Patch3: cups-multilib.patch
 Patch5: cups-banners.patch
 Patch7: cups-no-export-ssllibs.patch
 Patch8: cups-direct-usb.patch
@@ -74,6 +76,7 @@ Patch38: cups-ypbind.patch
 #Patch100: cups-lspp.patch
 
 # upstream
+Patch9: cups-lpr-help.patch
 Patch18: cups-filter-debug.patch
 Patch29: cups-dymo-deviceid.patch
 
@@ -201,14 +204,20 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %prep
 %setup -q -n %{name}-%{version}
 
+# Don't gzip man pages in the Makefile, let rpmbuild do it.
+%patch1 -p1 -b .no-gzip-man
 # Use the system pam configuration.
 %patch2 -p1 -b .system-auth
+# Prevent multilib conflict in cups-config script.
+%patch3 -p1 -b .multilib
 # Ignore rpm save/new files in the banners directory.
 %patch5 -p1 -b .banners
 # Don't export SSLLIBS to cups-config.
 %patch7 -p1 -b .no-export-ssllibs
 # Allow file-based usb device URIs.
 %patch8 -p1 -b .direct-usb
+# Add --help option to lpr.
+%patch9 -p1 -b .lpr-help
 # Fix compilation of peer credentials support.
 #%%patch10 -p1 -b .peercred
 # Maintain a cupsd.pid file.
@@ -635,9 +644,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
-- new upstream release.
-
 * Wed May 08 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.11-1
 - new upstream release.
 

+ 6 - 25
k/kernel/kernel-vl.spec

@@ -32,7 +32,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 14
-%define patchlevel 153
+%define patchlevel 145
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -161,7 +161,6 @@ BuildRequires: gcc >= 3.3.5, binutils >= 2.15
 BuildRequires: bc
 BuildRequires: openssl-devel
 BuildRequires: linux-firmware
-BuildRequires: elfutils-libelf-devel
 %if %{with_tools}
 BuildRequires: pciutils-devel gettext ncurses-devel
 %endif
@@ -169,9 +168,9 @@ BuildRequires: pciutils-devel gettext ncurses-devel
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:	daisuke, shaolin, iwamoto
+Packager:	daisuke, shaolin, iwamoto, Takemikaduchi
 
-Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
 Source10: COPYING.modules
 Source11: genkey
 Source21: kernel-%{kversion}-i686.config
@@ -189,7 +188,7 @@ Source100: logo_vine_clut224.ppm
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 %if %{patchlevel}
-Patch1: https://mirrors.edge.kernel.org/pub/linux/kernel/v4.x/patch-%{kversion}.%{patchlevel}.xz
+Patch1: patch-%{kversion}.%{patchlevel}.xz
 # Patch2: patch-4.14.14-rc1.xz
 %endif
 
@@ -222,7 +221,7 @@ Patch1430: linux-3.9.2-tg3-support-newid.patch
 # Patch1461: linux-4.11_e1000e_3.3.5.3_buildfix.patch
 
 # Aquantia driver update from 4.19.y
-Patch1470: linux-4.14.153_4.19.83-aquantia_update.patch.xz
+Patch1470: linux-4.14.111_4.19.34-aquantia_update.patch.xz
 
 # Misc bits.
 Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
@@ -922,8 +921,6 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/kernel-doc-%{kversion}/Documentation
 chmod -R a+r *
 # copy the source over
 tar cf - Documentation | tar xf - -C $RPM_BUILD_ROOT%{_docdir}/kernel-doc-%{kversion}
-
-rm -f %{buildroot}%{_datadir}/doc/kernel-doc-%{kversion}/Documentation/.gitignore
 %endif
 
 # build source package
@@ -944,9 +941,6 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{kversion}/arch/x86/tools/relocs
 # don't accidentally overwrite their currently working moduleset and hose their system
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{kversion}/Makefile
 install -m 644 %{SOURCE10}  $RPM_BUILD_ROOT/usr/src/linux-%{kversion}
-
-# drop binaries: kernel-source is noarch
-rm -rf %{buildroot}%{_prefix}/src/linux-%{kversion}/tools
 %endif
 
 %if %{with_headers}
@@ -979,8 +973,6 @@ make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
 
 sync;sync;sync;
 
-touch ../cpupower.lang
-
 %if %{with_tools}
 make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
 rm -f %{buildroot}%{_libdir}/*.{a,la}
@@ -1020,7 +1012,6 @@ popd
 
 sync;sync;sync;
 
-
 ###
 ### clean
 ###
@@ -1183,10 +1174,8 @@ fi
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}
-%if %{image_install_path} != "boot"
 /boot/System.map-%{KVERREL}
 /boot/config-%{KVERREL}
-%endif
 %dir /lib/modules/%{KVERREL}
 /lib/modules/%{KVERREL}/modules.*
 /lib/modules/%{KVERREL}/kernel
@@ -1202,10 +1191,8 @@ fi
 %files pae
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}pae
-%if %{image_install_path} != "boot"
 /boot/System.map-%{KVERREL}pae
 /boot/config-%{KVERREL}pae
-%endif
 %dir /lib/modules/%{KVERREL}pae
 /lib/modules/%{KVERREL}pae/modules.*
 /lib/modules/%{KVERREL}pae/kernel
@@ -1237,7 +1224,7 @@ fi
 
 
 %if %{with_tools}
-%files -n kernel-tools -f cpupower.lang
+%files -n kernel-tools 
 %defattr(-,root,root)
 
 %{_bindir}/cpupower
@@ -1264,12 +1251,6 @@ fi
 %endif
 
 %changelog
-* Tue Nov 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.153-1
-- updated to 4.14.153.
-- updated Patch1470 (aquantia).
-- enabled kprobes.
-- dropped arch-dependent files from kernel-source.
-
 * Fri Sep 20 2019 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.145-1
 - update to 4.14.143