rpms/knetworkmanager/devel knetworkmanager-svn20080205-run-moc.patch, NONE, 1.1 knetworkmanager.spec, 1.16, 1.17

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21257/devel

Modified Files:
	knetworkmanager.spec 
Added Files:
	knetworkmanager-svn20080205-run-moc.patch 
Log Message:
Checking in the latest state: now compiles, links, but several files in the file list aren't there, including the entire devel, openvpn, vpnc and pptp subpackages (at least when building on my local machine).

* Wed Feb 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7-0.3.svn20080205
- patch to run moc by hand in src/dbus to work around non-working automoc
- drop unneeded "run make in src/dbus first, then in toplevel" hack

knetworkmanager-svn20080205-run-moc.patch:

--- NEW FILE knetworkmanager-svn20080205-run-moc.patch ---
diff -ur knetworkmanager/knetworkmanager/src/dbus/Makefile.am knetworkmanager-run-moc/knetworkmanager/src/dbus/Makefile.am
--- knetworkmanager/knetworkmanager/src/dbus/Makefile.am	2007-12-19 14:49:23.000000000 +0100
+++ knetworkmanager-run-moc/knetworkmanager/src/dbus/Makefile.am	2008-02-06 02:34:38.000000000 +0100
@@ -25,13 +25,22 @@
                    connectionnode.h \
                    introspectableinterface.h
 
-libknm_dbus_la_METASOURCES = AUTO
+DBUSPROXYMOC = moc_networkmanagerproxy.cpp \
+               moc_deviceproxy.cpp \
+               moc_wiredproxy.cpp \
+               moc_wirelessproxy.cpp \
+               moc_ip4configproxy.cpp \
+               moc_accesspointproxy.cpp \
+               moc_networkmanagersettings.cpp \
+               moc_connection.cpp \
+               moc_connectionnode.cpp \
+               moc_introspectableinterface.cpp
 
 noinst_HEADERS = $(DBUSPROXYHEADERS)
 noinst_LTLIBRARIES = libknm_dbus.la
-libknm_dbus_la_SOURCES = $(DBUSPROXY)
+libknm_dbus_la_SOURCES = $(DBUSPROXY) $(DBUSPROXYMOC)
 
-CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS)
+CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(DBUSPROXYMOC)
 
 networkmanagerproxy.cpp networkmanagerproxy.h:
 	$(DBUSXML2QT3) -p networkmanagerproxy -c NetworkManagerProxy -N DBus $(INTROSPECTIONPATH)nm-manager.xml
@@ -63,3 +72,33 @@
 	sed s/#include\ \"introspectable.h\"/#include\ \"introspectableinterface.h\"/ connectionnode.cpp_tmp > connectionnode.cpp
 	rm -f connectionnode.cpp_tmp
 	
+
+moc_networkmanagerproxy.cpp: networkmanagerproxy.h
+	$(MOC) -o $@ $<
+
+moc_deviceproxy.cpp: deviceproxy.h
+	$(MOC) -o $@ $<
+
+moc_wiredproxy.cpp: wiredproxy.h
+	$(MOC) -o $@ $<
+
+moc_wirelessproxy.cpp: wirelessproxy.h
+	$(MOC) -o $@ $<
+
+moc_ip4configproxy.cpp: ip4configproxy.h
+	$(MOC) -o $@ $<
+
+moc_accesspointproxy.cpp: accesspointproxy.h
+	$(MOC) -o $@ $<
+
+moc_networkmanagersettings.cpp: networkmanagersettings.h
+	$(MOC) -o $@ $<
+
+moc_connection.cpp: connection.h
+	$(MOC) -o $@ $<
+
+moc_connectionnode.cpp: connectionnode.h
+	$(MOC) -o $@ $<
+
+moc_introspectableinterface.cpp: introspectableinterface.h
+	$(MOC) -o $@ $<


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- knetworkmanager.spec	6 Feb 2008 01:06:02 -0000	1.16
+++ knetworkmanager.spec	6 Feb 2008 01:47:46 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           knetworkmanager
 Version:        0.7
-Release:        0.2.%{svn}%{?dist}
+Release:        0.3.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -12,6 +12,9 @@
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
 
+# automoc is not working or not used properly in src/dbus, so patch it to moc files by hand
+Patch0:         knetworkmanager-svn20080205-run-moc.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake autoconf
@@ -62,6 +65,7 @@
 
 %prep 
 %setup -q -n %{name}
+%patch0 -p1
 
 make -f Makefile.cvs
 
@@ -69,12 +73,6 @@
 %build
 %configure --disable-rpath --with-openvpn --with-vpnc  --with-pptp\
            --disable-warnings
-# nasty hack copied from suse.
-pushd knetworkmanager/src/dbus
-make
-popd
-%configure --disable-rpath --with-openvpn --with-vpnc --with-pptp\
-           --disable-warnings
 make %{?_smp_mflags}
 
 
@@ -162,6 +160,10 @@
 
 
 %changelog
+* Wed Feb 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7-0.3.svn20080205
+- patch to run moc by hand in src/dbus to work around non-working automoc
+- drop unneeded "run make in src/dbus first, then in toplevel" hack
+
 * Tue Feb 05 2008 Dennis Gilmore <dennis at ausil.us> - 0.7-0.2.svn20080205
 - new svn snapshot