From bc079ecdd2131e0100c0f4718d6f1e9748f5d0d8356eef82b100079ab901eaa1 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 3 Sep 2010 13:25:33 +0000
Subject: [PATCH] Refix branch

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=54
---
 libproxy-plugins.spec | 9 +++++++--
 libproxy.spec         | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec
index ec78ee6..ebee3d0 100644
--- a/libproxy-plugins.spec
+++ b/libproxy-plugins.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libproxy (Version 0.4.6)
+# spec file for package libproxy-plugins (Version 0.4.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define         build_core_not_modules 0
 %if 0%{?suse_version}
 %define         have_mono 1
@@ -48,7 +49,7 @@ Source:         http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
-License:        LGPLv2.1+
+License:        GPLv2+ ; LGPLv2.1+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -181,6 +182,7 @@ libproxy offers the following features: * extremely small core
 * a standard way of dealing with proxy settings across all scenarios
 
 %if 0%{?have_mono}
+
 %package -n libproxy-sharp
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        .Net bindings for libproxy
@@ -405,6 +407,7 @@ make test
 %{python_sitelib}/*.py
 
 %if 0%{?have_mono}
+
 %files -n libproxy-sharp
 %defattr(-, root, root)
 %{_assemblies_dir}/gac/libproxy-sharp
@@ -412,6 +415,7 @@ make test
 %endif
 
 %if ! 0%{?windows}
+
 %files -n perl-Net-Libproxy
 %defattr(-,root,root)
 %dir %{perl_vendorarch}/Net
@@ -423,6 +427,7 @@ make test
 %else
 
 %if ! 0%{?windows}
+
 %files -n libproxy1-config-kde4
 %defattr(-, root, root)
 %{_libdir}/libproxy-%{version}/modules/config_kde4.so
diff --git a/libproxy.spec b/libproxy.spec
index b725b03..1ebe2eb 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define         build_core_not_modules 1
 %if 0%{?suse_version}
 %define         have_mono 1
@@ -48,7 +49,7 @@ Source:         http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
-License:        LGPLv2.1+
+License:        GPLv2+ ; LGPLv2.1+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -181,6 +182,7 @@ libproxy offers the following features: * extremely small core
 * a standard way of dealing with proxy settings across all scenarios
 
 %if 0%{?have_mono}
+
 %package -n libproxy-sharp
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        .Net bindings for libproxy
@@ -405,6 +407,7 @@ make test
 %{python_sitelib}/*.py
 
 %if 0%{?have_mono}
+
 %files -n libproxy-sharp
 %defattr(-, root, root)
 %{_assemblies_dir}/gac/libproxy-sharp
@@ -412,6 +415,7 @@ make test
 %endif
 
 %if ! 0%{?windows}
+
 %files -n perl-Net-Libproxy
 %defattr(-,root,root)
 %dir %{perl_vendorarch}/Net
@@ -423,6 +427,7 @@ make test
 %else
 
 %if ! 0%{?windows}
+
 %files -n libproxy1-config-kde4
 %defattr(-, root, root)
 %{_libdir}/libproxy-%{version}/modules/config_kde4.so