February 2016 - scm-commits - Fedora Mailing-Lists

amigadave pushed to libproxy (f24). "Use pkgconfig for BuildRequires (..more)"

by notifications＠fedoraproject.org

From f066a858043394e4fca0481b41e9651e76ed7578 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Mon, 29 Feb 2016 10:51:40 +0000 Subject: Use pkgconfig for BuildRequires https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- libproxy.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 7c0134c..d3dd28b 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -14,22 +14,23 @@ Source0: https://github.com/libproxy/%{name}/archive/%{version}.tar.gz # http://code.google.com/p/libproxy/issues/detail?id=152 Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: libmodman-devel >= 2.0.1 BuildRequires: cmake >= 2.6.0 %if ! 0%{?bootstrap} +# gnome +BuildRequires: pkgconfig(gio-2.0) >= 2.26 # mozjs -BuildRequires: pkgconfig(mozjs185) +BuildRequires: pkgconfig(mozjs185) # NetworkManager -BuildRequires: NetworkManager-devel -BuildRequires: dbus-devel +BuildRequires: pkgconfig(NetworkManager) +# pacrunner (and NetworkManager) +BuildRequires: pkgconfig(dbus-1) # webkit (gtk3) -BuildRequires: webkitgtk3-devel +BuildRequires: pkgconfig(javascriptcoregtk-3.0) >= 1.5.0 # kde BuildRequires: /usr/bin/kreadconfig5 -# pacrunner -BuildRequires: dbus-devel %else # Obsoletes of disabled subpackages. Provides: %{name}-mozjs = %{version}-%{release} @@ -130,7 +131,6 @@ PacRunner. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for @@ -215,6 +215,7 @@ make test - Simplify conditional macros - Use isa macro when requiring base package - Use license macro for COPYING +- Use pkgconfig for BuildRequires * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/libproxy.git/commit/?h=f24&id=f066a858...

3 years, 9 months

1
0
0 / 0

amigadave pushed to libproxy (f24). "Use isa macro when requiring base package (..more)"

by notifications＠fedoraproject.org

From 15db149f703922ede41f9011e1ac315f13e0ebe6 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Mon, 29 Feb 2016 09:54:40 +0000 Subject: Use isa macro when requiring base package https://fedoraproject.org/wiki/Packaging:Guidelines#Requiring_Base_Package --- libproxy.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index e1a8811..283463b 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -54,7 +54,7 @@ libproxy offers the following features: %package bin Summary: Binary to test %{name} Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description bin The %{name}-bin package contains the proxy binary for %{name} @@ -72,7 +72,7 @@ The %{name}-python package contains the python binding for %{name} %package gnome Summary: Plugin for %{name} and gnome Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gnome The %{name}-gnome package contains the %{name} plugin for gnome. @@ -80,7 +80,7 @@ The %{name}-gnome package contains the %{name} plugin for gnome. %package kde Summary: Plugin for %{name} and kde Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: /usr/bin/kreadconfig5 %description kde @@ -89,7 +89,7 @@ The %{name}-kde package contains the %{name} plugin for kde. %package mozjs Summary: Plugin for %{name} and mozjs Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} %description mozjs @@ -98,7 +98,7 @@ The %{name}-mozjs package contains the %{name} plugin for mozjs. %package networkmanager Summary: Plugin for %{name} and networkmanager Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description networkmanager The %{name}-networkmanager package contains the %{name} plugin @@ -107,7 +107,7 @@ for networkmanager. %package webkitgtk3 Summary: Plugin for %{name} and webkitgtk3 Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} %description webkitgtk3 @@ -117,7 +117,7 @@ webkitgtk3. %package pacrunner Summary: Plugin for %{name} and PacRunner Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} %description pacrunner @@ -129,7 +129,7 @@ PacRunner. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -212,6 +212,7 @@ make test * Mon Feb 29 2016 David King <amigadave(a)amigadave.com> - 0.4.12-1 - Update to 0.4.12 - Simplify conditional macros +- Use isa macro when requiring base package * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/libproxy.git/commit/?h=f24&id=15db149f...

3 years, 9 months

1
0
0 / 0

amigadave pushed to libproxy (f24). "Update to 0.4.12"

by notifications＠fedoraproject.org

