rpms/libproxy/devel .cvsignore, 1.5, 1.6 import.log, 1.3, 1.4 libproxy.spec, 1.16, 1.17 sources, 1.5, 1.6 libproxy-0.4-ldflags.patch, 1.1, NONE libproxy-0.4.0-pyarch.patch, 1.1, NONE
Nathaniel McCallum
npmccallum at fedoraproject.org
Sat Jul 3 20:30:03 UTC 2010
Author: npmccallum
Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31806/devel
Modified Files:
.cvsignore import.log libproxy.spec sources
Removed Files:
libproxy-0.4-ldflags.patch libproxy-0.4.0-pyarch.patch
Log Message:
Update libproxy to 0.4.4:
- Removed install workarounds (fixed upstream)
- Removed patches (fixed upstream)
- Moved -python to noarch
- Downgrade cmake requirement (upstream change)
- Disabled perl bindings
- Run tests
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 24 Mar 2010 23:39:11 -0000 1.5
+++ .cvsignore 3 Jul 2010 20:30:02 -0000 1.6
@@ -1 +1 @@
-libproxy-0.4.0.tar.gz
+libproxy-0.4.4.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 24 Mar 2010 23:39:11 -0000 1.3
+++ import.log 3 Jul 2010 20:30:02 -0000 1.4
@@ -1,3 +1,4 @@
libproxy-0_2_3-8_fc10:HEAD:libproxy-0.2.3-8.fc10.src.rpm:1232723319
libproxy-0_3_0-1_fc12:HEAD:libproxy-0.3.0-1.fc12.src.rpm:1255986871
libproxy-0_4_0-1_fc12:HEAD:libproxy-0.4.0-1.fc12.src.rpm:1269473814
+libproxy-0_4_4-1_fc13:HEAD:libproxy-0.4.4-1.fc13.src.rpm:1278188825
Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libproxy.spec 2 Jul 2010 16:10:14 -0000 1.16
+++ libproxy.spec 3 Jul 2010 20:30:02 -0000 1.17
@@ -3,20 +3,18 @@
%global gecko_version 1.9.2
Name: libproxy
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.4.4
+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}.tar.gz
-Patch0: libproxy-0.4-ldflags.patch
-Patch1: libproxy-0.4.0-pyarch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
-BuildRequires: cmake >= 2.8.0
+BuildRequires: cmake >= 2.6.0
# gnome
BuildRequires: GConf2-devel
@@ -56,6 +54,7 @@ The %{name}-bin package contains the pro
Summary: Binding for %{name} and python
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description python
The %{name}-python package contains the python binding for %{name}
@@ -93,7 +92,8 @@ Group: System Environment/Libra
Requires: %{name} = %{version}
%description networkmanager
-The %{name}-networkmanager package contains the %{name} plugin for networkmanager.
+The %{name}-networkmanager package contains the %{name} plugin
+for networkmanager.
%package webkit
Summary: Plugin for %{name} and webkit
@@ -115,51 +115,27 @@ Requires: pkgconfig
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
-
%prep
%setup -q
-%patch0 -p1 -b .ldflags
-%patch1 -p1 -b .pyarch
-sed -i -e 's|-Werror||' CMakeLists.txt
-
%build
%{cmake} \
- -Dmoduledir=%{_libdir}/%{name}/%{version}/modules \
+ -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
+ -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
+ -DWITH_PERL=OFF \
.
make VERBOSE=1 %{?_smp_mflags}
-
+%check
+make test
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-#Manual install for modules
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/modules
-install -pm 0755 lib/libproxy.so $RPM_BUILD_ROOT%{_libdir}/libproxy.so.1.0.0
-ln -s libproxy.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libproxy.so.1
-ln -s libproxy.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libproxy.so
-for f in lib/*_*.so ; do
- install -pm 0755 ${f} \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/modules
-done
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-sed -e's|@prefix@|%{_prefix}|g' \
- -e's|@libdir@|%{_libdir}|g' \
- -e's|@includedir@|%{_includedir}|g' \
- -e's|@VERSION@|%{version}|g' \
- < libproxy/libproxy-1.0.pc.in \
- > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libproxy-1.0.pc
-
-
%clean
rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -184,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT
%files gnome
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/modules/config_gnome.so
+%{_libexecdir}/pxgconf
%files kde
%defattr(-,root,root,-)
@@ -206,15 +183,18 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/proxy.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/libproxy-1.0.pc
+%{_datadir}/cmake/Modules/Findlibproxy.cmake
%changelog
-* Fri Jul 02 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.4.0-2
-- rebuilt for webkitgtk
-
-* Wed Mar 24 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.4.0-1
-- Update to 0.4.0
-- Switch to cmake
+* Sun Jun 13 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 0.4.4-1
+- Update to 0.4.4
+- Removed install workarounds (fixed upstream)
+- Removed patches (fixed upstream)
+- Moved -python to noarch
+- Downgrade cmake requirement (upstream change)
+- Disabled perl bindings
+- Run tests
* Thu Mar 11 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3.1-4
- Add missing libXmu-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 24 Mar 2010 23:39:12 -0000 1.5
+++ sources 3 Jul 2010 20:30:02 -0000 1.6
@@ -1 +1 @@
-b22c95df70a40949e99add5171fc3084 libproxy-0.4.0.tar.gz
+17b1681a313c2bb161e7cd6c898728f5 libproxy-0.4.4.tar.gz
--- libproxy-0.4-ldflags.patch DELETED ---
--- libproxy-0.4.0-pyarch.patch DELETED ---
More information about the scm-commits
mailing list