From f8e8abf7a0eaeffbf19827ecd27a73ee53093a4b22700161092ab7fc985dd08d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 27 Aug 2010 22:58:31 +0000
Subject: [PATCH] Accepting request 46522 from
 home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/libproxy via accept of submit request 46522 revision 3.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/46522
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=51
---
 libproxy-plugins.spec | 21 ++++++++++-----------
 libproxy.spec         | 17 ++++++++---------
 update-from-svn.sh    |  3 +--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec
index a34b606..1208e05 100644
--- a/libproxy-plugins.spec
+++ b/libproxy-plugins.spec
@@ -28,7 +28,7 @@
 %if 0%{?suse_version} > 1110
 %define xulrunner_ver 191
 %else
-%define xulrunner_ver 181
+%define xulrunner_ver 190
 %endif
 %endif
 Url:            http://code.google.com/p/libproxy/
@@ -37,15 +37,14 @@ Url:            http://code.google.com/p/libproxy/
 Name:           libproxy-plugins
 Group:          System/Libraries
 Summary:        Libproxy provides consistent proxy configuration to applications
-%if 0%{?build_snapshot}
-%define         svn_rev .svn.739
-%endif
-Version:        0.4.5%{?svn_rev}
-%if ! 0%{?build_snapshot}
-%define version_ext -%{version}
-%endif
+Version:        0.4.5
 Release:        1
-Source:         http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2
+%if 0%{?build_snapshot}
+%define _sourcename %{_name}
+%else
+%define _sourcename %{_name}-%{version}
+%endif
+Source:         http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
@@ -74,11 +73,11 @@ BuildRequires:  libkde4-devel
 BuildRequires:  libqt4-devel
 %endif
 %else
-BuildRequires:  python-devel
 %if 0%{?have_mono}
 BuildRequires:  mono-devel
 %endif
 BuildRequires:  perl
+BuildRequires:  python-devel
 %endif
 
 %{!?python_sitelib:  %global python_sitelib  %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -286,7 +285,7 @@ about network configuration changes.
 %endif
 
 %prep
-%setup -q -n %{_name}%{?version_ext}
+%setup -q -n %{_sourcename}
 mkdir build
 
 %build
diff --git a/libproxy.spec b/libproxy.spec
index 0ed6a04..e105e8e 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -37,15 +37,14 @@ Url:            http://code.google.com/p/libproxy/
 Name:           libproxy
 Group:          System/Libraries
 Summary:        Libproxy provides consistent proxy configuration to applications
-%if 0%{?build_snapshot}
-%define         svn_rev .svn.739
-%endif
-Version:        0.4.5%{?svn_rev}
-%if ! 0%{?build_snapshot}
-%define version_ext -%{version}
-%endif
+Version:        0.4.5
 Release:        1
-Source:         http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2
+%if 0%{?build_snapshot}
+%define _sourcename %{_name}
+%else
+%define _sourcename %{_name}-%{version}
+%endif
+Source:         http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
 # Script used for automatic snapshot updates
 Source98:       update-from-svn.sh
 Source99:       baselibs.conf
@@ -286,7 +285,7 @@ about network configuration changes.
 %endif
 
 %prep
-%setup -q -n %{_name}%{?version_ext}
+%setup -q -n %{_sourcename}
 mkdir build
 
 %build
diff --git a/update-from-svn.sh b/update-from-svn.sh
index 3e51e1e..1fa6166 100644
--- a/update-from-svn.sh
+++ b/update-from-svn.sh
@@ -19,8 +19,7 @@ SVNREV=$(svn info | awk '/Revision:/ { print $2 }')
 popd
 
 # Adjust the version information and svn rev in the spec file to what we get from the svn checkout.
-sed -i "s/%define.*svn_rev.*/%define         svn_rev .svn.$SVNREV/" $MODULE.spec
-sed -i "s/Version:.*/Version:        ${VERSION}%{?svn_rev}/" $MODULE.spec
+sed -i "s/Version:.*/Version:        ${VERSION}.svn.$SVNREV/" $MODULE.spec
 
 tar cjf $MODULE.tar.bz2 $MODULE