From 5c277ecddbb5f24609ab4fc81ba4338c7b4d0beb Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Mon, 29 Feb 2016 11:27:32 +0000 Subject: Update to 0.4.12 --- .gitignore | 1 + 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch | 90 ---------------------- libproxy-0.4.10-mozjs.patch | 12 --- libproxy-0.4.11-crash.patch | 41 ---------- libproxy-0.4.11-fdleak.patch | 20 ----- libproxy.spec | 31 ++++---- sources | 2 +- 7 files changed, 15 insertions(+), 182 deletions(-) delete mode 100644 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch delete mode 100644 libproxy-0.4.10-mozjs.patch delete mode 100644 libproxy-0.4.11-crash.patch delete mode 100644 libproxy-0.4.11-fdleak.patch diff --git a/.gitignore b/.gitignore index 3318613..1ea89b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libproxy-0.*.tar.gz +/0.4.12.tar.gz diff --git a/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch b/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch deleted file mode 100644 index 217b843..0000000 --- a/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch +++ /dev/null @@ -1,90 +0,0 @@ -From cccc44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters(a)verbum.org> -Date: Mon, 3 Jun 2013 17:09:25 -0400 -Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0 - -GNOME 3.10 is moving to hard require mozjs-17.0, so we should support -it too. See also: - -https://bugs.freedesktop.org/show_bug.cgi?id=59830 -https://bugzilla.gnome.org/show_bug.cgi?id=690982 ---- - libproxy/cmake/modules/pacrunner_mozjs.cmk | 8 +++++++- - libproxy/modules/pacrunner_mozjs.cpp | 16 +++++++++++++--- - 2 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk -index 21072db..49856a6 100644 ---- a/libproxy/cmake/modules/pacrunner_mozjs.cmk -+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk -@@ -14,7 +14,13 @@ elseif(NOT APPLE) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - else() -- set(MOZJS_FOUND 0) -+ pkg_search_module(MOZJS mozjs-17.0) -+ if(MOZJS_FOUND) -+ include_directories(${MOZJS_INCLUDE_DIRS}) -+ link_directories(${MOZJS_LIBRARY_DIRS}) -+ else() -+ set(MOZJS_FOUND 0) -+ endif() - endif() - else() - set(MOZJS_FOUND 0) -diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp -index abb4b9d..f5e678c 100644 ---- a/libproxy/modules/pacrunner_mozjs.cpp -+++ b/libproxy/modules/pacrunner_mozjs.cpp -@@ -19,6 +19,7 @@ - - #include <cstring> // ? - #include <unistd.h> // gethostname -+#include <stdint.h> - - #include "../extension_pacrunner.hpp" - using namespace libproxy; -@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) { - return true; - } - --static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) { -+static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) { - jsval *argv = JS_ARGV(cx, vp); - return dnsResolve_(cx, argv[0], vp); - } - --static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) { -+static JSBool myIpAddress(JSContext *cx, uint32_t /*argc*/, jsval *vp) { - char *hostname = (char *) JS_malloc(cx, 1024); - if (!gethostname(hostname, 1023)) { - JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); -@@ -98,7 +99,12 @@ static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) { - static JSClass cls = { - "global", JSCLASS_GLOBAL_FLAGS, - JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, -- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, -+ JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, -+#if JS_VERSION == 186 -+ NULL, -+#else -+ JS_FinalizeStub, -+#endif - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL - }; - -@@ -117,7 +123,11 @@ public: - //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX); - //JS_SetVersion(this->jsctx, JSVERSION_LATEST); - //JS_SetErrorReporter(cx, reportError); -+#if JS_VERSION == 186 -+ if (!(this->jsglb = JS_NewGlobalObject(this->jsctx, &cls, NULL))) goto error; -+#else - if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error; -+#endif - if (!JS_InitStandardClasses(this->jsctx, this->jsglb)) goto error; - - // Define Javascript functions --- -1.7.1 - diff --git a/libproxy-0.4.10-mozjs.patch b/libproxy-0.4.10-mozjs.patch deleted file mode 100644 index 88b1c19..0000000 --- a/libproxy-0.4.10-mozjs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libproxy-0.4.10/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig libproxy-0.4.10/libproxy/cmake/modules/pacrunner_mozjs.cmk ---- libproxy-0.4.10/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig 2012-10-02 16:20:40.000000000 +0200 -+++ libproxy-0.4.10/libproxy/cmake/modules/pacrunner_mozjs.cmk 2012-10-17 00:36:43.645579472 +0200 -@@ -9,7 +9,7 @@ if(WIN32) - elseif(NOT APPLE) - option(WITH_MOZJS "Search for MOZJS package" ON) - if (WITH_MOZJS) -- pkg_search_module(MOZJS mozjs185>=1.8.5) -+ pkg_search_module(MOZJS mozjs185) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) diff --git a/libproxy-0.4.11-crash.patch b/libproxy-0.4.11-crash.patch deleted file mode 100644 index ed9f1a9..0000000 --- a/libproxy-0.4.11-crash.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash libproxy-0.4.11/libproxy/extension_pacrunner.cpp ---- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash 2010-07-29 08:14:59.000000000 -0400 -+++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp 2013-11-11 15:23:56.987266457 -0500 -@@ -22,20 +22,10 @@ using namespace libproxy; - - pacrunner::pacrunner(string, const url&) {} - --pacrunner_extension::pacrunner_extension() { -- this->pr = NULL; --} -+pacrunner_extension::pacrunner_extension() {} - --pacrunner_extension::~pacrunner_extension() { -- if (this->pr) delete this->pr; --} -+pacrunner_extension::~pacrunner_extension() {} - - pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) { -- if (this->pr) { -- if (this->last == pac) -- return this->pr; -- delete this->pr; -- } -- -- return this->pr = this->create(pac, pacurl); -+ return this->create(pac, pacurl); - } -diff -up libproxy-0.4.11/libproxy/proxy.cpp.crash libproxy-0.4.11/libproxy/proxy.cpp ---- libproxy-0.4.11/libproxy/proxy.cpp.crash 2013-11-11 15:25:27.309271353 -0500 -+++ libproxy-0.4.11/libproxy/proxy.cpp 2013-11-11 15:25:31.569271584 -0500 -@@ -416,7 +416,9 @@ void proxy_factory::run_pac(url &realurl - - /* Run the PAC, but only try one PACRunner */ - if (debug) cerr << "Using pacrunner: " << typeid(*pacrunners[0]).name() << endl; -- string pacresp = pacrunners[0]->get(this->pac, this->pacurl->to_string())->run(realurl); -+ pacrunner* runner = pacrunners[0]->get(this->pac, this->pacurl->to_string()); -+ string pacresp = runner->run(realurl); -+ delete runner; - if (debug) cerr << "Pacrunner returned: " << pacresp << endl; - format_pac_response(pacresp, response); - } diff --git a/libproxy-0.4.11-fdleak.patch b/libproxy-0.4.11-fdleak.patch deleted file mode 100644 index 28c0954..0000000 --- a/libproxy-0.4.11-fdleak.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libproxy-0.4.11/libproxy/url.cpp.fdleak libproxy-0.4.11/libproxy/url.cpp ---- libproxy-0.4.11/libproxy/url.cpp.fdleak 2013-09-19 08:45:48.718145364 -0400 -+++ libproxy-0.4.11/libproxy/url.cpp 2013-09-19 08:46:31.374147676 -0400 -@@ -403,6 +403,7 @@ char* url::get_pac() { - buffer = NULL; - } - } -+ close (sock); - return buffer; - } - -@@ -495,7 +496,7 @@ char* url::get_pac() { - } - - // Clean up -- shutdown(sock, SHUT_RDWR); -+ close(sock); - return buffer; - } - diff --git a/libproxy.spec b/libproxy.spec index b99f64b..489a82a 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -12,21 +12,16 @@ %endif Name: libproxy -Version: 0.4.11 -Release: 13%{?svn}%{?dist} +Version: 0.4.12 +Release: 1%{?dist} Summary: A library handling all the details of proxy configuration Group: System Environment/Libraries License: LGPLv2+ -URL: http://code.google.com/p/libproxy/ - -Source0: http://libproxy.googlecode.com/files/libproxy-%{version}%{?svn}.tar.gz -Patch0: libproxy-0.4.10-mozjs.patch -Patch1: 0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch +URL: https://libproxy.github.io/libproxy/ +Source0: https://github.com/libproxy/%{name}/archive/%{version}.tar.gz # http://code.google.com/p/libproxy/issues/detail?id=152 -Patch2: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch -Patch3: libproxy-0.4.11-fdleak.patch -Patch4: libproxy-0.4.11-crash.patch +Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch BuildRequires: python-devel BuildRequires: libmodman-devel >= 2.0.1 @@ -38,7 +33,7 @@ BuildRequires: GConf2-devel BuildRequires: libXmu-devel } # mozjs -%{?_with_mozjs:BuildRequires: mozjs17-devel} +%{?_with_mozjs:BuildRequires: pkgconfig(mozjs185)} # NetworkManager %{?_with_networkmanager: BuildRequires: NetworkManager-devel @@ -49,7 +44,7 @@ BuildRequires: dbus-devel # webkit (gtk3) %{?_with_webkitgtk3:BuildRequires: webkitgtk3-devel} # kde -%{?_with_kde:BuildRequires: kdelibs-devel} +%{?_with_kde:BuildRequires: /usr/bin/kreadconfig5} # pacrunner %{?_with_pacrunner:BuildRequires: dbus-devel} @@ -114,6 +109,7 @@ The %{name}-gnome package contains the %{name} plugin for gnome. Summary: Plugin for %{name} and kde Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: /usr/bin/kreadconfig5 %description kde The %{name}-kde package contains the %{name} plugin for kde. @@ -190,11 +186,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch2 -p1 -b .orig -%patch3 -p1 -b .fdleak -%patch4 -p1 -b .crash +%patch0 -p1 %build %{cmake} \ @@ -255,7 +247,7 @@ make test %{?_with_kde: %files kde %defattr(-,root,root,-) -%{_libdir}/%{name}/%{version}/modules/config_kde4.so +%{_libdir}/%{name}/%{version}/modules/config_kde.so } %{?_with_mozjs: @@ -297,6 +289,9 @@ make test %changelog +* Mon Feb 29 2016 David King <amigadave(a)amigadave.com> - 0.4.12-1 +- Update to 0.4.12 + * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 44dfe22..45e9d46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cd1ae2a4abecf44b3f24d6639d2cd84 libproxy-0.4.11.tar.gz +258d89cc052e0a3c09aa1f42d7f93045 0.4.12.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/libproxy.git/commit/?h=f24&id=5c277ecd...

3 years, 9 months

1
0
0 / 0

amigadave pushed to libproxy (f24). "Simplify conditional macros (..more)"

by notifications＠fedoraproject.org

From df96441e4e762259d55e709eddd5658cded45345 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Mon, 29 Feb 2016 08:34:57 +0000 Subject: Simplify conditional macros The old webkitgtk plugin is obsolete, so remove mention of it entirely. Simplify all the other conditionals down to a single one for bootstrapping. Enable the tests in the check phase. https://fedoraproject.org/wiki/Packaging:Guidelines#Bootstrapping --- libproxy.spec | 125 +++++++++++----------------------------------------------- 1 file changed, 23 insertions(+), 102 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 489a82a..e1a8811 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,15 +1,6 @@ - -#0 to bootstrap libproxy circle dependencies - 1 normal case -%if 1 -%global _with_webkitgtk3 1 -%global _with_gnome3 1 -%global _with_mozjs 1 -%global _with_gnome 1 -%global _with_kde 1 -%global _with_networkmanager 1 -%global _with_python 1 -%global _with_pacrunner 1 -%endif +# When we are bootstrapping, we drop some dependencies. +# Set this to 0 after bootstrapping. +%{!?_with_bootstrap: %global bootstrap 0} Name: libproxy Version: 0.4.12 @@ -27,40 +18,25 @@ BuildRequires: python-devel BuildRequires: libmodman-devel >= 2.0.1 BuildRequires: cmake >= 2.6.0 -# gnome -%{?_with_gnome: -BuildRequires: GConf2-devel -BuildRequires: libXmu-devel -} +%if ! 0%{?bootstrap} # mozjs -%{?_with_mozjs:BuildRequires: pkgconfig(mozjs185)} +BuildRequires: pkgconfig(mozjs185) # NetworkManager -%{?_with_networkmanager: BuildRequires: NetworkManager-devel BuildRequires: dbus-devel -} -# webkit (gtk) -%{?_with_webkit:BuildRequires: WebKit-gtk-devel} # webkit (gtk3) -%{?_with_webkitgtk3:BuildRequires: webkitgtk3-devel} +BuildRequires: webkitgtk3-devel # kde -%{?_with_kde:BuildRequires: /usr/bin/kreadconfig5} +BuildRequires: /usr/bin/kreadconfig5 # pacrunner -%{?_with_pacrunner:BuildRequires: dbus-devel} - -#Obsoletes of disabled subpackages -%{!?_with_mozjs: +BuildRequires: dbus-devel +%else +# Obsoletes of disabled subpackages. Provides: %{name}-mozjs = %{version}-%{release} Obsoletes: %{name}-mozjs < %{version}-%{release} -} -%{!?_with_webkit: -Provides: %{name}-webkit = %{version}-%{release} -Obsoletes: %{name}-webkit < %{version}-%{release} -} -%{!?_with_webkitgtk3: Provides: %{name}-webkitgtk3 = %{version}-%{release} Obsoletes: %{name}-webkitgtk3 < %{version}-%{release} -} +%endif %description @@ -83,7 +59,7 @@ Requires: %{name} = %{version}-%{release} %description bin The %{name}-bin package contains the proxy binary for %{name} -%{?_with_python: +%if ! 0%{?bootstrap} %package python Summary: Binding for %{name} and python Group: System Environment/Libraries @@ -92,9 +68,7 @@ BuildArch: noarch %description python The %{name}-python package contains the python binding for %{name} -} -%{?_with_gnome: %package gnome Summary: Plugin for %{name} and gnome Group: System Environment/Libraries @@ -102,9 +76,7 @@ Requires: %{name} = %{version}-%{release} %description gnome The %{name}-gnome package contains the %{name} plugin for gnome. -} -%{?_with_kde: %package kde Summary: Plugin for %{name} and kde Group: System Environment/Libraries @@ -113,9 +85,7 @@ Requires: /usr/bin/kreadconfig5 %description kde The %{name}-kde package contains the %{name} plugin for kde. -} -%{?_with_mozjs: %package mozjs Summary: Plugin for %{name} and mozjs Group: System Environment/Libraries @@ -124,9 +94,7 @@ Provides: %{name}-pac = %{version}-%{release} %description mozjs The %{name}-mozjs package contains the %{name} plugin for mozjs. -} -%{?_with_networkmanager: %package networkmanager Summary: Plugin for %{name} and networkmanager Group: System Environment/Libraries @@ -135,21 +103,7 @@ Requires: %{name} = %{version}-%{release} %description networkmanager The %{name}-networkmanager package contains the %{name} plugin for networkmanager. -} -%{?_with_webkit: -%package webkit -Summary: Plugin for %{name} and webkit -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Provides: %{name}-pac = %{version}-%{release} - -%description webkit -The %{name}-webkit package contains the %{name} plugin for -webkit. -} - -%{?_with_webkitgtk3: %package webkitgtk3 Summary: Plugin for %{name} and webkitgtk3 Group: System Environment/Libraries @@ -157,11 +111,9 @@ Requires: %{name} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} %description webkitgtk3 -The %{name}-webkit package contains the %{name} plugin for +The %{name}-webkitgtk3 package contains the %{name} plugin for webkitgtk3. -} -%{?_with_pacrunner: %package pacrunner Summary: Plugin for %{name} and PacRunner Group: System Environment/Libraries @@ -171,7 +123,7 @@ Provides: %{name}-pac = %{version}-%{release} %description pacrunner The %{name}-pacrunner package contains the %{name} plugin for PacRunner. -} +%endif %package devel @@ -192,9 +144,11 @@ developing applications that use %{name}. %{cmake} \ -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \ -DWITH_PERL=OFF \ - %{!?_with_gnome3:-DWITH_GNOME3=OFF}\ - %{?_with_webkitgtk3:-DWITH_WEBKIT3=ON}\ - %{?_with_mozjs:-DWITH_MOZJS=ON}\ +%if ! 0%{?bootstrap} + -DWITH_GNOME3=ON \ + -DWITH_WEBKIT3=ON \ + -DWITH_MOZJS=ON \ +%endif . make VERBOSE=1 %{?_smp_mflags} @@ -205,10 +159,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" #In case all modules are disabled mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/modules -%{?_with_test: %check make test -} %post -p /sbin/ldconfig @@ -216,7 +168,6 @@ make test %files -%defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/*.so.* %dir %{_libdir}/%{name} @@ -224,64 +175,33 @@ make test %dir %{_libdir}/%{name}/%{version}/modules %files bin -%defattr(-,root,root,-) %{_bindir}/proxy -%{?_with_python: +%if ! 0%{?bootstrap} %files python -%defattr(-,root,root,-) %{python_sitelib}/* -} -%{?_with_gnome: %files gnome -%defattr(-,root,root,-) -%{!?_with_gnome3: -%{_libdir}/%{name}/%{version}/modules/config_gnome.so -%{_libexecdir}/pxgconf} -%{?_with_gnome3: %{_libdir}/%{name}/%{version}/modules/config_gnome3.so -%{_libexecdir}/pxgsettings} -} +%{_libexecdir}/pxgsettings -%{?_with_kde: %files kde -%defattr(-,root,root,-) %{_libdir}/%{name}/%{version}/modules/config_kde.so -} -%{?_with_mozjs: %files mozjs -%defattr(-,root,root,-) %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so -} -%{?_with_networkmanager: %files networkmanager -%defattr(-,root,root,-) %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so -} -%{?_with_webkit: -%files webkit -%defattr(-,root,root,-) -%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so -} - -%{?_with_webkitgtk3: %files webkitgtk3 -%defattr(-,root,root,-) %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so -} -%{?_with_pacrunner: %files pacrunner -%defattr(-,root,root,-) %{_libdir}/%{name}/%{version}/modules/config_pacrunner.so -} +%endif %files devel -%defattr(-,root,root,-) %{_includedir}/proxy.h %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc @@ -291,6 +211,7 @@ make test %changelog * Mon Feb 29 2016 David King <amigadave(a)amigadave.com> - 0.4.12-1 - Update to 0.4.12 +- Simplify conditional macros * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/libproxy.git/commit/?h=f24&id=df96441e...

3 years, 9 months

1
0
0 / 0

amigadave uploaded gnome-logs-3.19.91.tar.xz for gnome-logs

by notifications＠fedoraproject.org

10ada1993c1a2cfd9296bf12726323c0 gnome-logs-3.19.91.tar.xz http://pkgs.fedoraproject.org/lookaside/pkgs/gnome-logs/gnome-logs-3.19.9...

3 years, 9 months

1
0
0 / 0

mbooth pushed to eclipse (master). "Fix Lucene patch on F22"

by notifications＠fedoraproject.org

This commit already existed in another branch. http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=master&id=395cae...

3 years, 9 months

1
0
0 / 0

mbooth pushed to eclipse (f23). "Fix Lucene patch on F22"

by notifications＠fedoraproject.org

This commit already existed in another branch. http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=f23&id=395cae265...

3 years, 9 months

1
0
0 / 0

mbooth pushed to eclipse (f24). "Fix Lucene patch on F22"

by notifications＠fedoraproject.org

This commit already existed in another branch. http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=f24&id=395cae265...

3 years, 9 months

1
0
0 / 0

mbooth pushed to eclipse (f22). "Fix Lucene patch on F22"

by notifications＠fedoraproject.org

From 395cae265676c76e98cdfb4696b6ea64fe297e20 Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.booth(a)redhat.com> Date: Mon, 29 Feb 2016 23:21:58 +0000 Subject: Fix Lucene patch on F22 --- eclipse-lucene-4.patch | 13 +++++++------ eclipse.spec | 5 ++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch index 45f945f..ba49766 100644 --- a/eclipse-lucene-4.patch +++ b/eclipse-lucene-4.patch @@ -483,7 +483,7 @@ diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependenci index b818924..f1a67b3 100755 --- a/dependencies/replace_platform_plugins_with_symlinks.sh +++ b/dependencies/replace_platform_plugins_with_symlinks.sh -@@ -45,12 +45,7 @@ pushd $1 +@@ -45,13 +45,7 @@ pushd $1 _symlink org.apache.felix.gogo.shell_ felix-gogo-shell/org.apache.felix.gogo.shell.jar _symlink javax.annotation-api_ glassfish-annotation-api.jar _symlink org.apache.lucene.core_ lucene/lucene-core.jar @@ -491,12 +491,13 @@ index b818924..f1a67b3 100755 - _symlink org.apache.lucene.analyzers-smartcn_ lucene/lucene-analyzers-smartcn.jar - _symlink org.apache.lucene.queries lucene/lucene-queries.jar - _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar -- _symlink org.apache.lucene.sandbox lucene/lucene-sandbox.jar -- _symlink org.apache.regexp_ regexp.jar +- _symlink org.apache.lucene.sandbox_ lucene/lucene-sandbox.jar +- _symlink org.apache.lucene.spatial3d_ lucene/lucene-spatial3d.jar +- _symlink org.apache.lucene.spatial_ lucene/lucene-spatial.jar + _symlink org.apache.lucene.analysis_ lucene/lucene-analyzers-common.jar - _symlink org.eclipse.jetty.util_ jetty/jetty-util.jar - _symlink org.eclipse.jetty.server_ jetty/jetty-server.jar - _symlink org.eclipse.jetty.http_ jetty/jetty-http.jar + _symlink com.spatial4j_ spatial4j.jar + _symlink org.apache.xalan xalan-j2.jar + _symlink org.apache.xerces xerces-j2.jar --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -95,7 +95,7 @@ diff --git a/eclipse.spec b/eclipse.spec index d897b49..e88b43f 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -49,7 +49,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 1%{?dist} +Release: 2%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -1123,6 +1123,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Mon Feb 29 2016 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.2-2 +- Fix Lucene patch on F22 + * Mon Feb 29 2016 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.2-1 - Update to Mars.2 release - Update eclipse-build snapshot -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=f22&id=395cae265...

3 years, 9 months

1
0
0 / 0

eseyman pushed to perl-IPC-Signal (master). "Modernize spec file"

by notifications＠fedoraproject.org

From 3edbf509462194629a180b479e4f3fd4f60710d5 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman <emmanuel(a)seyman.fr> Date: Tue, 1 Mar 2016 00:18:47 +0100 Subject: Modernize spec file --- perl-IPC-Signal.spec | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/perl-IPC-Signal.spec b/perl-IPC-Signal.spec index 2da1df9..1ee287c 100644 --- a/perl-IPC-Signal.spec +++ b/perl-IPC-Signal.spec @@ -1,17 +1,16 @@ Name: perl-IPC-Signal Version: 1.00 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Utility functions dealing with signals for Perl - -Group: Development/Libraries License: GPL+ or Artistic -URL: http://search.cpan.org/dist/IPC-Signal/ +URL: http://search.cpan.org/dist/IPC-Signal/ Source0: http://www.cpan.org/modules/by-module/IPC/IPC-Signal-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: make +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?perl_default_filter} @@ -27,15 +26,12 @@ numbers and vice versa. %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' %{_fixperms} $RPM_BUILD_ROOT/* @@ -43,18 +39,18 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' make test -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/IPC/ +%{perl_vendorlib}/IPC %{_mandir}/man3/IPC::Signal.3pm* %changelog +* Mon Feb 29 2016 Emmanuel Seyman <emmanuel(a)seyman.fr> - 1.00-17 +- Clean up spec file +- Pass NO_PACKLIST to Makefile.PL +- Trim spec changelog + * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.00-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -99,6 +95,3 @@ rm -rf $RPM_BUILD_ROOT * Sun Jun 27 2010 Ralf Corsépius <corsepiu(a)fedoraproject.org> 1.00-2 - Rebuild for perl-5.12. - -* Tue Jun 10 2010 Matthias Runge <mrunge(a)matthias-runge.de> 1.00-1 -- initial version, renamed from perl-IPC-signal -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-IPC-Signal.git/commit/?h=master&i...

3 years, 9 months

1
0
0 / 0

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits February 2016